Skip to content

Commit

Permalink
Merge pull request openedx-unsupported#849 from edx/sef/edx-west/loca…
Browse files Browse the repository at this point in the history
…l_playbook_tempdir_master

edx-west: use local temp dir for sockets and ansible cache
  • Loading branch information
sefk committed Apr 30, 2014
2 parents a286959 + ca944f2 commit ccf6cdd
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 2 deletions.
1 change: 0 additions & 1 deletion playbooks/edx-west/ansible.cfg

This file was deleted.

6 changes: 6 additions & 0 deletions playbooks/edx-west/ec2_cache/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*

!prod
!stage
!data
!.gitignore
3 changes: 3 additions & 0 deletions playbooks/edx-west/ec2_cache/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This temp directory created here so that we can make sure it doesn't
collide with other users doing ansible operations on the same machine;
or concurrent installs to different environments, say to prod and stage.
3 changes: 3 additions & 0 deletions playbooks/edx-west/ec2_cache/data/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*

!.gitignore
3 changes: 3 additions & 0 deletions playbooks/edx-west/ec2_cache/prod/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*

!.gitignore
3 changes: 3 additions & 0 deletions playbooks/edx-west/ec2_cache/stage/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*

!.gitignore
22 changes: 22 additions & 0 deletions playbooks/edx-west/prod-ansible.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# config file for ansible -- http://ansible.github.com
# nearly all parameters can be overridden in ansible-playbook or with command line flags
# ansible will read ~/.ansible.cfg or /etc/ansible/ansible.cfg, whichever it finds first

[defaults]

jinja2_extensions=jinja2.ext.do
hash_behaviour=merge
host_key_checking = False

# These are environment-specific defaults
forks=10
transport=ssh
hostfile=./ec2.py
extra_vars='key=deployment region=us-west-1'
user=ubuntu


[ssh_connection]
# example from https://github.com/ansible/ansible/blob/devel/examples/ansible.cfg
ssh_args= -o ControlMaster=auto -o ControlPersist=60s -o ControlPath=/tmp/ansible-ssh-%h-%p-%r
scp_if_ssh=True
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ regions=us-west-1
regions_exclude = us-gov-west-1
destination_variable=public_dns_name
vpc_destination_variable=private_dns_name
cache_path=/tmp
cache_path=ec2_cache/prod
cache_max_age=300
route53=False
8 changes: 8 additions & 0 deletions playbooks/edx-west/stage-ec2.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[ec2]
regions=us-west-1
regions_exclude = us-gov-west-1
destination_variable=public_dns_name
vpc_destination_variable=private_dns_name
cache_path=ec2_cache/stage
cache_max_age=300
route53=False

0 comments on commit ccf6cdd

Please sign in to comment.