From 2cce902980513be84cac6c934d8faa6c3615a10a Mon Sep 17 00:00:00 2001 From: "Christopher M. Neill" Date: Tue, 8 Mar 2016 17:24:01 -0800 Subject: [PATCH] New Gamma consul cluster. --- ansible/gamma-hosts/hosts | 9 +++++---- ansible/gamma-hosts/variables | 10 ++++++---- ssh/config | 27 ++++++++++++++++++--------- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/ansible/gamma-hosts/hosts b/ansible/gamma-hosts/hosts index 96630518..7afbd02c 100644 --- a/ansible/gamma-hosts/hosts +++ b/ansible/gamma-hosts/hosts @@ -22,15 +22,15 @@ socket-server gamma-api [consul] -gamma-services -gamma-api -gamma-web +gamma-consul-a +gamma-consul-b +gamma-consul-c [docker-listener] gamma-services [vault] -gamma-services +gamma-consul-a [worker] gamma-api-worker @@ -104,6 +104,7 @@ api api bastion charon +consul dock docker-listener docks diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables index 15323715..cd3aee40 100644 --- a/ansible/gamma-hosts/variables +++ b/ansible/gamma-hosts/variables @@ -80,17 +80,19 @@ rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM registry_host=10.4.4.82 user_content_domain=runnable.ninja api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af -vault_auth_token=e22c3ebc-11cf-653b-7df0-79d78a499458 -vault_token_01=71d7b4754686013c8b9cfb22bafae79c661849dcd67c483c89efba12c0466aa201 -vault_token_02=794d6f7a3459c332a1fd2bbcc9230a7f84f1639806039ee8be547828cd7ab03a02 -vault_token_03=2e67faeffe4343c038d0f3210bdb83f3d3a5bc468975cf13e977ce9b5922aefe03 +vault_auth_token=f9a39e92-99f3-66a0-a27d-a6e07717d30d +vault_token_01=2c0be2adf99931bc9ed443000e87bbcd0ef096dddc79f6add97ebe8fa7e93d2c05 +vault_token_02=3489b87c913058740537bbbd4503f3720d74f7cb0f4e0c30a9436e1e52a18d7003 +vault_token_03=ac4e1e9800cbf77283298d08172a2f0e46d0b7cbc457c47788d04768af12584a02 [ec2:vars] env=gamma aws_custid=437258487404 +region=us-west-2 vpc_id=vpc-c53464a0 sg_api=sg-3b0c7b5f sg_bastion=sg-91eb81f5 +sg_consul=sg-899616ee sg_dock=sg-577a0d33 sg_hipache=sg-e70c7883 sg_mongo=sg-977a0df3 diff --git a/ssh/config b/ssh/config index 611c769e..ba368db2 100644 --- a/ssh/config +++ b/ssh/config @@ -70,6 +70,15 @@ Host gamma-api-worker Host gamma-api-socket ProxyCommand ssh -q ubuntu@gamma-bastion nc 10.4.14.4 22 +Host gamma-consul-a + ProxyCommand ssh -q ubuntu@gamma-bastion nc 10.4.5.144 22 + +Host gamma-consul-b + ProxyCommand ssh -q ubuntu@gamma-bastion nc 10.4.11.220 22 + +Host gamma-consul-c + ProxyCommand ssh -q ubuntu@gamma-bastion nc 10.4.13.196 22 + ## Gamma MongoDB Host gamma-mongo-a ProxyCommand ssh -q ubuntu@gamma-bastion nc 10.4.7.56 22 @@ -217,6 +226,15 @@ Host epsilon-api-worker Host epsilon-api-socket ProxyCommand ssh -q ubuntu@epsilon-bastion nc 10.12.15.207 22 +Host epsilon-consul-a + ProxyCommand ssh -q ubuntu@epsilon-bastion nc 10.12.7.67 22 + +Host epsilon-consul-b + ProxyCommand ssh -q ubuntu@epsilon-bastion nc 10.12.10.240 22 + +Host epsilon-consul-c + ProxyCommand ssh -q ubuntu@epsilon-bastion nc 10.12.12.209 22 + Host epsilon-hipache ProxyCommand ssh -q ubuntu@epsilon-bastion nc 10.12.2.195 22 @@ -247,15 +265,6 @@ Host epsilon-userland Host epsilon-web ProxyCommand ssh -q ubuntu@epsilon-bastion nc 10.12.14.33 22 -Host epsilon-consul-a - ProxyCommand ssh -q ubuntu@epsilon-bastion nc 10.12.7.67 22 - -Host epsilon-consul-b - ProxyCommand ssh -q ubuntu@epsilon-bastion nc 10.12.10.240 22 - -Host epsilon-consul-c - ProxyCommand ssh -q ubuntu@epsilon-bastion nc 10.12.12.209 22 - ################################################################################ # other ################################################################################