Merge branch 'master' into SAN-3496-json-logs

Author: Christopher M. Neill

ansible/group_vars/alpha-eru.yml

@@ -17,6 +17,7 @@ container_envs: >-
   -e AWS_ACCESS_KEY={{ eru_aws_access_key_id }}
   -e AWS_ENVIRONMENT={{ eru_aws_environment }}
   -e AWS_SECRET_KEY={{ eru_aws_secret_access_key }}
+  -e CONSUL_HOST={{ consul_host_address }}:{{ consul_api_port }}
   -e DOMAIN={{ eru_subdomain }}.{{ domain }}
   -e GITHUB_CLIENT_ID={{ eru_github_id }}
   -e GITHUB_CLIENT_SECRET={{ eru_github_secret }}

ansible/group_vars/alpha-swarm-daemon.yml

@@ -2,7 +2,7 @@ name: "swarm-deamon"
 
 # container_kill_start settings
 container_image: swarm
-container_tag: 1.1.2
+container_tag: 1.2.0
 
 container_run_opts: >
   --name {{ swarm_container_name }}

ansible/group_vars/alpha-swarm-manager.yml

@@ -2,7 +2,7 @@ name: "swarm-manager"
 
 # container_kill_start settings
 container_image: swarm
-container_tag: 1.1.2
+container_tag: 1.2.0
 
 container_run_opts: >
   -d

ansible/roles/ec2/sg_configure/tasks/main.yml

@@ -81,6 +81,10 @@
         from_port: "{{ consul_api_port }}"
         to_port: "{{ consul_api_ssl_port }}"
         group_id: "{{ sg_dock_services }}"
+      - proto: tcp
+        from_port: "{{ consul_api_port }}"
+        to_port: "{{ consul_api_port }}"
+        group_id: "{{ sg_app_services }}"
       - proto: tcp
         from_port: "{{ consul_api_port }}"
         to_port: "{{ consul_api_ssl_port }}"