merge with master

anandkumarpatel · anandkumarpatel · commit 8084a5d1ee73 · 2015-11-24T18:53:57.000-08:00
diff --git a/ansible/api-core.yml b/ansible/api-core.yml
@@ -5,6 +5,7 @@
 - hosts: charon
 - hosts: rabbitmq
 - hosts: redis
+- hosts: swarm-manager
 
 - hosts: api
   vars_files:
diff --git a/ansible/beta-hosts/variables b/ansible/beta-hosts/variables
@@ -50,6 +50,7 @@ ansible_ssh_private_key_file=~/.ssh/oregon.pem
 datadog_host_address=10.20.1.59
 datadog_tags=env:beta
 domain=runnable-beta.com
+mongo_port=27000
 new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead
 node_env=production-beta
 pg_host=beta-infrastructure-db.cnksgdqarobf.us-west-2.rds.amazonaws.com
diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables
@@ -1,18 +1,18 @@
 [api_group:vars]
 api_aws_access_key_id=AKIAIDC4WVMTCGV7KRVQ
 api_aws_secret_access_key=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
-api_github_client_id=baa5c868b6d17d7ae002
-api_github_client_secret=ad4f8527ae98d7eea15a32ee5abbead5c9a25abc
-api_github_deploy_keys_bucket=runnable.deploykeys.production-gamma
+api_github_client_id=b6072dc57062faca7fcb
+api_github_client_secret=ba73a9294dc4bfaa7ed02ba187f73918506e4293
+api_github_deploy_keys_bucket=runnable.deploykeys.production-beta
 api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
 api_mixpanel_app_id=c41affa4b08818443365c526cbb51606
-api_mongo_auth=api:oW4c7x9Wiv28oiNBy2Bc
+api_mongo_auth=api:3f5210b8-8fe3-11e5-8e62-07b6eff19ecb
 api_mongo_database=gamma
-api_mongo_replset_name=gamma
+api_mongo_replset_name=gamma-rs0
 api_neo4j_auth=neo4j:oqGlRV1KTpaqbHDkdlJz
 api_new_relic_app_name=gamma-api-production
 api_rollbar_key=a90d9c262c7c48cfabbd32fd0a1bc61c
-api_s3_context_bucket=runnable.context.resources.production-gamma
+api_s3_context_bucket=runnable.context.resources.production-beta
 
 [docks:vars]
 docker_config=docks
@@ -29,15 +29,15 @@ khronos_mongo_replset_name=gamma
 [optimus:vars]
 optimus_aws_access_id=AKIAJPA2ZYSVVA5V7XXQ
 optimus_aws_secret_id=5V70AUxfIyHeLvlYZe0xaYevDAdgTOWOn5G7nHlt
-optimus_github_deploy_keys_bucket=runnable.deploykeys.production-gamma
+optimus_github_deploy_keys_bucket=runnable.deploykeys.production-beta
 
 [palantiri:vars]
 palantiri_rollbar_key=f675e9090d6f483ca4e742af2c7f2f83
 
 [registry:vars]
-registry_s3_access_key=AKIAJZQHOFYKTZP52XCQ
+registry_s3_access_key=AKIAJK5EN7W6E62A3C3Q
 registry_s3_bucket=runnableimages.beta
-registry_s3_secret_key=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
+registry_s3_secret_key=ZFLePZdrHUNhTzuV4Ir/NgwPWOnU41Ur9DbH6UAp
 registry_s3_region=us-east-1
 
 [shiva:vars]
@@ -60,6 +60,7 @@ ansible_ssh_private_key_file=~/.ssh/gamma.pem
 datadog_host_address=10.4.6.251
 datadog_tags=env:gamma
 domain=runnable-gamma.com
+mongo_port=27017
 new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead
 node_env=production-gamma
 pg_host=gamma-infrastructure-db.cnksgdqarobf.us-west-2.rds.amazonaws.com
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -45,6 +45,10 @@ pg_database: astral
 # charon
 charon_port: 53
 
+# consul
+consul_host_address: "{{ hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] }}"
+consul_api_port: 8500
+
 # datadog
 datadog_api_key: 6488896fe0c811965ef233b96809d70d
 datadog_host_address: "{{ ansible_default_ipv4.address }}"
@@ -73,7 +77,7 @@ mavis_port: 3000
 metis_port: 3000
 
 # mongo
-mongo_hosts: "{% for host in groups['mongodb'] %}{{ hostvars[host]['ansible_default_ipv4']['address'] }}:27000{% if not loop.last %},{% endif %}{% endfor %}"
+mongo_hosts: "{% for host in groups['mongodb'] %}{{ hostvars[host]['ansible_default_ipv4']['address'] }}:{{ mongo_port }}{% if not loop.last %},{% endif %}{% endfor %}"
 
 # navi
 navi_host_address: "{{ hostvars[groups['navi'][0]]['ansible_default_ipv4']['address'] }}"
@@ -100,6 +104,7 @@ shiva_port: 3000
 
 # swarm
 swarm_master_port: 2375
+swarm_host_address: "{{ hostvars[groups['swarm-manager'][0]]['ansible_default_ipv4']['address'] }}"
 
 # navi/link
 navi_mongo_database: navi
diff --git a/ansible/group_vars/alpha-api.yml b/ansible/group_vars/alpha-api.yml
@@ -49,6 +49,7 @@ container_envs: >
   -e ROLLBAR_KEY={{ api_rollbar_key }}
   -e S3_CONTEXT_RESOURCE_BUCKET={{ api_s3_context_bucket }}
   -e USER_CONTENT_DOMAIN={{ user_content_domain }}
+  -e SWARM_HOST=http://{{ swarm_host_address }}:{{ swarm_master_port }}
 
 container_run_opts: >
   -h {{ name }}
diff --git a/ansible/group_vars/alpha-consul.yml b/ansible/group_vars/alpha-consul.yml
@@ -21,7 +21,7 @@ container_run_opts: >
   -p {{ ansible_default_ipv4.address }}:8302:8302
   -p {{ ansible_default_ipv4.address }}:8302:8302/udp
   -p {{ ansible_default_ipv4.address }}:8400:8400
-  -p {{ ansible_default_ipv4.address }}:8500:8500
+  -p {{ ansible_default_ipv4.address }}:{{ consul_api_port }}:8500
   --restart=always
 
 container_run_args: >
diff --git a/ansible/group_vars/alpha-swarm-deamon.yml b/ansible/group_vars/alpha-swarm-deamon.yml
@@ -2,7 +2,7 @@ name: "swarm-deamon"
 
 # container_kill_start settings
 container_image: swarm
-container_tag: 0.4.0
+container_tag: 1.0.0
 
 # container_kill_start vars
 log_driver: json-file
@@ -13,4 +13,4 @@ container_run_opts: >
 container_run_args: >
   join
    --addr={{ ansible_default_ipv4.address }}:{{ docker_port }}
-  token://{{ swarm_token }}
+  consul://{{ consul_host_address }}:{{ consul_api_port }}/swarm
diff --git a/ansible/group_vars/alpha-swarm-manager.yml b/ansible/group_vars/alpha-swarm-manager.yml
@@ -2,7 +2,7 @@ name: "swarm-manager"
 
 # container_kill_start settings
 container_image: swarm
-container_tag: 0.4.0
+container_tag: 1.0.0
 
 # container_kill_start vars
 log_driver: json-file
@@ -18,4 +18,4 @@ container_run_args: >
   --tlscacert={{ docker_ca_path }}
   --tlscert={{ docker_cert_path }}
   --tlskey={{ docker_key_path }}
-  token://{{ swarm_token }}
+  consul://{{ consul_host_address }}:{{ consul_api_port }}/swarm
diff --git a/ansible/group_vars/alpha-workers.yml b/ansible/group_vars/alpha-workers.yml
@@ -45,6 +45,7 @@ container_envs: >
   -e ROLLBAR_KEY={{ api_rollbar_key }}
   -e S3_CONTEXT_RESOURCE_BUCKET={{ api_s3_context_bucket }}
   -e USER_CONTENT_DOMAIN={{ user_content_domain }}
+  -e SWARM_HOST=http://{{ swarm_host_address }}:{{ swarm_master_port }}
 
 container_run_opts: >
   -h {{ name }}
diff --git a/ansible/prod-hosts/variables b/ansible/prod-hosts/variables
@@ -50,6 +50,7 @@ ansible_ssh_private_key_file=~/.ssh/Test-runnable.pem
 datadog_host_address=10.0.1.239
 datadog_tags=env:alpha
 domain=runnable.io
+mongo_port=27000
 new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead
 node_env=production
 pg_host=alpha-production-db.czw5moz6rmpp.us-west-1.rds.amazonaws.com:30573
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
@@ -1,6 +1,7 @@
 ---
 - name: change core dump path
   sudo: yes
+  when: docker_config == "runnable"
   tags: coreDump
   sysctl:
     name=kernel.core_pattern
@@ -39,6 +40,7 @@
 
 - name: copy docker config file
   sudo: yes
+  when: docker_config == "runnable"
   template:
     src={{ docker_config }}
     dest=/etc/default/docker
diff --git a/ansible/roles/docker/templates/docks b/ansible/roles/docker/templates/docks
diff --git a/ansible/swarm-deamon.yml b/ansible/swarm-deamon.yml
@@ -1,4 +1,6 @@
 ---
+- hosts: consul
+
 - hosts: docks
   vars_files:
     - "group_vars/alpha-swarm-deamon.yml"
diff --git a/ansible/swarm-manager.yml b/ansible/swarm-manager.yml
@@ -1,4 +1,6 @@
 ---
+- hosts: consul
+
 - hosts: swarm-manager
   vars_files:
     - "group_vars/alpha-swarm-manager.yml"
diff --git a/ansible/workers.yml b/ansible/workers.yml
@@ -5,6 +5,7 @@
 - hosts: charon
 - hosts: rabbitmq
 - hosts: redis
+- hosts: swarm-manager
 
 - hosts: api
   vars_files:
