add nginx and reggi to gamma

Author: Anandkumar Patel

ansible/api-core.yml

@@ -16,9 +16,18 @@
   - role: notify
     rollbar_token: "{{ api_rollbar_key }}"
     tags: [ notify ]
-  - { role: redis_key, tags: [ setup, redis_key ] }
-  - { role: builder, tags: [ build ] }
-  - { role: docker_client }
-  - { role: tls-client, tls_service: mongodb, tags: [ tls ] }
-  - { role: datadog, tags: [ datadog ] }
-  - { role: container_start }
+
+  - role: builder
+    tags: [ build ]
+
+  - role: docker_client
+
+  - role: tls-client
+    tags: [ tls ]
+    tls_service: mongodb
+
+  - role: datadog
+    tags: [ datadog ]
+
+  - role: container_start
+    number_of_containers: "{{ ansible_processor_cores }}"

ansible/consul-template-updater.yml

@@ -1,7 +1,7 @@
 ---
 - hosts: consul
 
-- hosts: userland
+- hosts: "{{ host }}"
   vars_files:
   - group_vars/{{ var_file }}
   - group_vars/alpha-consul-template-updater.yml

ansible/gamma-hosts/hosts

@@ -45,6 +45,9 @@ gamma-app-services
 [navi]
 gamma-navi
 
+[ingress]
+gamma-ingress
+
 [link]
 gamma-navi
 
@@ -127,6 +130,7 @@ drake
 eru
 github-varnish
 hipache
+ingress
 khronos
 mavis
 metis

ansible/group_vars/alpha-ingress-proxy.yml

@@ -0,0 +1,25 @@
+---
+name: nginx
+
+# used by consul template updater
+proxy_service_name: api
+target_container_name: nginx
+target_updater_file_path: /etc/nginx/sites-enabled
+template_command: /bin/docker kill -s HUP {{ target_container_name }}
+template_path: /etc/nginx/template/api.tmpl
+
+# used by container_kill_start
+container_image: "{{ name }}"
+container_tag: "1.10"
+
+restart_policy: always
+
+container_run_opts: >
+  -d
+  --name {{ name }}
+  -p 0.0.0.0:443:443
+  -p 0.0.0.0:80:80
+  -v /etc/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+  -v {{ target_updater_file_path }}
+  -v /etc/ssl/certs/{{ domain }}:/etc/ssl/certs/{{ domain }}:ro
+  -v /var/log/nginx:/var/log/nginx

ansible/ingress-proxy.yml

@@ -0,0 +1,16 @@
+---
+- hosts: ingress
+  vars_files:
+  - group_vars/alpha-ingress-proxy.yml
+  roles:
+  - role: datadog
+    has_dd_integration: yes
+
+  - role: runnable-domain-proxy
+
+  - role: container_kill_start
+
+- include: consul-template-updater.yml
+  vars:
+    host: ingress
+    var_file: alpha-ingress-proxy.yml

ansible/navi-proxy.yml

@@ -12,4 +12,5 @@
 
 - include: consul-template-updater.yml
   vars:
+    host: ingress
     var_file: alpha-navi-proxy.yml

ansible/registrator-api.yml

@@ -0,0 +1,11 @@
+---
+- hosts: consul
+
+- hosts: api
+  vars_files:
+  - group_vars/alpha-registrator.yml
+  roles:
+  - role: notify
+    tags: notify
+
+  - role: container_kill_start

ansible/registrator.yml ansible/registrator-navi.ymlansible/registrator.yml renamed to ansible/registrator-navi.yml

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
 IMAGE_NAME="$1"
-CONTAINERS=`docker ps | grep -v '^CONTAINER' | awk '{print $1}'`
+CONTAINERS=`docker ps -a | grep -v '^CONTAINER' | awk '{print $1}'`
 
 if [ "" = "${CONTAINERS}" ] ; then
     exit 0
 else
     for container in ${CONTAINERS} ; do
-        docker inspect "${container}" | grep -q '"Image": "'"${IMAGE_NAME}":
+        docker inspect "${container}" 2>/dev/null| grep -q '"Image": "'"${IMAGE_NAME}": > /dev/null 2>&1
         if [ ${?} -eq 0 ] ; then
             if [ -z "${RUNNING_CONTAINERS}" ] ; then
                 RUNNING_CONTAINERS="${container}"
@@ -19,5 +19,5 @@ else
 fi
 
 if [ ! -z "${RUNNING_CONTAINERS}" ] ; then
-    echo "${RUNNING_CONTAINERS}"
+    echo "${RUNNING_CONTAINERS//['\t\r\n']}"
 fi

ansible/roles/container_kill_start/files/findTagRunning.sh

@@ -22,7 +22,7 @@
   become: true
   script: findTagRunning.sh {{ container_image }}
   register: old_containers_id
-  changed_when: old_containers_id.stdout != ''
+  changed_when: old_containers_id.stdout | length > 4
 
 # get latest image
 # tag will default to latest
@@ -48,16 +48,14 @@
   tags: deploy
   when: old_containers_id.changed
   become: yes
-  command: docker stop -t {{ stop_time }} {{ item }}
-  with_items: "{{ old_containers_id.stdout_lines }}"
+  command: docker stop -t {{ stop_time }} {{ old_containers_id.stdout }}
 
 # remove the old containers that were running previously
 - name: remove old containers
   tags: deploy
   when: old_containers_id.changed
   become: yes
-  command: docker rm {{ item }}
-  with_items: "{{ old_containers_id.stdout_lines }}"
+  command: docker rm {{ old_containers_id.stdout }}
 
 - name: pause to allow for any odd conditions in system caching tables
   tags: deploy