Cleanup legacy syntax, spacing, files all to yml

Migrate older inline= syntax to pure yml syntax for module args as to be consistant with most of the rest of the tasks
Cleanup some spacing in various files
Rename some files named yaml to yml for consistancy

reset.yml

@@ -9,7 +9,8 @@
 
   pre_tasks:
     - name: check confirmation
-      fail: msg="Reset confirmation failed"
+      fail:
+        msg: "Reset confirmation failed"
       when: reset_confirmation != "yes"
 
   roles:

roles/adduser/tasks/main.yml

@@ -1,6 +1,8 @@
 ---
 - name: User | Create User Group
-  group: name={{user.group|default(user.name)}} system={{user.system|default(omit)}}
+  group:
+    name: "{{user.group|default(user.name)}}"
+    system: "{{user.system|default(omit)}}"
 
 - name: User | Create User
   user:

roles/bastion-ssh-config/tasks/main.yml

@@ -15,4 +15,6 @@
 
 - name: create ssh bastion conf
   become: false
-  template: src=ssh-bastion.conf dest="{{ playbook_dir }}/ssh-bastion.conf"
+  template:
+    src: ssh-bastion.conf
+    dest: "{{ playbook_dir }}/ssh-bastion.conf"

roles/bootstrap-os/tasks/bootstrap-centos.yml

@@ -1,7 +1,8 @@
 ---
 
 - name: Check presence of fastestmirror.conf
-  stat: path=/etc/yum/pluginconf.d/fastestmirror.conf
+  stat:
+    path: /etc/yum/pluginconf.d/fastestmirror.conf
   register: fastestmirror
 
 # fastestmirror plugin actually slows down Ansible deployments

roles/bootstrap-os/tasks/bootstrap-coreos.yml

@@ -23,19 +23,26 @@
   tags: facts
 
 - name: Bootstrap | Copy get-pip.py
-  copy: src=get-pip.py dest=~/get-pip.py
+  copy:
+    src: get-pip.py
+    dest: ~/get-pip.py
   when: (need_pip | failed)
 
 - name: Bootstrap | Install pip
   shell: "{{ansible_python_interpreter}} ~/get-pip.py"
   when: (need_pip | failed)
 
 - name: Bootstrap | Remove get-pip.py
-  file: path=~/get-pip.py state=absent
+  file:
+    path: ~/get-pip.py
+    state: absent
   when: (need_pip | failed)
 
 - name: Bootstrap | Install pip launcher
-  copy: src=runner dest=/opt/bin/pip mode=0755
+  copy:
+    src: runner
+    dest: /opt/bin/pip
+    mode: 0755
   when: (need_pip | failed)
 
 - name: Install required python modules

roles/bootstrap-os/tasks/setup-pipelining.yml

@@ -2,5 +2,8 @@
 # Remove requiretty to make ssh pipelining work
 
 - name: Remove require tty
-  lineinfile: regexp="^\w+\s+requiretty" dest=/etc/sudoers state=absent
+  lineinfile:
+    regexp: "^\w+\s+requiretty"
+    dest: /etc/sudoers
+    state: absent
 

roles/dnsmasq/tasks/main.yml

@@ -34,7 +34,8 @@
   register: dnsmasq_config
 
 - name: Stat dnsmasq configuration
-  stat: path=/etc/dnsmasq.d/01-kube-dns.conf
+  stat:
+    path: /etc/dnsmasq.d/01-kube-dns.conf
   register: sym
 
 - name: Move previous configuration
@@ -49,7 +50,9 @@
     state: link
 
 - name: Create dnsmasq manifests
-  template: src={{item.file}} dest={{kube_config_dir}}/{{item.file}}
+  template:
+    src: "{{item.file}}"
+    dest: "{{kube_config_dir}}/{{item.file}}"
   with_items:
     - {file: dnsmasq-ds.yml, type: ds}
     - {file: dnsmasq-svc.yml, type: svc}

roles/docker/handlers/main.yml

@@ -23,7 +23,9 @@
     state: restarted
 
 - name: Docker | pause while Docker restarts
-  pause: seconds=10 prompt="Waiting for docker restart"
+  pause:
+    seconds: 10
+    prompt: "Waiting for docker restart"
 
 - name: Docker | wait for docker
   command: "{{ docker_bin_dir }}/docker images"

roles/docker/tasks/set_facts_dns.yml

@@ -51,13 +51,16 @@
   when: system_search_domains.stdout != "" 
 
 - name: check number of nameservers
-  fail: msg="Too many nameservers"
+  fail:
+    msg: "Too many nameservers"
   when: docker_dns_servers|length > 3
 
 - name: check number of search domains
-  fail: msg="Too many search domains"
+  fail:
+    msg: "Too many search domains"
   when: docker_dns_search_domains|length > 6
 
 - name: check length of search domains
-  fail: msg="Search domains exceeded limit of 256 characters"
+  fail:
+    msg: "Search domains exceeded limit of 256 characters"
   when: docker_dns_search_domains|join(' ')|length > 256

roles/docker/tasks/systemd.yml

@@ -1,6 +1,8 @@
 ---
 - name: Create docker service systemd directory if it doesn't exist
-  file: path=/etc/systemd/system/docker.service.d state=directory
+  file:
+    path: /etc/systemd/system/docker.service.d
+    state: directory
 
 - name: Write docker proxy drop-in
   template:

roles/download/tasks/main.yml

@@ -5,7 +5,10 @@
   when: "{{ download.enabled|bool and not download.container|bool }}"
 
 - name: Create dest directories
-  file: path={{local_release_dir}}/{{download.dest|dirname}} state=directory recurse=yes
+  file:
+    path: "{{local_release_dir}}/{{download.dest|dirname}}"
+    state: directory
+    recurse: yes
   when: "{{ download.enabled|bool and not download.container|bool }}"
   tags: bootstrap-os
 
@@ -44,7 +47,12 @@
   tags: facts
 
 - name: Create dest directory for saved/loaded container images
-  file: path="{{local_release_dir}}/containers" state=directory recurse=yes mode=0755 owner={{ansible_ssh_user|default(ansible_user_id)}}
+  file:
+    path: "{{local_release_dir}}/containers"
+    state: directory
+    recurse: yes
+    mode: 0755
+    owner: "{{ansible_ssh_user|default(ansible_user_id)}}"
   when: "{{ download.enabled|bool and download.container|bool }}"
   tags: bootstrap-os
 
@@ -58,7 +66,10 @@
   tags: localhost
 
 - name: Download | create local directory for saved/loaded container images
-  file: path="{{local_release_dir}}/containers" state=directory recurse=yes
+  file:
+    path: "{{local_release_dir}}/containers"
+    state: directory
+    recurse: yes
   delegate_to: localhost
   become: false
   run_once: true
@@ -105,7 +116,8 @@
   tags: facts
 
 - name: Stat saved container image
-  stat: path="{{fname}}"
+  stat:
+    path: "{{fname}}"
   register: img
   changed_when: false
   when: "{{ download.enabled|bool and download.container|bool and download_run_once|bool }}"

roles/download/tasks/set_docker_image_facts.yml

@@ -15,7 +15,8 @@
   check_mode: no
   when: not download_always_pull|bool
 
-- set_fact: docker_images="{{docker_images_raw.stdout|regex_replace('\[|\]|\\n]','')|regex_replace('\s',',')}}"
+- set_fact:
+    docker_images: "{{docker_images_raw.stdout|regex_replace('\[|\]|\\n]','')|regex_replace('\s',',')}}"
   when: not download_always_pull|bool
 
 - set_fact:

roles/etcd/handlers/main.yml

@@ -16,7 +16,9 @@
   when: is_etcd_master
 
 - name: wait for etcd up
-  uri: url="https://{% if is_etcd_master %}{{ etcd_address }}{% else %}127.0.0.1{% endif %}:2379/health" validate_certs=no
+  uri:
+    url: "https://{% if is_etcd_master %}{{ etcd_address }}{% else %}127.0.0.1{% endif %}:2379/health"
+    validate_certs: no
   register: result
   until: result.status is defined and result.status == 200
   retries: 10

roles/etcd/tasks/gen_certs_script.yml

@@ -1,11 +1,11 @@
 ---
 - name: Gen_certs | create etcd cert dir
   file:
-    path={{ etcd_cert_dir }}
-    group={{ etcd_cert_group }}
-    state=directory
-    owner=root
-    recurse=yes
+    path: "{{ etcd_cert_dir }}"
+    group: "{{ etcd_cert_group }}"
+    state: directory
+    owner: root
+    recurse: yes
 
 - name: "Gen_certs | create etcd script dir (on {{groups['etcd'][0]}})"
   file:
@@ -17,11 +17,11 @@
 
 - name: "Gen_certs | create etcd cert dir (on {{groups['etcd'][0]}})"
   file:
-    path={{ etcd_cert_dir }}
-    group={{ etcd_cert_group }}
-    state=directory
-    owner=root
-    recurse=yes
+    path: "{{ etcd_cert_dir }}"
+    group: "{{ etcd_cert_group }}"
+    state: directory
+    owner: root
+    recurse: yes
   run_once: yes
   delegate_to: "{{groups['etcd'][0]}}"
 
@@ -123,11 +123,11 @@
 
 - name: Gen_certs | check certificate permissions
   file:
-    path={{ etcd_cert_dir }}
-    group={{ etcd_cert_group }}
-    state=directory
-    owner=kube
-    recurse=yes
+    path: "{{ etcd_cert_dir }}"
+    group: "{{ etcd_cert_group }}"
+    state: directory
+    owner: kube
+    recurse: yes
 
 - name: Gen_certs | set permissions on keys
   shell: chmod 0600 {{ etcd_cert_dir}}/*key.pem

roles/etcd/tasks/main.yml

@@ -5,27 +5,33 @@
 - include: check_certs.yml
   when: cert_management == "script"
   tags: [etcd-secrets, facts]
+
 - include: gen_certs_script.yml
   when: cert_management == "script"
   tags: etcd-secrets
 
 - include: sync_etcd_master_certs.yml
   when: cert_management == "vault" and inventory_hostname in groups.etcd
   tags: etcd-secrets
+
 - include: sync_etcd_node_certs.yml
   when: cert_management == "vault" and inventory_hostname in etcd_node_cert_hosts 
   tags: etcd-secrets
+
 - include: gen_certs_vault.yml
   when: cert_management == "vault" and (etcd_master_certs_needed|d() or etcd_node_certs_needed|d())
   tags: etcd-secrets
 
 - include: "install_{{ etcd_deployment_type }}.yml"
   when: is_etcd_master
   tags: upgrade
+
 - include: set_cluster_health.yml
   when: is_etcd_master
+
 - include: configure.yml
   when: is_etcd_master
+
 - include: refresh_config.yml
   when: is_etcd_master
 
@@ -50,5 +56,6 @@
 # state insted of `new`.
 - include: set_cluster_health.yml
   when: is_etcd_master
+
 - include: refresh_config.yml
   when: is_etcd_master

roles/kernel-upgrade/tasks/centos-7.yml

@@ -1,15 +1,20 @@
 ---
 
 - name: install ELRepo key
-  rpm_key: state=present key='{{ elrepo_key_url }}'
+  rpm_key:
+    state: present
+    key: '{{ elrepo_key_url }}'
 
 - name: install elrepo repository
   yum:
     name: '{{elrepo_url}}'
     state: present
 
 - name: upgrade kernel
-  yum: name={{elrepo_kernel_package}} state=present enablerepo=elrepo-kernel
+  yum:
+    name: "{{elrepo_kernel_package}}"
+    state: present
+    enablerepo: elrepo-kernel
   register: upgrade
 
 - name: change default grub entry

roles/kernel-upgrade/tasks/reboot.yml

@@ -8,23 +8,33 @@
   shell: nohup bash -c "sleep 5 && shutdown -r now 'Reboot required for updated kernel'" &
 
 - name: Wait for some seconds
-  pause: seconds=10
+  pause:
+    seconds: 10
 
 - set_fact:
     is_bastion: "{{ inventory_hostname == 'bastion' }}"
     wait_for_delegate: "localhost"
+
 - set_fact:
     wait_for_delegate: "{{hostvars['bastion']['ansible_ssh_host']}}"
   when: "{{ 'bastion' in groups['all'] }}"
 
 - name: wait for bastion to come back
-  wait_for: host={{ ansible_ssh_host }} port=22 delay=10 timeout=300
+  wait_for:
+    host: "{{ ansible_ssh_host }}"
+    port: 22
+    delay: 10
+    timeout: 300
   become: false
   delegate_to: localhost
   when: "is_bastion"
 
 - name: waiting for server to come back (using bastion if necessary)
-  wait_for: host={{ ansible_ssh_host }} port=22 delay=10 timeout=300
+  wait_for:
+    host: "{{ ansible_ssh_host }}"
+    port: 22
+    delay: 10
+    timeout: 300
   become: false
   delegate_to: "{{ wait_for_delegate }}"
   when: "not is_bastion"

roles/kubernetes-apps/ansible/tasks/calico-policy-controller.yml

@@ -5,7 +5,9 @@
   tags: facts
 
 - name: Write calico-policy-controller yaml
-  template: src=calico-policy-controller.yml.j2 dest={{kube_config_dir}}/calico-policy-controller.yml
+  template:
+    src: calico-policy-controller.yml.j2
+    dest: "{{kube_config_dir}}/calico-policy-controller.yml"
   when: inventory_hostname == groups['kube-master'][0]
 
 - name: Start of Calico policy controller

roles/kubernetes-apps/ansible/tasks/main.yaml → roles/kubernetes-apps/ansible/tasks/main.yml

@@ -1,14 +1,17 @@
 ---
 - name: Kubernetes Apps | Wait for kube-apiserver
-  uri: url=http://localhost:8080/healthz
+  uri:
+    url: http://localhost:8080/healthz
   register: result
   until: result.status == 200
   retries: 10
   delay: 6
   when: inventory_hostname == groups['kube-master'][0]
 
 - name: Kubernetes Apps | Lay Down KubeDNS Template
-  template: src={{item.file}} dest={{kube_config_dir}}/{{item.file}}
+  template:
+    src: "{{item.file}}"
+    dest: "{{kube_config_dir}}/{{item.file}}"
   with_items:
     - {file: kubedns-rc.yml, type: rc}
     - {file: kubedns-svc.yml, type: svc}