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

Author: Bryan Kendall

.gitignore

@@ -1 +1,4 @@
-node_modules
+node_modules
+ca-key.pem
+pass
+hellorunnable

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
@@ -77,7 +77,7 @@ It is the custom at Runnable to play a song to the entire team when deploying. F
 
 [runnable-angular: Push it to the limit - Scarface](https://www.youtube.com/watch?v=9D-QD_HIfjA)
 
-[mavis: Fairy Tail theme song](https://www.youtube.com/watch?v=kIwmrk7LoDk)
+[mavis: Fairy Tail theme song](https://www.youtube.com/watch?v=R4UFCTMrV-o)
 
 [khronos: Time After Time - Cyndi Lauper](https://www.youtube.com/watch?v=VdQY7BusJNU)
 
@@ -95,4 +95,8 @@ It is the custom at Runnable to play a song to the entire team when deploying. F
 
 [shiva: FFXIV Shiva Theme](https://www.youtube.com/watch?v=noJiH8HLZw4)
 
+[swarm-manager: Eric Prydz VS Pink Floyd - 'Proper Education'](https://www.youtube.com/watch?v=IttkDYE33aU)
+
+[swarm-deamon: Pink Floyd - Another Brick In The Wall](https://www.youtube.com/watch?v=5IpYOF4Hi6Q)
+
 **IMPORTANT:** Make sure the play the song loud and proud when deploying!

ansible/Dockerfile

@@ -20,6 +20,11 @@ var params = {
     {
       Name: 'tag:role',
       Values: ['dock']
+    },
+    // Only fetch running instances
+    {
+      Name: 'instance-state-name',
+      Values: ['running']
     }
   ]
 };

ansible/beta-hosts/docks.js

@@ -70,9 +70,15 @@ beta-redis-slave
 [shiva]
 beta-services
 
+[metis]
+beta-services
+
 [registry]
 beta-registry
 
+[swarm-manager]
+beta-services
+
 [docks]
 
 [beta:children]
@@ -94,6 +100,7 @@ optimus
 rabbitmq
 eru
 shiva
+swarm-manager
 
 [targets]
 localhost ansible_connection=local bastion_name=beta-bastion

ansible/beta-hosts/hosts

@@ -4,22 +4,20 @@ 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_github_hook_secret=3V3RYTHINGisAW3S0ME!
 api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
-api_loggly_token=f673760d-e0b3-4a93-a15e-2862ea074f91
 api_mixpanel_app_id=c41affa4b08818443365c526cbb51606
 api_mongo_auth=api:oW4c7x9Wiv28oiNBy2Bc
 api_mongo_database=beta
 api_mongo_replset_name=beta
 api_neo4j_auth=neo4j:oqGlRV1KTpaqbHDkdlJz
-api_neo4j_port=7474
-api_neo4j_protocol=http://
 api_new_relic_app_name=beta-api-production
 api_rollbar_key=a90d9c262c7c48cfabbd32fd0a1bc61c
 api_s3_context_bucket=runnable.context.resources.production-beta
 
+[docks:vars]
+docker_config=docks
+
 [eru:vars]
-eru_api_host=api.{{ domain }}
 eru_github_id=8abb08f83f6d1c52bd1a
 eru_github_secret=74a23ee56486d57b14f292283cb04625f600917c
 
@@ -50,17 +48,14 @@ shiva_rollbar_key=0526a90faec845d796e1ef5361a00526
 [beta:vars]
 ansible_ssh_private_key_file=~/.ssh/oregon.pem
 datadog_host=10.20.1.59
-datadog_port=8125
 datadog_tags=env:beta
 domain=runnable-beta.com
 new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead
 node_env=production-beta
-pg_database=shiva
 pg_host=beta-infrastructure-db.cnksgdqarobf.us-west-2.rds.amazonaws.com
 pg_pass=QBjSpAXVYwmGHu4Y
-pg_user=shiva
 rabbit_password=wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
-rabbit_port=54321
 rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
 registry_host=10.20.1.55
+swarm_token=d363b783f03a845a2c82b081bfe8443e
 user_content_domain=runnablecloud.com