Merge pull request #418 from CodeNow/ansible-2

Ansible 2

Author: anandkumarpatel

ansible/.gitignore

@@ -1 +1,2 @@
+_cache
 *.pyc

ansible/ansible.cfg

@@ -1,3 +1,3 @@
 [defaults]
 # Required so `sudo: yes` does not lose the environment variables, which hold the ssh-agent socket
-sudo_flags=-HE
+sudo_flags = -HE

ansible/group_vars/alpha-api-base.yml

@@ -9,7 +9,7 @@ repo: git@github.com:CodeNow/api.git
 sendgrid_key: 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
 
 # shared ENV's between api services
-api_base_container_envs: >
+api_base_container_envs: >-
   -e AWS_ACCESS_KEY_ID={{ api_aws_access_key_id }}
   -e AWS_SECRET_ACCESS_KEY={{ api_aws_secret_access_key }}
   -e COOKIE_DOMAIN={{ domain }}

ansible/group_vars/alpha-optimus.yml

@@ -1,15 +1,15 @@
-name: "optimus"
+name: optimus
 
-container_image: "registry.runnable.com/runnable/{{ name }}"
+container_image: registry.runnable.com/runnable/{{ name }}
 container_tag: "{{ git_branch }}"
-repo: "git@github.com:CodeNow/{{ name }}.git"
+repo: git@github.com:CodeNow/{{ name }}.git
 hosted_ports: ["{{ optimus_port }}"]
 node_version: "4.3.2"
 npm_version: "2.8.3"
 
 # for redis
-redis_key: "frontend:{{ optimus_hostname }}"
-is_redis_update_required: 'yes'
+redis_key: frontend:{{ optimus_hostname }}
+is_redis_update_required: yes
 
 container_envs: >
   -e NODE_ENV={{ node_env }}
@@ -26,4 +26,4 @@ container_run_opts: >
   -h {{ name }}
   -d
   -P
-  {{container_envs}}
+  {{ container_envs }}

ansible/roles/build_essential/tasks/main.yml

@@ -1,8 +1,8 @@
 ---
 - name: install build essentials
-  sudo: true
+  become: yes
   action: apt
-    pkg="build-essential"
-    state=present
-    update_cache=yes
-    cache_valid_time=604800
+    pkg: build-essential
+    state: present
+    update_cache: yes
+    cache_valid_time: 604800

ansible/roles/builder/defaults/main.yml

@@ -1,3 +1,3 @@
 ---
-build_dir: /opts/builds/docker_build/
+build_dir: /opts/builds/docker_build
 npm_start_command: start

ansible/roles/builder/tasks/main.yml

@@ -3,31 +3,33 @@
 - name: create build folder
   become: true
   file:
-    path="{{ build_dir }}/{{ name }}"
-    state=directory
+    path: "{{ build_dir }}/{{ name }}"
+    state: directory
 
 - name: pull the git repository
   tags: deploy
   become: true
   git:
-    repo="{{ repo }}"
-    dest="{{ build_dir }}/{{ name }}/repo"
-    version="{{ git_branch }}"
-    update=yes
-    accept_hostkey=True
-    force=yes
+    repo: "{{ repo }}"
+    dest: "{{ build_dir }}/{{ name }}/repo"
+    version: "{{ git_branch }}"
+    update: yes
+    accept_hostkey: yes
+    force: yes
 
 - name: copy dockerfile to build folder
   tags: deploy
   become: true
   template:
-    src={{ dockerfile }}
-    dest="{{ build_dir }}/{{ name }}"
+    src: "{{ dockerfile }}"
+    dest: "{{ build_dir }}/{{ name }}"
 
 - name: build docker image and tag
   tags: deploy
-  command: sudo docker build {{ build_args | default("") }} --tag="{{ container_image }}:{{ container_tag }}" "{{ build_dir }}/{{ name }}"
+  become: yes
+  command: docker build {{ build_args | default("") }} --tag="{{ container_image }}:{{ container_tag }}" "{{ build_dir }}/{{ name }}"
 
 - name: push docker image
+  become: yes
   when: not do_not_push
-  command: sudo docker push {{ container_image }}:{{ container_tag }}
+  command: docker push {{ container_image }}:{{ container_tag }}

ansible/roles/container_kill_start/handlers/main.yml

@@ -2,12 +2,13 @@
 - name: get new container ports
   tags: deploy
   when: hosted_ports is defined
-  shell: sudo docker port {{new_container_id.stdout}} {{ hosted_ports[0] }} | awk --field-separator ':' '{print $2}'
+  become: yes
+  shell: docker port {{new_container_id.stdout}} {{ hosted_ports[0] }} | awk --field-separator ':' '{print $2}'
   register: container_ports
 
 # this assumes only one container is running, ever
 - name: update redis key
   tags: deploy
-  when: container_ports is defined
-  command: sudo docker run --rm redis redis-cli -h {{redis_host_address}} lset {{redis_key}} 1 {{hosted_protocol | default('http') }}://{{ansible_default_ipv4.address}}:{{container_ports.stdout}}
-  when: is_redis_update_required is defined
+  when: container_ports is defined and is_redis_update_required is defined
+  become: yes
+  command: docker run --rm redis redis-cli -h {{redis_host_address}} lset {{redis_key}} 1 {{hosted_protocol | default('http') }}://{{ansible_default_ipv4.address}}:{{container_ports.stdout}}

ansible/roles/container_kill_start/tasks/main.yml

@@ -1,21 +1,23 @@
-- name: "look for stopped {{ container_image }} containers"
+- name: look for stopped {{ container_image }} containers
   tags: deploy
+  become: yes
   shell: >
-    sudo docker ps -a |
+    docker ps -a |
     grep Exited |
     grep {{ container_image }} |
     awk '{print $1}'
   register: stopped_containers
   changed_when: stopped_containers.stdout != ''
 
-- name: "removed stopped {{ container_image }} containers"
+- name: removed stopped {{ container_image }} containers
   tags: deploy
+  become: yes
   when: stopped_containers.changed
-  shell: sudo docker rm {{ item }}
-  with_items: stopped_containers.stdout_lines
+  shell: docker rm {{ item }}
+  with_items: "{{ stopped_containers.stdout_lines }}"
 
 # get current running container with this image
-- name: "look for running containers running {{ container_image }}"
+- name: look for running containers running {{ container_image }}
   tags: deploy
   become: true
   script: findTagRunning.sh {{ container_image }}
@@ -24,16 +26,18 @@
 
 # get latest image
 # tag will default to latest
-- name: "pull down docker image {{ container_image }}:{{ container_tag }}"
+- name: pull down docker image {{ container_image }}:{{ container_tag }}
   tags: deploy
-  command: sudo docker pull {{ container_image }}:{{ container_tag }}
+  become: yes
+  command: docker pull {{ container_image }}:{{ container_tag }}
   when: not do_not_push
 
 # get id of new image
 - name: get id of the docker image
   tags: deploy
+  become: yes
   shell: >
-    sudo docker images
+    docker images
     --no-trunc |
     grep {{ container_image }}.*{{ container_tag }} |
     awk '{print $3}'
@@ -43,32 +47,35 @@
 - name: stop old containers
   tags: deploy
   when: old_containers_id.changed
-  command: sudo docker stop -t {{ stop_time }} {{ item }}
-  with_items: old_containers_id.stdout_lines
+  become: yes
+  command: docker stop -t {{ stop_time }} {{ item }}
+  with_items: "{{ old_containers_id.stdout_lines }}"
 
 # remove the old containers that were running previously
 - name: remove old containers
   tags: deploy
   when: old_containers_id.changed
-  command: sudo docker rm {{ item }}
-  with_items: old_containers_id.stdout_lines
+  become: yes
+  command: docker rm {{ item }}
+  with_items: "{{ old_containers_id.stdout_lines }}"
 
 - name: pause to allow for any odd conditions in system caching tables
   tags: deploy
   when: pause_length_minutes is defined and old_containers_id.changed
-  pause: minutes={{pause_length_minutes}}
+  pause: minutes={{ pause_length_minutes }}
 
 # start our new container with options and args
 - name: start container
   tags: deploy
+  become: yes
   command: >
-    sudo docker run
+    docker run
     --log-driver={{ log_driver }}
     --log-opt syslog-facility={{ log_facility }}
     --log-opt tag="{{ log_tag | default ( name ) }}"
     -v {{ app_log_dir }}:{{ app_log_dir }}:rw
     --restart={{ restart_policy | default('always') }}
-    {{ container_run_opts}}
+    {{ container_run_opts }}
     {{ container_image }}:{{ container_tag }}
     {{ container_run_args }}
   register: new_container_id

ansible/roles/container_restart/tasks/main.yml

@@ -34,4 +34,4 @@
   when: force_stop is defined or (stopped_container.skipped and not running_containers.changed)
   tags: [ deploy ]
   become: yes
-  shell: docker run {{ docker_container_run_opts }} {{ docker_image }}:{{ docker_image_version }}
+  shell: docker run {{ docker_container_run_opts | trim }} {{ docker_image }}:{{ docker_image_version }}