Merge remote-tracking branch 'origin/master' into consul-value

Author: Bryan Kendall

README.md

@@ -60,7 +60,7 @@ ansible-playbook -i ./[stage-hosts, prod-hosts] [appname].yml -t deploy -e git_b
 This will redeploy the current deploy without rebuilding
 
 ```
-ansible-playbook -i./[stage-hosts, prod-hosts] [appname].yml -e git_branch=some-branch-name -e build_args=--no-cache
+ansible-playbook -i ./[stage-hosts, prod-hosts] [appname].yml -e git_branch=some-branch-name -e build_args=--no-cache
 ```
 
 deploy latest version of the branch
@@ -99,4 +99,6 @@ It is the custom at Runnable to play a song to the entire team when deploying. F
 
 [swarm-deamon: Pink Floyd - Another Brick In The Wall](https://www.youtube.com/watch?v=5IpYOF4Hi6Q)
 
+[vault / vault-values: Seal - Kiss From A Rose](https://www.youtube.com/watch?v=zP3so2hY4CM)
+
 **IMPORTANT:** Make sure the play the song loud and proud when deploying!

ansible/api-core.yml

@@ -5,6 +5,7 @@
 - hosts: charon
 - hosts: rabbitmq
 - hosts: redis
+- hosts: swarm-manager
 
 - hosts: api
   vars_files:

ansible/beta-hosts/hosts

@@ -34,6 +34,9 @@ beta-api
 [eru]
 beta-services
 
+[fluffy]
+beta-services
+
 [navi]
 beta-navi
 
@@ -73,6 +76,9 @@ beta-redis
 [redis-slave]
 beta-redis-slave
 
+[sauron]
+beta-services
+
 [shiva]
 beta-services
 
@@ -93,6 +99,7 @@ bastion
 charon
 docks
 eru
+fluffy
 hipache
 khronos
 link
@@ -106,6 +113,7 @@ rabbitmq
 redis
 redis-slave
 registry
+sauron
 shiva
 swarm-manager
 web

ansible/beta-hosts/variables

@@ -4,7 +4,6 @@ api_aws_secret_access_key=A6XOpeEElvvIulfAzVLohqKtpKij5ZE8h0FFx0Jn
 api_github_client_id=baa5c868b6d17d7ae002
 api_github_client_secret=ad4f8527ae98d7eea15a32ee5abbead5c9a25abc
 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_database=beta
@@ -50,6 +49,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
@@ -59,3 +59,4 @@ rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
 registry_host=10.20.1.55
 swarm_token=d363b783f03a845a2c82b081bfe8443e
 user_content_domain=runnablecloud.com
+api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af

ansible/consul-values.yml

@@ -28,5 +28,5 @@
     - name: print values to screen
       run_once: true
       when: read_values is defined
-      debug: msg='{{ item.item.key }}: {{ item.json[0].Value | b64decode }}'
+      debug: msg="{{ item.item.key }}" -> "{{ item.json[0].Value | b64decode }}"
       with_items: "{{ values.results }}"

ansible/fluffy.yml

@@ -0,0 +1,12 @@
+---
+- hosts: redis
+
+- hosts: fluffy
+  vars_files:
+    - "group_vars/alpha-fluffy.yml"
+  roles:
+  - { role: notify, tags: "notify" }
+  - { role: redis_key, tags: ["setup", "redis_key"] }
+  - { role: builder, tags: "build" }
+  - { role: container_start, tags: "deploy" }
+

ansible/gamma-hosts/hosts

@@ -67,6 +67,9 @@ gamma-redis
 [redis-slave]
 gamma-redis-slave
 
+[sauron]
+gamma-services
+
 [shiva]
 gamma-services
 
@@ -96,6 +99,7 @@ mavis
 optimus
 rabbitmq
 eru
+sauron
 shiva
 swarm-manager
 

ansible/gamma-hosts/variables

@@ -1,18 +1,17 @@
 [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_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
+api_github_client_id=b6072dc57062faca7fcb
+api_github_client_secret=ba73a9294dc4bfaa7ed02ba187f73918506e4293
+api_github_deploy_keys_bucket=runnable.deploykeys.production-beta
 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 +28,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 +59,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
@@ -69,3 +69,4 @@ rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
 registry_host=10.4.4.82
 swarm_token=d363b783f03a845a2c82b081bfe8443e
 user_content_domain=runnable.ninja
+api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af

ansible/group_vars/all.yml

@@ -34,9 +34,9 @@ loggly_username: ops
 
 # api
 api_github_hook_secret: 3V3RYTHINGisAW3S0ME!
+api_hostname: api.{{ domain }}
 api_neo4j_port: 7474
 api_neo4j_protocol: http://
-api_hostname: api.{{ domain }}
 api_port: 80
 
 # astral
@@ -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 }}"
@@ -65,6 +69,10 @@ docker_port: 4242
 eru_port: 57831
 eru_hostname: admin.{{ domain }}
 
+# fluffy
+fluffy_port: 80
+fluffy_hostname: "fluffy.{{ domain }}"
+
 # mavis
 mavis_hostname: mavis.{{ domain }}
 mavis_port: 3000
@@ -73,7 +81,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'] }}"
@@ -94,15 +102,13 @@ rabbit_port: 54321
 redis_host_address: "{{ hostvars[groups['redis'][0]]['ansible_default_ipv4']['address'] }}"
 redis_port: 6379
 
-# sauron
-weave_path: /usr/local/bin/weave
-
 # shiva
 pg_user: shiva
 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

ansible/group_vars/alpha-api.yml

@@ -14,6 +14,9 @@ npm_version: "2.8.3"
 redis_key: "frontend:{{ api_hostname }}"
 is_redis_update_required: 'yes'
 
+# for sendGrid
+sendgrid_key: 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
+
 # for container settings
 container_envs: >
   -e AWS_ACCESS_KEY_ID={{ api_aws_access_key_id }}
@@ -48,8 +51,9 @@ container_envs: >
   -e REDIS_PORT={{ redis_port }}
   -e ROLLBAR_KEY={{ api_rollbar_key }}
   -e S3_CONTEXT_RESOURCE_BUCKET={{ api_s3_context_bucket }}
+  -e SENDGRID_KEY={{ sendgrid_key }}
   -e USER_CONTENT_DOMAIN={{ user_content_domain }}
-  -e DOCKER_IMAGE_BUILDER_WEAVE_PATH={{ weave_path }}
+  -e SWARM_HOST=http://{{ swarm_host_address }}:{{ swarm_master_port }}
 
 container_run_opts: >
   -h {{ name }}