Merge branch 'master' into add-ec2-inventory

Author: Christopher M. Neill

ansible/beta-hosts/variables

@@ -65,21 +65,6 @@ api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
 env=beta
 aws_custid=437258487404
 vpc_id=vpc-9e84e1fb
-security_groups:
-- sg_api
-- sg_bastion
-- sg_dock
-- sg_hipache
-- sg_mongo
-- sg_nat
-- sg_navi
-- sg_neo4j
-- sg_rabbit
-- sg_rds
-- sg_redis
-- sg_services
-- sg_userland
-- sg_web
 sg_api=sg-a6e684c2
 sg_bastion=sg-6bc8060f
 sg_dock=sg-d6e684b2

ansible/group_vars/alpha-mavis.yml

@@ -13,21 +13,20 @@ is_redis_update_required: 'yes'
 
 # container settings
 container_envs: >
-  -e PORT={{ hosted_ports[0] }}
-  -e REDIS_PORT={{ redis_port }}
-  -e REDIS_IPADDRESS={{ redis_host_address }}
   -e DATADOG_HOST={{ datadog_host_address }}
   -e DATADOG_PORT={{ datadog_port }}
-  -e CONTAINER_WEIGHT=0
+  -e DOCKER_CERT_PATH=/etc/ssl/docker
   -e NEWRELIC_KEY={{ new_relic_license_key }}
+  -e PORT={{ hosted_ports[0] }}
   -e RABBITMQ_HOSTNAME={{ rabbit_host_address }}
   -e RABBITMQ_PASSWORD={{ rabbit_password }}
   -e RABBITMQ_PORT={{ rabbit_port }}
   -e RABBITMQ_USERNAME={{ rabbit_username }}
-  -e CONSUL_HOST={{ consul_host_address }}
-  -e CONSUL_PORT={{ consul_api_port }}
-  -e DOCKER_CERT_PATH=/etc/ssl/docker
+  -e REDIS_IPADDRESS={{ redis_host_address }}
+  -e REDIS_PORT={{ redis_port }}
   -e SWARM_CONTAINER_NAME={{ swarm_container_name }}
+  -e SWARM_HOSTNAME={{ swarm_host_address }}
+  -e SWARM_PORT={{ swarm_master_port }}
 
 container_run_opts: >
   -h {{ name }}

ansible/group_vars/alpha-metis.yml

@@ -29,7 +29,6 @@ container_envs: >
   -e REGISTRY_HOST={{ registry_host }}
   -e ROLLBAR_KEY={{ shiva_rollbar_key }}
   -e DOCKER_PORT={{ docker_port }}
-  -e SWARM_TOKEN={{ swarm_token }}
 
 container_run_opts: >
   -h {{ name }}

ansible/group_vars/alpha-shiva.yml

@@ -28,7 +28,6 @@ container_envs: >
   -e REGISTRY_HOST={{ registry_host }}
   -e ROLLBAR_KEY={{ shiva_rollbar_key }}
   -e DOCKER_PORT={{ docker_port }}
-  -e SWARM_TOKEN={{ swarm_token }}
 
 container_run_opts: >
   -h {{ name }}

ansible/mavis.yml

@@ -1,6 +1,6 @@
 ---
 - hosts: redis
-- hosts: consul
+- hosts: swarm-manager
 - hosts: rabbitmq
 
 - hosts: mavis