fix all of the nits

Author: Anandkumar Patel

ansible/consul-template-updater.yml

@@ -3,8 +3,10 @@
 
 - hosts: userland
   vars_files:
-    - "group_vars/{{ var_file }}.yml"
-    - "group_vars/alpha-consul-template-updater.yml"
+  - group_vars/{{ var_file }}.yml
+  - group_vars/alpha-consul-template-updater.yml
   roles:
-  - { role: notify, tags: "notify" }
-  - { role: container_kill_start }
+  - role: notify
+    tags: notify
+
+  - role: container_kill_start

ansible/group_vars/alpha-consul-template-updater.yml

@@ -14,4 +14,4 @@ container_run_opts: >
 container_run_args: >
   -consul={{ consul_host_address }}:{{ consul_api_port }}
   -wait=1s
-  -template="/tmp/template:{{ dest_path }}/{{ out_file }}:{{ template_command }}"
+  -template="/tmp/template:{{ target_updater_file_path }}/{{ out_file }}:{{ template_command }}"

ansible/group_vars/alpha-navi-proxy.yml

@@ -3,10 +3,10 @@ name: nginx
 
 # used by consul template updater
 target_container_name: nginx
-dest_path: /etc/nginx/sites-enabled
+target_updater_file_path: /etc/nginx/sites-enabled
 template_path: /etc/nginx/template/navi.tmpl
-template_command: "/bin/docker kill -s HUP {{ target_container_name }}"
-out_file: 'navi.conf'
+template_command: /bin/docker kill -s HUP {{ target_container_name }}
+out_file: navi.conf
 
 # used by container_kill_start
 container_image: "{{ name }}"
@@ -19,6 +19,6 @@ container_run_opts: >
   -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 {{ dest_path }}
+  -v {{ target_updater_file_path }}
   -v /etc/ssl/certs/{{ user_content_domain }}:/etc/ssl/certs/{{ user_content_domain }}:ro
   -v /var/log/nginx:/var/log/nginx

ansible/group_vars/alpha-navi.yml

@@ -7,7 +7,7 @@ hosted_ports: [ "{{ navi_http_port }}" ]
 node_version: "4.2.4"
 npm_version: "2.8.3"
 
-restart_policy: "always"
+restart_policy: always
 
 redis_ca_cert_path: /opt/ssl/{{ name }}/redis/ca.pem
 content_domain_certs: /opt/ssl/{{ user_content_domain }}

ansible/navi-proxy.yml

@@ -1,15 +1,15 @@
 ---
 - hosts: userland
   vars_files:
-    - group_vars/alpha-navi-proxy.yml
+  - group_vars/alpha-navi-proxy.yml
   roles:
-    - role: datadog
-      has_dd_integration: yes
+  - role: datadog
+    has_dd_integration: yes
 
-    - role: content-domain-proxy
+  - role: content-domain-proxy
 
-    - role: container_kill_start
+  - role: container_kill_start
 
 - include: consul-template-updater.yml
   vars:
-    var_file: "alpha-navi-proxy"
+    var_file: alpha-navi-proxy

ansible/registrator.yml

@@ -3,7 +3,9 @@
 
 - hosts: navi
   vars_files:
-    - "group_vars/alpha-registrator.yml"
+  - group_vars/alpha-registrator.yml
   roles:
-  - { role: notify, tags: "notify" }
-  - { role: container_kill_start }
+  - role: notify
+    tags: notify
+
+  - role: container_kill_start