Merge pull request #247 from CodeNow/prune-ssh-config

anandkumarpatel · anandkumarpatel · commit 2ab746f5dccb · 2015-12-22T12:49:42.000-08:00
More like a dry plum actually.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ erl_crash.dump
 npm-debug.log
 ca.srl
 .DS_Store
+ansible/roles/hipache/templates/runnable*
diff --git a/README.md b/README.md
@@ -73,6 +73,8 @@ If, for some reason, the new deploy is not operating as expected you can quickly
 
 It is the custom at Runnable to play a song to the entire team when deploying. For each of the repositories here are the respective songs:
 
+*NEW JUAREZ* [stack: The Cleveland Orchestra (George Szell conducting) Ludwig von Beethoven Symphony No. 9 "Chorale (Ode To Joy)" Opus 125 IV. Presto; Allegro molto assai (Alla marcia); Andante maestroso; Allegro energico, sempre ben marcato.] (https://www.youtube.com/watch?v=4g5770gaais)
+
 [api: Push it - Rick Ross](https://www.youtube.com/watch?v=qk2jeE1LOn8)
 
 [runnable-angular: Push it to the limit - Scarface](https://www.youtube.com/watch?v=9D-QD_HIfjA)
diff --git a/ansible/delta-hosts/docks.js b/ansible/delta-hosts/docks.js
@@ -14,7 +14,7 @@ var params = {
     // Only search for docks in the cluster security group
     {
       Name: 'instance.group-id',
-      Values: ['sg-577a0d33']
+      Values: ['sg-6cd7fb08']
     },
     // Only fetch instances that are tagged as docks
     {
diff --git a/ansible/delta-hosts/hosts b/ansible/delta-hosts/hosts
@@ -3,7 +3,7 @@ delta-bastion
 
 [hipache]
 delta-hipache httpsCheckForBackend80=false prependIncomingPort=true subDomainDepth=4
-delta-userland-hipache domain=runnableapp.com httpsCheckForBackend80=true prependIncomingPort=true subDomainDepth=3
+delta-userland domain=runnableapp.com httpsCheckForBackend80=true prependIncomingPort=true subDomainDepth=3
 
 [mongodb]
 delta-mongo-a
@@ -31,6 +31,8 @@ delta-services
 [worker]
 delta-api
 
+[docks]
+
 [eru]
 delta-services
 
@@ -79,10 +81,14 @@ delta-services
 [registry]
 delta-registry
 
+[sauron]
+delta-services
+
 [swarm-manager]
 delta-services
 
-[docks]
+[metis]
+delta-services
 
 [delta:children]
 bastion
@@ -102,7 +108,9 @@ mavis
 optimus
 rabbitmq
 eru
+sauron
 shiva
+metis
 swarm-manager
 
 [local]
diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables
@@ -1,10 +1,10 @@
 [api_group:vars]
-api_aws_access_key_id=AKIAIDC4WVMTCGV7KRVQ
-api_aws_secret_access_key=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
-api_github_client_id=b6072dc57062faca7fcb
-api_github_client_secret=ba73a9294dc4bfaa7ed02ba187f73918506e4293
+api_aws_access_key_id=AKIAJWSSSJYUXKNW2ZDA
+api_aws_secret_access_key=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
+api_github_client_id=d42d6634d4070c9d9bf9
+api_github_client_secret=d6cfde38fef5723e25e52629e3d25825c8a704c9
 api_github_deploy_keys_bucket=runnable.deploykeys.production
-api_mixpanel_app_id=c41affa4b08818443365c526cbb51606
+api_mixpanel_app_id=57260a5b6fc972e9c69184882efd009e
 api_mongo_auth=api:72192e5a-a5e1-11e5-add9-0270db32f7ad
 api_mongo_database=delta
 api_mongo_replset_name=delta-rs0
@@ -17,59 +17,58 @@ api_s3_context_bucket=runnable.context.resources.production
 docker_config=docks
 
 [eru:vars]
-eru_github_id=8abb08f83f6d1c52bd1a
-eru_github_secret=74a23ee56486d57b14f292283cb04625f600917c
+eru_github_id=46a23f5f99f0aa9460f8
+eru_github_secret=a0336d72e3d540fb9fbbed2c123a81e1cb329dab
 
 [khronos:vars]
 khronos_mongo_auth=api:oW4c7x9Wiv28oiNBy2Bc
 khronos_mongo_database=delta
 khronos_mongo_replset_name=delta
 
 [optimus:vars]
-optimus_aws_access_id=AKIAJPA2ZYSVVA5V7XXQ
-optimus_aws_secret_id=5V70AUxfIyHeLvlYZe0xaYevDAdgTOWOn5G7nHlt
+optimus_aws_access_id=AKIAJWSSSJYUXKNW2ZDA
+optimus_aws_secret_id=tyvGiCbj5jWCiQnMLvfrfD64dFo8i6prkdcga86y
 optimus_github_deploy_keys_bucket=runnable.deploykeys.production
 
 [palantiri:vars]
 palantiri_rollbar_key=f675e9090d6f483ca4e742af2c7f2f83
 
 [registry:vars]
-registry_s3_access_key=AKIAJK5EN7W6E62A3C3Q
+registry_s3_access_key=AKIAJKCSFJCHFDITLBUQ
 registry_s3_bucket=runnableimages.alpha
-registry_s3_secret_key=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
-registry_s3_region=us-east-1
+registry_s3_secret_key=LXxpb4F7Kxum1HvYkG0P20Yb/9Qpr+e5Gtt/0bIY
+registry_s3_region=us-west-2
 
 [shiva:vars]
 aws_access_key_id=AKIAJ3RCYU6FCULAJP2Q
 aws_secret_access_key=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
 shiva_rollbar_key=0526a90faec845d796e1ef5361a00526
 
 [vault:vars]
-vault_auth_token=e22c3ebc-11cf-653b-7df0-79d78a499458
-vault_token_01=71d7b4754686013c8b9cfb22bafae79c661849dcd67c483c89efba12c0466aa201
-vault_token_02=794d6f7a3459c332a1fd2bbcc9230a7f84f1639806039ee8be547828cd7ab03a02
-vault_token_03=2e67faeffe4343c038d0f3210bdb83f3d3a5bc468975cf13e977ce9b5922aefe03
+vault_auth_token=578c9767-5af8-8490-0954-5d330f27b088
+vault_token_01=0d324dc7d4cbd94790fd08809d06fb1e28e21e185910081c7646e3e49924f6ed01
+vault_token_02=42dc8a69df174e77eb47a63b6ef4709bec57101cb1bff11a71c91b73b8bc046102
+vault_token_03=47f3cb74f5374fa3c51c90fd25e3d4cc851034de97584995fce5fc5382342f1f03
 vault_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
 vault_aws_access_key_id=AKIAJ7R4UIM45KH2WGWQ
 vault_aws_secret_key=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
 vault_aws_region=us-east-1
 
 [delta:vars]
 ansible_ssh_private_key_file=~/.ssh/delta.pem
+api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
 datadog_host_address=10.8.5.63
 datadog_tags=env:delta
-domain=runnable-delta.com
+domain=runnable.io
 mongo_port=27017
 new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead
 node_env=production-delta
 pg_host=delta-infrastructure-db.cnksgdqarobf.us-west-2.rds.amazonaws.com
-pg_pass=e9G7zYRCxYmxG9HQ8J9x2BDB
+pg_pass=59a5524e-a772-11e5-bedc-1bdc0db458b3
 rabbit_password=wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
 rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
 registry_host=10.8.4.126
-swarm_token=d363b783f03a845a2c82b081bfe8443e
 user_content_domain=runnableapp.com
-api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
 
 [ec2:vars]
 aws_custid=437258487404
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -65,14 +65,24 @@ docker_cert_path: /etc/ssl/docker/cert.pem
 docker_key_path: /etc/ssl/docker/key.pem
 docker_port: 4242
 
+# ec2
+aws_access_key: "AKIAIB3IJCCJZQWQMVSQ"
+aws_secret_key: "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"
+
 # eru
 eru_port: 57831
 eru_hostname: admin.{{ domain }}
 
+# filibuster
+filibuster_port: 3112
+
 # fluffy
 fluffy_port: 80
 fluffy_hostname: "fluffy.{{ domain }}"
 
+# krain
+krain_port: 3100
+
 # mavis
 mavis_hostname: mavis.{{ domain }}
 mavis_port: 3000
@@ -115,11 +125,3 @@ swarm_container_name: swarm
 navi_mongo_database: navi
 navi_mongo_host_address: "{{ hostvars[groups['mongo-navi'][0]]['ansible_default_ipv4']['address'] }}"
 navi_mongo_port: 27017
-
-# consul
-consul_hostname: "{{ hostvars[groups['consul'][0]]['ansible_default_ipv4']['address'] }}"
-consul_port: 8500
-
-# ec2
-aws_access_key: "AKIAIB3IJCCJZQWQMVSQ"
-aws_secret_key: "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"
diff --git a/ansible/group_vars/alpha-api.yml b/ansible/group_vars/alpha-api.yml
@@ -24,12 +24,14 @@ container_envs: >
   -e DATADOG_HOST={{ datadog_host_address }}
   -e DATADOG_PORT={{ datadog_port }}
   -e DOMAIN={{ domain }}
+  -e FILIBUSTER_PORT={{ filibuster_port }}
   -e GITHUB_CALLBACK_URL=https://{{ api_hostname }}/auth/github/callback
   -e GITHUB_CLIENT_ID={{ api_github_client_id }}
   -e GITHUB_CLIENT_SECRET={{ api_github_client_secret }}
   -e GITHUB_DEPLOY_KEYS_BUCKET={{ api_github_deploy_keys_bucket }}
   -e GITHUB_HOOK_URL=https://{{ api_hostname }}/actions/github
   -e HELLO_RUNNABLE_GITHUB_TOKEN={{ api_hello_runnable_github_token }}
+  -e KRAIN_PORT={{ krain_port }}
   -e MAVIS_HOST=http://{{ mavis_hostname }}:80
   -e MIXPANEL_APP_ID={{ api_mixpanel_app_id }}
   -e MONGO=mongodb://{{ api_mongo_auth }}@{{ mongo_hosts }}/{{ api_mongo_database }}
@@ -52,8 +54,8 @@ container_envs: >
   -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 SWARM_HOST=http://{{ swarm_host_address }}:{{ swarm_master_port }}
+  -e USER_CONTENT_DOMAIN={{ user_content_domain }}
 
 container_run_opts: >
   -h {{ name }}
diff --git a/ansible/group_vars/alpha-consul.yml b/ansible/group_vars/alpha-consul.yml
@@ -31,10 +31,10 @@ container_run_args: >
   -config-dir /etc/consul.d
   -client 0.0.0.0
   -recursor 8.8.8.8
-  {% if consul_hostname == ansible_default_ipv4.address %}-bootstrap-expect {{ groups['consul'] | length }}{% endif %}
+  {% if consul_host_address == ansible_default_ipv4.address %}-bootstrap-expect {{ groups['consul'] | length }}{% endif %}
   -data-dir /data
-  {% if consul_hostname == ansible_default_ipv4.address %}-ui-dir /ui{% endif %}
-  {% if consul_hostname != ansible_default_ipv4.address %}-retry-join {{ consul_hostname }}{% endif %}
+  {% if consul_host_address == ansible_default_ipv4.address %}-ui-dir /ui{% endif %}
+  {% if consul_host_address != ansible_default_ipv4.address %}-retry-join {{ consul_host_address }}{% endif %}
   > /var/log/consul.log 2>&1
 
 # some seed values
diff --git a/ansible/group_vars/alpha-hipache.yml b/ansible/group_vars/alpha-hipache.yml
@@ -5,6 +5,8 @@ container_image: registry.runnable.com/runnable/hipache
 container_tag: latest
 hosted_ports: [ 80, 443 ]
 
+log_driver: json-file
+
 container_run_opts: >
   -d
   -p 80:80
diff --git a/ansible/group_vars/alpha-registry.yml b/ansible/group_vars/alpha-registry.yml
@@ -5,6 +5,8 @@ container_image: "registry"
 container_tag: "2.1.1"
 hosted_ports: ["80"]
 
+log_driver: json-file
+
 container_envs: >
   -e REGISTRY_STORAGE_S3_ACCESSKEY={{ registry_s3_access_key }}
   -e REGISTRY_STORAGE_S3_SECRETKEY={{ registry_s3_secret_key }}
diff --git a/ansible/group_vars/alpha-workers.yml b/ansible/group_vars/alpha-workers.yml
@@ -17,13 +17,15 @@ container_envs: >
   -e DATADOG_HOST={{ datadog_host_address }}
   -e DATADOG_PORT={{ datadog_port }}
   -e DOMAIN={{ domain }}
+  -e FILIBUSTER_PORT={{ filibuster_port }}
   -e GITHUB_CALLBACK_URL=https://{{ api_hostname }}/auth/github/callback
   -e GITHUB_CLIENT_ID={{ api_github_client_id }}
   -e GITHUB_CLIENT_SECRET={{ api_github_client_secret }}
   -e GITHUB_DEPLOY_KEYS_BUCKET={{ api_github_deploy_keys_bucket }}
   -e GITHUB_HOOK_URL=https://{{ api_hostname }}/actions/github
   -e HELLO_RUNNABLE_GITHUB_TOKEN={{ api_hello_runnable_github_token }}
   -e IS_QUEUE_WORKER=true
+  -e KRAIN_PORT={{ krain_port }}
   -e MAVIS_HOST=http://{{ mavis_hostname }}:80
   -e MIXPANEL_APP_ID={{ api_mixpanel_app_id }}
   -e MONGO=mongodb://{{ api_mongo_auth }}@{{ mongo_hosts }}/{{ api_mongo_database }}
@@ -44,8 +46,8 @@ container_envs: >
   -e REDIS_PORT={{ redis_port }}
   -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 }}
+  -e USER_CONTENT_DOMAIN={{ user_content_domain }}
 
 container_run_opts: >
   -h {{ name }}
diff --git a/ansible/roles/consul_value/tasks/main.yml b/ansible/roles/consul_value/tasks/main.yml
@@ -10,9 +10,9 @@
 
 - name: put values into consul
   run_once: true
-  when: consul_hostname is defined and consul_port is defined and consul_values is defined
+  when: consul_host_address is defined and consul_api_port is defined and consul_values is defined
   uri:
     method=PUT
-    url=http://{{ consul_hostname }}:{{ consul_port }}/v1/kv/{{ item.key }}
+    url=http://{{ consul_host_address }}:{{ consul_api_port }}/v1/kv/{{ item.key }}
     body="{{ item.value }}"
   with_items: "{{ consul_values }}"
diff --git a/ansible/roles/docker_client/files/certs/swarm-manager/cert.pem b/ansible/roles/docker_client/files/certs/swarm-manager/cert.pem
@@ -1,21 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDdDCCAlygAwIBAgIJANhn+uKF47iLMA0GCSqGSIb3DQEBCwUAMIGQMQswCQYD
+MIIDmzCCAoOgAwIBAgIJAOyP2UK2Jph5MA0GCSqGSIb3DQEBCwUAMIGQMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
 aXNjbzERMA8GA1UEChMIUnVubmFibGUxDDAKBgNVBAsTA09wczESMBAGA1UEAxMJ
 bG9jYWxob3N0MR8wHQYJKoZIhvcNAQkBFhBvcHNAcnVubmFibGUuY29tMB4XDTE1
-MTEyOTIyMDQ1NloXDTE2MTEyODIyMDQ1NlowETEPMA0GA1UEAxMGY2xpZW50MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw6sZNydXG/qsoitXQEnqxjym
-r3FWxiMKnxBfptXHknfh9lBbHn+oBjYeONco2qtpTK/TqI6eqbXlgz0NVN1jlV35
-SCRq0oU0cwijtbs6vQLQUA73LQlBFopN1sOhbL91lV4QHVY/OApOrp34tn9ZrppW
-58xb1SIBjVISrSXAwWUp7CZPTRCuJp1zgcuLumEoBPtXDseolGRFpLtZO8fSL6CN
-8HWOf5lJncpmo6C+mRv1Z96XBKrkR+4Eo8YDtK2MmxR5rPv/6ifWs7ZaZ8dk8Su/
-D68E8RIewflkMFBv7pwo/pYkyWv2pDtchP2MNtDBH3Qv4uGgZtDmmM1lA+chYQID
-AQABo08wTTAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwLAYDVR0RBCUw
-I4cECgQG+4cEChQBO4cECgAB74cEfwAAAYIJbG9jYWxob3N0MA0GCSqGSIb3DQEB
-CwUAA4IBAQBKeOihACoWpPgDg97CZTT3DkbE6MXIzoRoSItesAN11PjFbdZi53NT
-RUZA2/QTFKsJQefELY9vyREPyJCm3BFnAY8ptQN6fIFzGg8uER6wJKKjxsRGcjxz
-4aEaQadTtQ3kXqwo2+CcuJvCR7+YD6w6zY/M5B1t8CWYd/+SdR965tL3sbJG/TNK
-PUB0HF2/166MjPPAOwnO05nPNj8Yu3P0G70X1S3URuMteuUrTyb1Q3Md/DDMwg2k
-DbMFCFdiolBeb8AiExkUv+ljE8Tl/i83+/tF2qGo01afHiMnKvSsvr58NtWvmKtP
-MGhgYV5dnGkKqkDNmwEc+3KD46sYB6o7
+MTIyMTIxNTEwOVoXDTE2MTIyMDIxNTEwOVowETEPMA0GA1UEAxMGY2xpZW50MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwDitEKPC7sIAzuPN7O6QhMGb
+MQiD5bRzaOSuNt2As9KHQVxDjFVTYtYYzSKhSykBVOEpTNgZ5s7rUe/ZA1j/RaF6
+WYm07PuzcdLz0Tu2Wn2r90enCOOzczU/wHzJoy87DPuikWSOXXRl/IuN4d34bNa1
+elEczHDvh0PoItRlK8VpCGFIxuBWVukYGWiVSdQOR36ZI8AmW8ez2H7hUdl3JHdo
+HHGnFkl5luabKdZROpCVHyR2n45O3SQVNXKZm+YDbSivextM69G04+7In4BoGg9D
+3DEy27usC0OVOJauiLW8jiCvHHLn5+VUvCfQuPS9C/hgft8MiCbcBe1pqEazzwID
+AQABo3YwdDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwUwYDVR0RBEww
+SocECggFP4cECggGO4cECgQG+4cEfwAAAYIJbG9jYWxob3N0giVzd2FybS1zdGFn
+aW5nLWNvZGVub3cucnVubmFibGVhcHAuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCh
+uK1wYnzNRqFKyJRxgO2bsIyCyUkOnxyp7GDThdqqxNPgC36TdgojUSuVOeX42qgk
+LNVEydcTZGDYLu//HGw4iAZ0sQrw/DHitAa68oUdV7yMbIIuQ08UD85PXlPnHIn+
+nMVnWET9+JtR9zCUVXqYWie3gnPxQyVN1vZLJzfdGQcB+bc8XBZUtGWQkgfRfJUk
+ShIBiAIXK6aewf4Z7buE1hhz8OnGtlphpObQfyZZlaU6ypNTwXFVjCe8ptLfsJJB
+nsoIi9i4o8ss//wtldom5oU25k2STfu9NN9Mz1nWlFmADJvpWOrgj9nv7krU14qc
+4dnxrsZ7YaH+vBM0yovA
 -----END CERTIFICATE-----
diff --git a/ansible/roles/docker_client/files/certs/swarm-manager/key.pem b/ansible/roles/docker_client/files/certs/swarm-manager/key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAw6sZNydXG/qsoitXQEnqxjymr3FWxiMKnxBfptXHknfh9lBb
-Hn+oBjYeONco2qtpTK/TqI6eqbXlgz0NVN1jlV35SCRq0oU0cwijtbs6vQLQUA73
-LQlBFopN1sOhbL91lV4QHVY/OApOrp34tn9ZrppW58xb1SIBjVISrSXAwWUp7CZP
-TRCuJp1zgcuLumEoBPtXDseolGRFpLtZO8fSL6CN8HWOf5lJncpmo6C+mRv1Z96X
-BKrkR+4Eo8YDtK2MmxR5rPv/6ifWs7ZaZ8dk8Su/D68E8RIewflkMFBv7pwo/pYk
-yWv2pDtchP2MNtDBH3Qv4uGgZtDmmM1lA+chYQIDAQABAoIBAHDIG0WmIFiZOY5T
-6vu8X12aMf2oF3snUYTzvB5+1ITBIvaFxK+kpyXFZdAffIXmDVDNe/OJGTz7AmqN
-8zQ6U58RxpDlpMjpTJ0NmscyPx4ZFBdBOQm1btXeLBWhN1dmWBEbYbB3OQNFNasC
-lQwkBX5Vqcf8C+airkBV0TwKKbuOXvrgowYIXWQCaM7rifnxzh/cgrR7mvkuTvPh
-UgZZMf3fxliDRyjsm9/UdsvgXb/14cVWqvAkTnpOWdqhyIm/syZnHYhRbIJ5JbAE
-SU2xv4KGQsE7tlvDv3TxZiR+7RPithDBOU3+gLOVHL5Kw8vD9gEoMHm0usxMeMc5
-9WNanNECgYEA/cGzX1Rpz5ZUtxz9Mpiyb4MjH7Wj5GBXsYlmMTH4OJgyBXimJG+Y
-wECp+5q6E29fYxoPSJh0PWiKxaeZnbbaIZ6Y4GO6qRfNRc/4KMUq5b0u9YO5vdqO
-iM+aBg+UXAwobIg7ZiVKXLMMnov7stIFeRz7NlALFqxBoEve+7ItPhUCgYEAxWXu
-2tz/yYFJvXnRruJRvz0uzTwGFIg8zXPDcggRWQpZtLn4M0hsA45rheO8LDpqzych
-crb0e+35Dn728MYAmcRY7aEechmFY3ghsqzz3vdxjXVxHbKgppDkwhh8lJLfH9Yt
-yS9Dg+4RAmIpeTmV9HLmsk7Ezlhp7RxiA/sp9R0CgYEAmH9E5cBcCmXEqXrhavu7
-GCrN++tz//YqHUZ+RIhMLO7B+OnFptXuDXOO8+bLdoyS3YK2tqDwEkt2QkxzlAVk
-V5nxM8CbV603LoJKF25OVlx4ERHFmSP0TqG8ZXINbbfcv0SrtbopU0ZDCjED5TY0
-FdHl4oD9+PUyRzvxWH9+kvUCgYAVctL2QwckDQFHLkJjX0IEppA8SqZaescoh8iX
-zlqcMyy2H3Lhl5/s7v+t56XdpGdQpO7UeR6tjJkAQzlvxgPwsU38XAJj4XQF79qx
-gGtrMbXL6hPlZzBfiOTiVijLN/44hlwpPRJ39lkwyhu5iVFK42U/wKFPznmMAwZ/
-aj4P3QKBgEE2sI4IDVb6AhBhrXCkOpUnoyg05jhQmDZlvlHjlW44CYnN72GIqO9T
-FtFN+pt/Y0rY2HZAo+e5ukd2HclCq7NumQI9I+dAkiqO2jac6yg32IKV70cuPOJg
-msu+LIOmc9dKu7cjz/fidxkqXLEewMe+Cc1FWp5iV6S4sgZFNUq5
+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
 -----END RSA PRIVATE KEY-----
diff --git a/ansible/roles/docker_client/scripts/genClientCert.sh b/ansible/roles/docker_client/scripts/genClientCert.sh
@@ -28,7 +28,7 @@ openssl req \
 chmod 400 "$CLIENT/client.csr"
 
 echo extendedKeyUsage=clientAuth,serverAuth > "$CLIENT/extfile.cnf"
-echo subjectAltName=IP:10.0.1.134,IP:10.4.6.251,IP:10.20.1.59,IP:10.0.1.239,IP:127.0.0.1,DNS:localhost >> "$CLIENT/extfile.cnf"
+echo subjectAltName=IP:10.8.5.63,IP:10.8.6.59,IP:10.4.6.251,IP:127.0.0.1,DNS:localhost,DNS:swarm-staging-codenow.runnableapp.com >> "$CLIENT/extfile.cnf"
 
 # generate cert for client
 openssl x509 \
diff --git a/ansible/roles/ec2/sg_configure/tasks/main.yml b/ansible/roles/ec2/sg_configure/tasks/main.yml
diff --git a/ansible/roles/hipache/tasks/main.yml b/ansible/roles/hipache/tasks/main.yml
diff --git a/ansible/stack.yml b/ansible/stack.yml
diff --git a/ansible/stage-hosts/hosts b/ansible/stage-hosts/hosts
diff --git a/ansible/stage-hosts/variables b/ansible/stage-hosts/variables
diff --git a/ssh/config b/ssh/config

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ var params = {`
`14`	`14`	`// Only search for docks in the cluster security group`
`15`	`15`	`{`
`16`	`16`	`Name: 'instance.group-id',`
`17`		`- Values: ['sg-577a0d33']`
	`17`	`+ Values: ['sg-6cd7fb08']`
`18`	`18`	`},`
`19`	`19`	`// Only fetch instances that are tagged as docks`
`20`	`20`	`{`