diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5e0505044..1a7c12d65 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,14 +15,12 @@ repos:
       - id: check-yaml
         files: .*\.(yaml|yml)$
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.12.1
+    rev: v1.13.0
     hooks:
       - id: yamllint
         files: \.(yaml|yml)$
         types: [file, yaml]
-        # uncommend once a new yamllint release is made:
-        # entry: yamllint --strict
-
+        entry: yamllint --strict
   - repo: https://github.com/openstack-dev/bashate.git
     rev: 0.6.0
     hooks:
diff --git a/config/environments/ovb-common.yml b/config/environments/ovb-common.yml
index 006be86c5..704623c2b 100644
--- a/config/environments/ovb-common.yml
+++ b/config/environments/ovb-common.yml
@@ -1,3 +1,4 @@
+---
 environment_type: ovb_host_cloud
 
 # undercloud.conf
@@ -37,12 +38,12 @@ external_interface_netmask: 255.255.255.0
 
 # images to copy to the undercloud
 images:
-    - name: overcloud-full
-      url: "{{ overcloud_image_url }}"
-      type: tar
-    - name: ipa_images
-      url: "{{ ipa_image_url }}"
-      type: tar
+  - name: overcloud-full
+    url: "{{ overcloud_image_url }}"
+    type: tar
+  - name: ipa_images
+    url: "{{ ipa_image_url }}"
+    type: tar
 
 network_environment_args:
   ExternalNetCidr: "{{ undercloud_external_network_cidr }}"
@@ -63,7 +64,7 @@ network_environment_args:
   TenantNetCidr: 172.16.0.0/24
   TenantAllocationPools: [{"start": "172.16.0.10", "end": "172.16.0.250"}]
   DnsServers: "{{ overcloud_dns_servers }}"
-  PublicVirtualFixedIPs: [{ "ip_address": "{{ undercloud_external_network_cidr|nthhost(5) }}" }]
+  PublicVirtualFixedIPs: [{"ip_address": "{{ undercloud_external_network_cidr|nthhost(5) }}"}]
   NeutronGlobalPhysnetMtu: 1350
   BondInterfaceOvsOptions: bond_mode=balance-slb
 
diff --git a/config/general_config/centosci-logs.yml b/config/general_config/centosci-logs.yml
index bd3df425a..7f82bdbb3 100644
--- a/config/general_config/centosci-logs.yml
+++ b/config/general_config/centosci-logs.yml
@@ -1,3 +1,4 @@
+---
 artcl_gzip_only: true
 artcl_artifact_url: https://ci.centos.org/artifacts/rdo
 artcl_publish: true
diff --git a/config/general_config/deprecated/containers_minimal.yml b/config/general_config/deprecated/containers_minimal.yml
index fc6d50d30..a0ea96b21 100644
--- a/config/general_config/deprecated/containers_minimal.yml
+++ b/config/general_config/deprecated/containers_minimal.yml
@@ -1,3 +1,4 @@
+---
 # We run tempest in this topology instead of ping test.
 # We set introspection to true and use only the minimal amount of nodes
 # for this job, but test all defaults otherwise.
@@ -22,7 +23,7 @@ containerized_overcloud: true
 
 # This enables TLS for the undercloud which will also make haproxy bind to the
 # configured public-vip and admin-vip.
-undercloud_generate_service_certificate: True
+undercloud_generate_service_certificate: true
 
 # This enables the deployment of the overcloud with SSL.
 ssl_overcloud: false
diff --git a/config/general_config/deprecated/containers_undercloud_minimal.yml b/config/general_config/deprecated/containers_undercloud_minimal.yml
index 843ed85fa..0e051a506 100644
--- a/config/general_config/deprecated/containers_undercloud_minimal.yml
+++ b/config/general_config/deprecated/containers_undercloud_minimal.yml
@@ -1,3 +1,4 @@
+---
 # EXPERIMENTAL FEATURE
 # set the working_dir on the undercloud
 working_dir: /home/stack
@@ -44,12 +45,12 @@ run_tempest: false
 tempest_workers: 4
 
 # Config for custom tripleo-heat-templates
-#overcloud_templates_path: /home/stack/tripleo-heat-templates
-#overcloud_templates_repo: https://git.openstack.org/openstack/tripleo-heat-templates
-## use templates_branch when not testing with an unmerged review
-#overcloud_templates_branch: master
-## use templates_refspec when testing with an unmerged review
-#overcloud_templates_refspec:
+# overcloud_templates_path: /home/stack/tripleo-heat-templates
+# overcloud_templates_repo: https://git.openstack.org/openstack/tripleo-heat-templates
+# # use templates_branch when not testing with an unmerged review
+# overcloud_templates_branch: master
+# # use templates_refspec when testing with an unmerged review
+# overcloud_templates_refspec:
 
 # options below direct automatic doc generation by tripleo-collect-logs
 artcl_gen_docs: true
diff --git a/config/general_config/deprecated/scale_compute.yml b/config/general_config/deprecated/scale_compute.yml
index 6ae95682b..96455f5bd 100644
--- a/config/general_config/deprecated/scale_compute.yml
+++ b/config/general_config/deprecated/scale_compute.yml
@@ -42,17 +42,26 @@ flavor_args: >-
 
 timeout_args: "--timeout {{ deploy_timeout }}"
 
-extra_args: "--compute-scale 1 -e {{ overcloud_templates_path }}/environments/network-isolation.yaml -e {{ overcloud_templates_path }}/environments/net-single-nic-with-vlans.yaml -e ~/network-environment.yaml --ntp-server pool.ntp.org"
+extra_args: >
+  --compute-scale 1
+  -e {{ overcloud_templates_path }}/environments/network-isolation.yaml
+  -e {{ overcloud_templates_path }}/environments/net-single-nic-with-vlans.yaml
+  -e ~/network-environment.yaml --ntp-server pool.ntp.org
 
 # Pull out scale_extra_args so the same var can be reused for the call to
 # `openstack overcloud delete`
-scale_extra_configs: "-e {{ overcloud_templates_path }}/environments/network-isolation.yaml -e {{ overcloud_templates_path }}/environments/net-single-nic-with-vlans.yaml -e /home/stack/network-environment.yaml"
-scale_extra_args: "--{{ node_to_scale }}-scale {{ final_scale_value }} {{ scale_extra_configs }} --ntp-server pool.ntp.org"
+scale_extra_configs: >
+  -e {{ overcloud_templates_path }}/environments/network-isolation.yaml
+  -e {{ overcloud_templates_path }}/environments/net-single-nic-with-vlans.yaml
+  -e /home/stack/network-environment.yaml
+scale_extra_args: >
+  --{{ node_to_scale }}-scale {{ final_scale_value }} {{ scale_extra_configs }}
+  --ntp-server pool.ntp.org
 
 # Scale deployment info
-node_to_scale: compute # Type of node to scale
-initial_scale_value: 1 # Initial number of nodes to deploy
-final_scale_value: 2   # Number of additional nodes to add during the scale
+node_to_scale: compute  # Type of node to scale
+initial_scale_value: 1  # Initial number of nodes to deploy
+final_scale_value: 2  # Number of additional nodes to add during the scale
 
 # Scale deployment arguments
 scale_args: >-
diff --git a/config/general_config/ovb-minimal-pacemaker-public-bond.yml b/config/general_config/ovb-minimal-pacemaker-public-bond.yml
index 7290cff93..100035047 100644
--- a/config/general_config/ovb-minimal-pacemaker-public-bond.yml
+++ b/config/general_config/ovb-minimal-pacemaker-public-bond.yml
@@ -1,3 +1,4 @@
+---
 # baremetal settings
 step_introspect: true
 network_isolation_type: public-bond
@@ -22,9 +23,9 @@ extra_args: " --control-flavor baremetal --compute-flavor baremetal "
 # in order to reduce the overall memory footprint
 # This is not required in newton
 telemetry_args: >-
-   {% if release not in ['newton', 'ocata'] %}
-   -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
-   {% endif %}
+  {% if release not in ['newton', 'ocata'] %}
+  -e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
+  {% endif %}
 
 run_tempest: false
 tempest_config: false
diff --git a/config/general_config/ovb-multiple-nics.yml b/config/general_config/ovb-multiple-nics.yml
index aceea02b8..c3fa07151 100644
--- a/config/general_config/ovb-multiple-nics.yml
+++ b/config/general_config/ovb-multiple-nics.yml
@@ -1,3 +1,4 @@
+---
 # baremetal settings
 step_introspect: true
 network_isolation_type: multiple-nics
diff --git a/config/general_config/rdoproject-logs.yml b/config/general_config/rdoproject-logs.yml
index a6889b7be..00267eee5 100644
--- a/config/general_config/rdoproject-logs.yml
+++ b/config/general_config/rdoproject-logs.yml
@@ -1,3 +1,4 @@
+---
 artcl_publish: true
 artcl_use_zuul_swift_upload: true
 artcl_swift_container: artifacts
diff --git a/playbooks/multinode-undercloud-upgrade.yml b/playbooks/multinode-undercloud-upgrade.yml
index 65a1ecd71..3fadecfd6 100644
--- a/playbooks/multinode-undercloud-upgrade.yml
+++ b/playbooks/multinode-undercloud-upgrade.yml
@@ -1,3 +1,4 @@
+---
 - name: Configure next release repository in the undercloud
   hosts: undercloud
   tags:
@@ -12,7 +13,7 @@
   roles:
     - role: repo-setup
     - role: build-test-packages
-    - { role: install-built-repo, when: compressed_gating_repo is defined }
+    - {role: install-built-repo, when: compressed_gating_repo is defined}
 
 - name: Run tripleo-upgrade role to upgrade undercloud
   hosts: undercloud
@@ -20,4 +21,3 @@
     - undercloud-upgrade
   roles:
     - role: tripleo-upgrade
-
diff --git a/playbooks/ovb-create-stack.yml b/playbooks/ovb-create-stack.yml
index 42ed9492d..7cce2b949 100644
--- a/playbooks/ovb-create-stack.yml
+++ b/playbooks/ovb-create-stack.yml
@@ -13,5 +13,4 @@
 - name: Create the OVB stack
   hosts: localhost
   roles:
-    - { role: ovb-manage-stack, ovb_manage_stack_mode: 'create' }
-
+    - {role: ovb-manage-stack, ovb_manage_stack_mode: 'create'}
diff --git a/playbooks/ovb-delete-stack.yml b/playbooks/ovb-delete-stack.yml
index 72a3cc1f7..2fff5860e 100644
--- a/playbooks/ovb-delete-stack.yml
+++ b/playbooks/ovb-delete-stack.yml
@@ -2,4 +2,4 @@
 - name: clean up heat stack
   hosts: localhost
   roles:
-    - { role: ovb-manage-stack, ovb_manage_stack_mode: 'delete' }
+    - {role: ovb-manage-stack, ovb_manage_stack_mode: 'delete'}
diff --git a/playbooks/prepare-slave.yml b/playbooks/prepare-slave.yml
index 40cc0d521..74568627e 100644
--- a/playbooks/prepare-slave.yml
+++ b/playbooks/prepare-slave.yml
@@ -1,3 +1,4 @@
+---
 # Playbook included in OVB setups that use a testenv broker to create the
 # OVB stack.
 
@@ -40,9 +41,8 @@
               addresses:
                 - ip_netmask: 10.0.0.1/24
                 - ip_netmask: 2001:db8:fd00:1000::1/64
-        create: yes
+        create: true
 
     - name: Install ipmitool if not installed
       yum: name=ipmitool state=latest
       become: true
-
diff --git a/playbooks/quickstart-extras.yml b/playbooks/quickstart-extras.yml
index ade2ae044..3b145704e 100644
--- a/playbooks/quickstart-extras.yml
+++ b/playbooks/quickstart-extras.yml
@@ -1,3 +1,4 @@
+---
 # This is the playbook used by the `quickstart.sh` script.
 
 - include: quickstart.yml
diff --git a/playbooks/scale_nodes.yml b/playbooks/scale_nodes.yml
index 3697aa8b7..9b05f3a7a 100644
--- a/playbooks/scale_nodes.yml
+++ b/playbooks/scale_nodes.yml
@@ -15,13 +15,13 @@
 - name: Scale overcloud nodes
   hosts: undercloud
   roles:
-    - { role: overcloud-scale, artosn_scale_nodes: true, artosn_delete_original_node: false }
+    - {role: overcloud-scale, artosn_scale_nodes: true, artosn_delete_original_node: false}
 
 # Delete the original node of type that was scaled - ensure overcloud validates after reducing scale
 - name: Delete original node of type scaled
   hosts: undercloud
   roles:
-    - { role: overcloud-scale, artosn_scale_nodes: false, artosn_delete_original_node: true }
+    - {role: overcloud-scale, artosn_scale_nodes: false, artosn_delete_original_node: true}
 
 # NOTE(hrybacki: inventory regeneration and overcloud validation must be completed in a second playbook. The
 # deleted node is removed from the hosts file. However, it still exists in memory and will cause the
diff --git a/releasenotes/notes/composable_upgrade-50c2b6edc9a1ae82.yaml b/releasenotes/notes/composable_upgrade-50c2b6edc9a1ae82.yaml
index 5481fc239..37dde044c 100644
--- a/releasenotes/notes/composable_upgrade-50c2b6edc9a1ae82.yaml
+++ b/releasenotes/notes/composable_upgrade-50c2b6edc9a1ae82.yaml
@@ -3,4 +3,3 @@ features:
   - Add support for composable upgrade since Newton release. The workflow for
     composable upgrade implement also the one for making mixed upgrade
     https://blueprints.launchpad.net/tripleo/+spec/tripleo-composable-upgrade-job
-
diff --git a/releasenotes/notes/custom-undercloud-roles-file-812cf0871a3d3370.yaml b/releasenotes/notes/custom-undercloud-roles-file-812cf0871a3d3370.yaml
index 877429dfa..427ea8076 100644
--- a/releasenotes/notes/custom-undercloud-roles-file-812cf0871a3d3370.yaml
+++ b/releasenotes/notes/custom-undercloud-roles-file-812cf0871a3d3370.yaml
@@ -1,4 +1,4 @@
-
+---
 features:
   - |
     Add `undercloud_roles_data` for containerized undercloud
diff --git a/releasenotes/notes/deploy-undercloud-with-heat-d3f76546f2048fed.yaml b/releasenotes/notes/deploy-undercloud-with-heat-d3f76546f2048fed.yaml
index d557c64d3..51daa637d 100644
--- a/releasenotes/notes/deploy-undercloud-with-heat-d3f76546f2048fed.yaml
+++ b/releasenotes/notes/deploy-undercloud-with-heat-d3f76546f2048fed.yaml
@@ -10,11 +10,9 @@ features:
     config/general_config/containers_undercloud_minimal.yml
     e.g. ./quickstart.sh -c $working_dir/config/general_config/containers_undercloud_minimal.yml --tags all -R master-tripleo-ci -w $working_dir $VIRTHOST
 
-
 deprecations:
   - |
     The variable "undercloud_hieradata_override_file" which was the hieradata
       override file for the undercloud, was deprecated in favor of the
       variables "hieradata_override_file_classic_undercloud" and
       "hieradata_override_file_t_h_t_undercloud".
-
diff --git a/roles/baremetal-prep-overcloud/meta/main.yml b/roles/baremetal-prep-overcloud/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/baremetal-prep-overcloud/meta/main.yml
+++ b/roles/baremetal-prep-overcloud/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/baremetal-prep-overcloud/tasks/install-upstream-ipxe.yml b/roles/baremetal-prep-overcloud/tasks/install-upstream-ipxe.yml
index c466f5645..b65eb91e3 100644
--- a/roles/baremetal-prep-overcloud/tasks/install-upstream-ipxe.yml
+++ b/roles/baremetal-prep-overcloud/tasks/install-upstream-ipxe.yml
@@ -10,5 +10,3 @@
   shell: >
     "{{ working_dir }}"/install-upstream-ipxe.sh
   when: step_install_upstream_ipxe|bool
-
-
diff --git a/roles/baremetal-prep-overcloud/tests/test.yml b/roles/baremetal-prep-overcloud/tests/test.yml
index ada301873..009a5c7bb 100644
--- a/roles/baremetal-prep-overcloud/tests/test.yml
+++ b/roles/baremetal-prep-overcloud/tests/test.yml
@@ -2,4 +2,4 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - ansible-role-tripleo-baremetal-overcloud
\ No newline at end of file
+    - ansible-role-tripleo-baremetal-overcloud
diff --git a/roles/baremetal-prep-virthost/meta/main.yml b/roles/baremetal-prep-virthost/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/baremetal-prep-virthost/meta/main.yml
+++ b/roles/baremetal-prep-virthost/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/baremetal-prep-virthost/tests/test.yml b/roles/baremetal-prep-virthost/tests/test.yml
index e72d87a13..3fbe855a8 100644
--- a/roles/baremetal-prep-virthost/tests/test.yml
+++ b/roles/baremetal-prep-virthost/tests/test.yml
@@ -2,4 +2,4 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - ansible-role-tripleo-baremetal-prep-virthost
\ No newline at end of file
+    - ansible-role-tripleo-baremetal-prep-virthost
diff --git a/roles/baremetal-undercloud/meta/main.yml b/roles/baremetal-undercloud/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/baremetal-undercloud/meta/main.yml
+++ b/roles/baremetal-undercloud/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/baremetal-undercloud/packages/defaults/main.yml b/roles/baremetal-undercloud/packages/defaults/main.yml
index 99284eaf4..19eb63447 100644
--- a/roles/baremetal-undercloud/packages/defaults/main.yml
+++ b/roles/baremetal-undercloud/packages/defaults/main.yml
@@ -1,3 +1,4 @@
+---
 # Additional packages
 undercloud_additional_pkgs:
   - vim
diff --git a/roles/baremetal-undercloud/packages/tasks/ntp.yml b/roles/baremetal-undercloud/packages/tasks/ntp.yml
index c599559e7..2fb39df5d 100644
--- a/roles/baremetal-undercloud/packages/tasks/ntp.yml
+++ b/roles/baremetal-undercloud/packages/tasks/ntp.yml
@@ -1,20 +1,21 @@
+---
 # Ensure ntp packages are installed
 - name: Install ntp packages
   package:
-    name: [ 'ntp', 'ntpdate' ]
+    name: ['ntp', 'ntpdate']
     state: present
 
 # Enable ntpd service
 - name: Enable ntpd service
   service:
     name: 'ntpd'
-    enabled: yes
+    enabled: true
 
 # Enable ntpdate service
 - name: Enable ntpdate service
   service:
     name: 'ntpdate'
-    enabled: yes
+    enabled: true
 
 # Stop ntpd service
 - name: Ensure ntp service is stopped to be able to launch ntpdate
@@ -42,7 +43,7 @@
   lineinfile:
     destfile: /etc/ntp/step-tickers
     line: '{{ item }}'
-    create: yes
+    create: true
   with_items: '{{ undercloud_custom_ntps|default([]) }}'
 
 # Configure ntpdate hardware synchronization
@@ -54,7 +55,9 @@
 
 # Sync time now
 - name: Synchronize time immediately with ntpdate
-  shell: ntpdate $(grep ^server /etc/ntp.conf | tail -1 | awk '{print $2}')
+  shell: |
+    set -euxo pipefail
+    ntpdate $(grep ^server /etc/ntp.conf | tail -1 | awk '{print $2}')
   changed_when: false
 
 # Start ntpd
diff --git a/roles/baremetal-undercloud/tasks/machine-provisioning.yml b/roles/baremetal-undercloud/tasks/machine-provisioning.yml
index d439ca36b..35ce7ca84 100644
--- a/roles/baremetal-undercloud/tasks/machine-provisioning.yml
+++ b/roles/baremetal-undercloud/tasks/machine-provisioning.yml
@@ -1,3 +1,4 @@
+---
 - name: Provision script execution
   shell: >
     set -o pipefail &&
diff --git a/roles/baremetal-undercloud/tasks/machine-setup.yml b/roles/baremetal-undercloud/tasks/machine-setup.yml
index 4e33fcd50..d9fb4bdca 100644
--- a/roles/baremetal-undercloud/tasks/machine-setup.yml
+++ b/roles/baremetal-undercloud/tasks/machine-setup.yml
@@ -1,3 +1,4 @@
+---
 - name: Check that virthost/undercloud is set
   fail:
     msg: "You need to set virthost/undercloud before running these playbooks."
diff --git a/roles/build-images/meta/main.yml b/roles/build-images/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/build-images/meta/main.yml
+++ b/roles/build-images/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/build-images/tasks/convert-image.yml b/roles/build-images/tasks/convert-image.yml
index 2c345d697..7426aeb5d 100644
--- a/roles/build-images/tasks/convert-image.yml
+++ b/roles/build-images/tasks/convert-image.yml
@@ -1,3 +1,4 @@
+---
 - name: indirect role include (workaround to https://github.com/ansible/ansible/issues/19472)
   include_role:
     name: convert-image
diff --git a/roles/build-images/tasks/fetch-images.yml b/roles/build-images/tasks/fetch-images.yml
index cf755ef7a..d1dbf97cf 100644
--- a/roles/build-images/tasks/fetch-images.yml
+++ b/roles/build-images/tasks/fetch-images.yml
@@ -1,3 +1,4 @@
+---
 - name: indirect role include (workaround to https://github.com/ansible/ansible/issues/19472)
   include_role:
     name: fetch-images
diff --git a/roles/build-images/tasks/main.yml b/roles/build-images/tasks/main.yml
index dcf736775..90d0a77ac 100644
--- a/roles/build-images/tasks/main.yml
+++ b/roles/build-images/tasks/main.yml
@@ -152,7 +152,7 @@
         chdir: "{{ images_working_dir }}"
 
 - name: Clean up the images working dir
-  shell:  >-
+  shell: >-
     rm -rf {{ images_working_dir }}/overcloud-full.d {{ images_working_dir }}/ironic-python-agent.d/
     sudo chown $USER: {{ images_working_dir }}/overcloud-full.* {{ images_working_dir }}/ironic-python-agent.*
   when: cleanup_images_working_dir|bool
diff --git a/roles/build-images/tasks/modify-image.yml b/roles/build-images/tasks/modify-image.yml
index d148953fb..46e81813e 100644
--- a/roles/build-images/tasks/modify-image.yml
+++ b/roles/build-images/tasks/modify-image.yml
@@ -1,3 +1,4 @@
+---
 - name: indirect role include (workaround to https://github.com/ansible/ansible/issues/19472)
   include_role:
     name: modify-image
diff --git a/roles/build-test-packages/defaults/main.yml b/roles/build-test-packages/defaults/main.yml
index 96b03b0b4..4a26caaff 100644
--- a/roles/build-test-packages/defaults/main.yml
+++ b/roles/build-test-packages/defaults/main.yml
@@ -5,7 +5,7 @@ build_repo_dir: "{{ ansible_user_dir }}"
 artg_dlrn_repo_url: "https://github.com/openstack-packages/DLRN.git"
 artg_rdoinfo_repo_url: "https://github.com/redhat-openstack/rdoinfo"
 artg_compressed_gating_repo: "/home/stack/gating_repo.tar.gz"
-artg_build_one: True
+artg_build_one: true
 dlrn_target: centos
 dlrn_cleanup: false
 dlrn_baseurl: "https://trunk.rdoproject.org/centos7/"
diff --git a/roles/build-test-packages/meta/main.yml b/roles/build-test-packages/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/build-test-packages/meta/main.yml
+++ b/roles/build-test-packages/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/build-test-packages/tasks/dlrn-build.yml b/roles/build-test-packages/tasks/dlrn-build.yml
index 0461445b4..9dbd290e0 100644
--- a/roles/build-test-packages/tasks/dlrn-build.yml
+++ b/roles/build-test-packages/tasks/dlrn-build.yml
@@ -24,11 +24,11 @@
     regexp: '{{ project_item.regexp }}'
     line: '{{ project_item.line }}'
   with_items:
-    - { regexp: 'baseurl=.*', line: 'baseurl={{ dlrn_baseurl }}' }
-    - { regexp: 'distro=.*', line: 'distro={{ artg_distro }}' }
-    - { regexp: 'source=.*', line: 'source={{ artg_change.branch }}' }
+    - {regexp: 'baseurl=.*', line: 'baseurl={{ dlrn_baseurl }}'}
+    - {regexp: 'distro=.*', line: 'distro={{ artg_distro }}'}
+    - {regexp: 'source=.*', line: 'source={{ artg_change.branch }}'}
   loop_control:
-      loop_var: project_item
+    loop_var: project_item
 
 - name: Map project name to DLRN project name
   register: project_name_mapped
@@ -37,7 +37,7 @@
     export PROJECT_NAME=$(echo {{ artg_change.project }} | sed "s|openstack/||");
     rdopkg findpkg -s $PROJECT_NAME -l rdoinfo | grep ^name | awk '{print $2}'
   args:
-      chdir: '{{ build_repo_dir }}/DLRN'
+    chdir: '{{ build_repo_dir }}/DLRN'
   changed_when: false
 
 - debug:
@@ -80,7 +80,7 @@
         dest: '{{ build_repo_dir }}/DLRN/data/{{ project_name_mapped.stdout }}_distro'
         refspec: '{{ artg_change.distgit.refspec }}'
         version: 'FETCH_HEAD'
-        accept_hostkey: yes
+        accept_hostkey: true
       when: artg_change.distgit is defined and (artg_repos_dir is not defined or copy_dir is failed)
 
     - name: Run DLRN
@@ -103,7 +103,6 @@
             exit $?;
         done;
       args:
-          chdir: '{{ build_repo_dir }}/DLRN'
+        chdir: '{{ build_repo_dir }}/DLRN'
       register: repo_built
       when: artg_build_one|bool
-
diff --git a/roles/collect-logs/meta/main.yml b/roles/collect-logs/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/collect-logs/meta/main.yml
+++ b/roles/collect-logs/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/container-prep/meta/main.yml b/roles/container-prep/meta/main.yml
index 11d75570b..98bfef3b5 100644
--- a/roles/container-prep/meta/main.yml
+++ b/roles/container-prep/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
-  - extras-common
\ No newline at end of file
+  - extras-common
diff --git a/roles/container-prep/tasks/main.yml b/roles/container-prep/tasks/main.yml
index 448ad21b8..54cafac8e 100644
--- a/roles/container-prep/tasks/main.yml
+++ b/roles/container-prep/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 # Conditional facts to be set which are common to undercloud and overcloud
 - name: set docker_registry_namespace_used
   set_fact:
@@ -26,8 +27,8 @@
     docker_registry_namespace_used: "{{ overcloud_docker_registry_namespace }}"
     cacheable: true
   when:
-  - container_build_id is not defined
-  - use_overcloud_mixed_upgrade|default(false)|bool
+    - container_build_id is not defined
+    - use_overcloud_mixed_upgrade|default(false)|bool
   tags:
     - undercloud-install
 
@@ -58,4 +59,3 @@
     var: container_build_id
   tags:
     - undercloud-install
-
diff --git a/roles/create-reproducer-script/defaults/main.yml b/roles/create-reproducer-script/defaults/main.yml
index cfeb55818..dfc1109b7 100644
--- a/roles/create-reproducer-script/defaults/main.yml
+++ b/roles/create-reproducer-script/defaults/main.yml
@@ -1,3 +1,4 @@
+---
 env_vars_to_source_file: env_vars_to_src.sh
 reproducer_quickstart_script: reproducer-quickstart.sh.j2
 reproducer_quickstart_readme_file: "{{ artcl_collect_dir }}/README-reproducer-quickstart.html"
diff --git a/roles/create-reproducer-script/meta/main.yml b/roles/create-reproducer-script/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/create-reproducer-script/meta/main.yml
+++ b/roles/create-reproducer-script/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/dump_vars/tasks/main.yml b/roles/dump_vars/tasks/main.yml
index 2724e8a78..e861e8361 100644
--- a/roles/dump_vars/tasks/main.yml
+++ b/roles/dump_vars/tasks/main.yml
@@ -31,4 +31,4 @@
   template:
     src: dump_variables_hostvars.j2
     dest: "{{ dump_vars_log_dir }}/dump_variables_hostvars.json"
-  become: true
\ No newline at end of file
+  become: true
diff --git a/roles/extras-common/meta/main.yml b/roles/extras-common/meta/main.yml
index 9d17fb78d..2083f0e12 100644
--- a/roles/extras-common/meta/main.yml
+++ b/roles/extras-common/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - common
diff --git a/roles/freeipa-setup/meta/main.yml b/roles/freeipa-setup/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/freeipa-setup/meta/main.yml
+++ b/roles/freeipa-setup/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/gate-quickstart/meta/main.yml b/roles/gate-quickstart/meta/main.yml
index a1f0ecb27..98bfef3b5 100644
--- a/roles/gate-quickstart/meta/main.yml
+++ b/roles/gate-quickstart/meta/main.yml
@@ -1,3 +1,3 @@
+---
 dependencies:
   - extras-common
-
diff --git a/roles/gate-quickstart/tasks/checkout.yml b/roles/gate-quickstart/tasks/checkout.yml
index 3b68d3af1..698f950be 100644
--- a/roles/gate-quickstart/tasks/checkout.yml
+++ b/roles/gate-quickstart/tasks/checkout.yml
@@ -38,4 +38,3 @@
       pip:
         name: '{{ gated_project_name }}'
         state: absent
-
diff --git a/roles/install-built-repo/meta/main.yml b/roles/install-built-repo/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/install-built-repo/meta/main.yml
+++ b/roles/install-built-repo/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/install-built-repo/tasks/inject_repo.yml b/roles/install-built-repo/tasks/inject_repo.yml
index 11219ce90..199c15565 100644
--- a/roles/install-built-repo/tasks/inject_repo.yml
+++ b/roles/install-built-repo/tasks/inject_repo.yml
@@ -1,3 +1,4 @@
+---
 - name: Inject into image and install packages
   include_role:
     name: modify-image
@@ -5,5 +6,5 @@
     image_to_modify: "{{ ib_repo_image_path }}"
     modify_script: "{{ ib_repo_workdir }}/install-built-repo.sh"
     modify_image_upload_files:
-        - src: "/tmp/gating_repo.tar.gz"
-          dest: "/tmp/gating_repo.tar.gz"
+      - src: "/tmp/gating_repo.tar.gz"
+        dest: "/tmp/gating_repo.tar.gz"
diff --git a/roles/install-built-repo/tasks/install_built_repo.yml b/roles/install-built-repo/tasks/install_built_repo.yml
index 145014b49..c228e5df7 100644
--- a/roles/install-built-repo/tasks/install_built_repo.yml
+++ b/roles/install-built-repo/tasks/install_built_repo.yml
@@ -1,3 +1,4 @@
+---
 - name: Setup repos on live host
   shell: >
     set -o pipefail &&
diff --git a/roles/install-built-repo/tasks/main.yml b/roles/install-built-repo/tasks/main.yml
index dc96caf72..2099257f6 100644
--- a/roles/install-built-repo/tasks/main.yml
+++ b/roles/install-built-repo/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - name: gather facts used by role
   setup:
     gather_subset: "!min,pkg_mgr"
diff --git a/roles/modify-image/meta/main.yml b/roles/modify-image/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/modify-image/meta/main.yml
+++ b/roles/modify-image/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/modify-image/tasks/libguestfs.yml b/roles/modify-image/tasks/libguestfs.yml
index c214b0c14..51e0248c9 100644
--- a/roles/modify-image/tasks/libguestfs.yml
+++ b/roles/modify-image/tasks/libguestfs.yml
@@ -1,3 +1,4 @@
+---
 - name: ensure libguestfs is installed
   yum: name=libguestfs-tools-c state=latest
   become: true
@@ -57,8 +58,7 @@
     {{ item }}
     {{ modify_image_working_dir }}
   environment:
-      LIBGUESTFS_BACKEND: direct
+    LIBGUESTFS_BACKEND: direct
   args:
-      chdir: "{{ modify_image_working_dir }}"
+    chdir: "{{ modify_image_working_dir }}"
   with_items: "{{ modify_image_extract_list }}"
-
diff --git a/roles/modify-image/tasks/main.yml b/roles/modify-image/tasks/main.yml
index 28d7ccad4..007e5991f 100644
--- a/roles/modify-image/tasks/main.yml
+++ b/roles/modify-image/tasks/main.yml
@@ -2,9 +2,9 @@
 
 - name: make sure an image and script are provided
   fail:
-    msg:
-        "In order to use this role image_to_modify and modify_script must be
-         provided."
+    msg: |
+      In order to use this role image_to_modify and modify_script must be
+      provided.
   when: image_to_modify is not defined or (modify_script is not defined and modify_image_upload_files == [])
 
 - include: libguestfs.yml
diff --git a/roles/modify-image/tasks/manual.yml b/roles/modify-image/tasks/manual.yml
index f1519f5f3..97e5b2c80 100644
--- a/roles/modify-image/tasks/manual.yml
+++ b/roles/modify-image/tasks/manual.yml
@@ -40,47 +40,47 @@
 - become: true
   block:
 
-  - name: Upload files to image
-    shell: >
-      cp {{ item.src }} {{ mount_tempdir }}/{{ item.dest }};
-    with_items: "{{ modify_image_upload_files }}"
+    - name: Upload files to image
+      shell: >
+        cp {{ item.src }} {{ mount_tempdir }}/{{ item.dest }};
+      with_items: "{{ modify_image_upload_files }}"
 
-  - name: Run script on image
-    shell: >
-      chmod 775 {{ mount_tempdir }};
-      mount -o bind /dev {{ mount_tempdir }}/dev/;
-      mv {{ mount_tempdir }}/etc/resolv.conf{,_};
-      echo -e "nameserver 8.8.8.8\nnameserver 8.8.4.4" > {{ mount_tempdir }}/etc/resolv.conf;
-      cp {{ modify_script }} {{ mount_tempdir }}/tmp/{{ modify_script|basename }};
-      {% if initramfs_image|bool %}sed -i "s/sudo //g" {{ mount_tempdir }}/tmp/{{ modify_script|basename }};{% endif %}
-      set -o pipefail && chroot {{ mount_tempdir }} /bin/bash /tmp/{{ modify_script|basename }} 2>&1
-      {{ timestamper_cmd }} > {{ working_dir }}/{{ modify_script|basename }}.$(date +%s).log;
-      mv -f {{ mount_tempdir }}/etc/resolv.conf{_,};
+    - name: Run script on image
+      shell: >
+        chmod 775 {{ mount_tempdir }};
+        mount -o bind /dev {{ mount_tempdir }}/dev/;
+        mv {{ mount_tempdir }}/etc/resolv.conf{,_};
+        echo -e "nameserver 8.8.8.8\nnameserver 8.8.4.4" > {{ mount_tempdir }}/etc/resolv.conf;
+        cp {{ modify_script }} {{ mount_tempdir }}/tmp/{{ modify_script|basename }};
+        {% if initramfs_image|bool %}sed -i "s/sudo //g" {{ mount_tempdir }}/tmp/{{ modify_script|basename }};{% endif %}
+        set -o pipefail && chroot {{ mount_tempdir }} /bin/bash /tmp/{{ modify_script|basename }} 2>&1
+        {{ timestamper_cmd }} > {{ working_dir }}/{{ modify_script|basename }}.$(date +%s).log;
+        mv -f {{ mount_tempdir }}/etc/resolv.conf{_,};
 
-  - name: Extract files from image
-    shell: cp {{ mount_tempdir }}/{{ item }} {{ modify_image_working_dir }}/;
-    with_items: "{{ modify_image_extract_list }}"
-    ignore_errors: true
+    - name: Extract files from image
+      shell: cp {{ mount_tempdir }}/{{ item }} {{ modify_image_working_dir }}/;
+      with_items: "{{ modify_image_extract_list }}"
+      ignore_errors: true
 
-  - name: Close initramfs image
-    shell: >
-      set -o pipefail &&
-      umount {{ mount_tempdir }}/dev/;
-      pushd {{ mount_tempdir }};
-      find . -print | cpio -o -H newc | gzip > {{ image_to_modify_abs_path.stdout }};
-      popd;
-      rm -rf "{{ mount_tempdir }}";
-    when: initramfs_image|bool
+    - name: Close initramfs image
+      shell: >
+        set -o pipefail &&
+        umount {{ mount_tempdir }}/dev/;
+        pushd {{ mount_tempdir }};
+        find . -print | cpio -o -H newc | gzip > {{ image_to_modify_abs_path.stdout }};
+        popd;
+        rm -rf "{{ mount_tempdir }}";
+      when: initramfs_image|bool
 
-  - name: Close qcow2 image
-    shell: >
-      chroot {{ mount_tempdir }} setfiles /etc/selinux/targeted/contexts/files/file_contexts / ;
-      umount {{ mount_tempdir }}/dev/;
-      umount {{ mount_tempdir }};
-      kpartx -dv {{ image_to_modify_raw }};
-      qemu-img convert -c -f raw -O qcow2 {{ image_to_modify_raw }} {{ image_to_modify_qcow }};
-      rm -rf "{{ image_to_modify_raw }}";
-      losetup -d /dev/loop0;
-      rm -rf "{{ mount_tempdir }}";
-      chown -R {{ undercloud_user }}: /home/{{ undercloud_user }}/;
-    when: not initramfs_image|bool
+    - name: Close qcow2 image
+      shell: >
+        chroot {{ mount_tempdir }} setfiles /etc/selinux/targeted/contexts/files/file_contexts / ;
+        umount {{ mount_tempdir }}/dev/;
+        umount {{ mount_tempdir }};
+        kpartx -dv {{ image_to_modify_raw }};
+        qemu-img convert -c -f raw -O qcow2 {{ image_to_modify_raw }} {{ image_to_modify_qcow }};
+        rm -rf "{{ image_to_modify_raw }}";
+        losetup -d /dev/loop0;
+        rm -rf "{{ mount_tempdir }}";
+        chown -R {{ undercloud_user }}: /home/{{ undercloud_user }}/;
+      when: not initramfs_image|bool
diff --git a/roles/multinodes/defaults/main.yml b/roles/multinodes/defaults/main.yml
index 2cfe86783..cad814b36 100644
--- a/roles/multinodes/defaults/main.yml
+++ b/roles/multinodes/defaults/main.yml
@@ -1,3 +1,4 @@
+---
 os_region: "{{ lookup('env', 'OS_REGION_NAME')|default('regionOne') }}"
 os_tenant: "{{ lookup('env', 'OS_TENANT_ID') }}"
 os_identity_api_version: "{{ lookup('env', 'OS_IDENTITY_API_VERSION')|default(2) }}"
diff --git a/roles/multinodes/tasks/delete_stack.yml b/roles/multinodes/tasks/delete_stack.yml
index e8f74f950..f952824e8 100644
--- a/roles/multinodes/tasks/delete_stack.yml
+++ b/roles/multinodes/tasks/delete_stack.yml
@@ -1,3 +1,4 @@
+---
 - name: Delete stack
   shell: >
     echo "Executing 'openstack stack delete {{ stack_name }} --yes'" >>  {{ stack_log }};
diff --git a/roles/multinodes/tasks/main.yml b/roles/multinodes/tasks/main.yml
index ce58c0c4a..ad9cf7044 100644
--- a/roles/multinodes/tasks/main.yml
+++ b/roles/multinodes/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - name: Fail if no auth is provided
   fail:
     msg: 'Please source credential rc file from your tenant on cloud'
@@ -147,54 +148,54 @@
     - "{{ groups['subnodes'] }}"
 
 # In case of blank centos image we need to create CI user and update inventory
-- block:
+- when: hostvars['subnode-0'].ansible_user != "{{ nodepool_user }}"
+  block:
 
-  - name: Setup user
-    user:
-      name: "{{ nodepool_user }}"
-      groups: wheel
-      append: yes
-    become: true
-    delegate_to: "{{ item}}"
-    with_items:
-      - "{{ groups['subnodes'] }}"
+    - name: Setup user
+      user:
+        name: "{{ nodepool_user }}"
+        groups: wheel
+        append: true
+      become: true
+      delegate_to: "{{ item}}"
+      with_items:
+        - "{{ groups['subnodes'] }}"
 
-  - name: Setup keys
-    authorized_key:
-      user: "{{ nodepool_user }}"
-      state: present
-      key: "{{ lookup('file', '{{ key_location }}') }}"
-    become: true
-    become_user: "{{ nodepool_user }}"
-    delegate_to: "{{ item}}"
-    with_items:
-      - "{{ groups['subnodes'] }}"
+    - name: Setup keys
+      authorized_key:
+        user: "{{ nodepool_user }}"
+        state: present
+        key: "{{ lookup('file', '{{ key_location }}') }}"
+      become: true
+      become_user: "{{ nodepool_user }}"
+      delegate_to: "{{ item}}"
+      with_items:
+        - "{{ groups['subnodes'] }}"
 
-  - name: Allow user to have passwordless sudo
-    lineinfile:
-      dest: /etc/sudoers
-      state: present
-      line: '{{ nodepool_user }} ALL=(ALL) NOPASSWD:ALL'
-      validate: 'visudo -cf %s'
-    become: true
-    delegate_to: "{{ item}}"
-    with_items:
-      - "{{ groups['subnodes'] }}"
+    - name: Allow user to have passwordless sudo
+      lineinfile:
+        dest: /etc/sudoers
+        state: present
+        line: '{{ nodepool_user }} ALL=(ALL) NOPASSWD:ALL'
+        validate: 'visudo -cf %s'
+      become: true
+      delegate_to: "{{ item}}"
+      with_items:
+        - "{{ groups['subnodes'] }}"
 
-  - name: Add hosts
-    add_host:
-      name: "subnode-{{ item.0 }}"
-      hostname: "{{ item.1.1 }}"
-      groups: "{{ subnode_groups| join(',') }}"
-      ansible_user: "{{ nodepool_user }}"
-      ansible_host: "{{ item.1.1 }}"
-      ansible_fqdn: "subnode-{{ item.0 }}"
-      ansible_private_key_file: "{{ private_key_location }}"
-      subnode_public_ip: "{{ item.1.1 }}"
-      subnode_private_ip: "{{ item.1.0 }}"
-    with_indexed_items:
-      - "{{ subnode_ips.stdout }}"
-  when: hostvars['subnode-0'].ansible_user != "{{ nodepool_user }}"
+    - name: Add hosts
+      add_host:
+        name: "subnode-{{ item.0 }}"
+        hostname: "{{ item.1.1 }}"
+        groups: "{{ subnode_groups| join(',') }}"
+        ansible_user: "{{ nodepool_user }}"
+        ansible_host: "{{ item.1.1 }}"
+        ansible_fqdn: "subnode-{{ item.0 }}"
+        ansible_private_key_file: "{{ private_key_location }}"
+        subnode_public_ip: "{{ item.1.1 }}"
+        subnode_private_ip: "{{ item.1.0 }}"
+      with_indexed_items:
+        - "{{ subnode_ips.stdout }}"
 
 - name: Dump hosts to file
   template:
diff --git a/roles/multinodes/templates/stack.yaml b/roles/multinodes/templates/stack.yaml
index d510638c1..ff4f38732 100644
--- a/roles/multinodes/templates/stack.yaml
+++ b/roles/multinodes/templates/stack.yaml
@@ -1,3 +1,4 @@
+---
 heat_template_version: newton
 
 description: >
@@ -40,29 +41,29 @@ resources:
   private_net:
     type: OS::Neutron::Net
     properties:
-      name: { get_param: private_net_name }
+      name: {get_param: private_net_name}
 
   private_subnet:
     type: OS::Neutron::Subnet
     properties:
-      network_id: { get_resource: private_net }
-      cidr: { get_param: private_net_cidr }
-      gateway_ip: { get_param: private_net_gateway }
+      network_id: {get_resource: private_net}
+      cidr: {get_param: private_net_cidr}
+      gateway_ip: {get_param: private_net_gateway}
       allocation_pools:
-        - start: { get_param: private_net_pool_start }
-          end: { get_param: private_net_pool_end }
+        - start: {get_param: private_net_pool_start}
+          end: {get_param: private_net_pool_end}
 
   router:
     type: OS::Neutron::Router
     properties:
       external_gateway_info:
-        network: { get_param: public_net_name }
+        network: {get_param: public_net_name}
 
   router_interface:
     type: OS::Neutron::RouterInterface
     properties:
-      router_id: { get_resource: router }
-      subnet_id: { get_resource: private_subnet }
+      router_id: {get_resource: router}
+      subnet_id: {get_resource: private_subnet}
 
 
   server_security_group:
@@ -86,19 +87,19 @@ resources:
     type: OS::Heat::ResourceGroup
     depends_on: router_interface
     properties:
-      count: { get_param: subnode_count }
+      count: {get_param: subnode_count}
       resource_def:
         type: "{{ local_working_dir }}/subnode.yaml"
         properties:
           name: "{{ prefix }}subnode-%index%"
-          private_net: { get_resource: private_net }
-          private_subnet: { get_resource: private_subnet }
+          private_net: {get_resource: private_net}
+          private_subnet: {get_resource: private_subnet}
           server_security_group: {get_resource: server_security_group}
-          subnode_flavor: { get_param: subnode_flavor }
-          public_net_name: { get_param: public_net_name }
-          key_name: { get_param: key_name }
-          image: { get_param: image }
+          subnode_flavor: {get_param: subnode_flavor}
+          public_net_name: {get_param: public_net_name}
+          key_name: {get_param: key_name}
+          image: {get_param: image}
 
 outputs:
   subnode_ip_pairs:
-    value: { get_attr: [subnodes, subnode_ip_pair] }
+    value: {get_attr: [subnodes, subnode_ip_pair]}
diff --git a/roles/multinodes/templates/subnode.yaml b/roles/multinodes/templates/subnode.yaml
index eb9f321da..4017c44a7 100644
--- a/roles/multinodes/templates/subnode.yaml
+++ b/roles/multinodes/templates/subnode.yaml
@@ -1,3 +1,4 @@
+---
 heat_template_version: newton
 
 description: >
@@ -33,7 +34,7 @@ resources:
     type: OS::Neutron::FloatingIP
     # depends_on: router_interface, subnode_port
     properties:
-      floating_network: { get_param: public_net_name }
+      floating_network: {get_param: public_net_name}
       port_id: {get_attr: [subnode, addresses, {get_param: private_net}, 0, port]}
 
   subnode:
@@ -41,17 +42,17 @@ resources:
     properties:
       name: {get_param: name}
       image: {get_param: image}
-      flavor: { get_param: subnode_flavor }
-      key_name: { get_param: key_name }
+      flavor: {get_param: subnode_flavor}
+      key_name: {get_param: key_name}
       networks:
-        - network: { get_param: private_net }
-        - network: { get_param: private_net }
+        - network: {get_param: private_net}
+        - network: {get_param: private_net}
       security_groups:
-        - { get_param: server_security_group }
+        - {get_param: server_security_group}
 
 outputs:
   subnode_ip_pair:
     description: IP addresses of subnode in network
     value:
-    - get_attr: [subnode_floating_ip, fixed_ip_address]
-    - get_attr: [subnode_floating_ip, floating_ip_address]
+      - get_attr: [subnode_floating_ip, fixed_ip_address]
+      - get_attr: [subnode_floating_ip, floating_ip_address]
diff --git a/roles/nodepool-setup/defaults/main.yml b/roles/nodepool-setup/defaults/main.yml
index b17329705..84b94ab02 100644
--- a/roles/nodepool-setup/defaults/main.yml
+++ b/roles/nodepool-setup/defaults/main.yml
@@ -1,3 +1,4 @@
+---
 nodepool_cirros_url: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
 nodepool_cirros_dest: /opt/cache/files/cirros-0.3.5-x86_64-disk.img
 nodepool_cirros_checksum: md5:f8ab98ff5e73ebab884d80c9dc9c7290
@@ -11,7 +12,7 @@ repos:
   - https://git.openstack.org/openstack-dev/devstack
   - https://git.openstack.org/openstack-infra/devstack-gate
 zuul_changes: "{{ lookup('env', 'ZUUL_CHANGES') }}"
-subnode_swap_size: 8388608 # 8GB
+subnode_swap_size: 8388608  # 8GB
 update_subnodes: true
 rdo_cloud_provider: true
 packages_list:
diff --git a/roles/nodepool-setup/tasks/etc-nodepool.yml b/roles/nodepool-setup/tasks/etc-nodepool.yml
index 81fff1247..00c94aa81 100644
--- a/roles/nodepool-setup/tasks/etc-nodepool.yml
+++ b/roles/nodepool-setup/tasks/etc-nodepool.yml
@@ -9,7 +9,7 @@
 
 - name: Create /etc/nodepool/node_private
   lineinfile:
-    create: yes
+    create: true
     state: present
     name: /etc/nodepool/node_private
     owner: "{{ ansible_user }}"
@@ -18,7 +18,7 @@
 
 - name: Create /etc/nodepool/primary_node_private
   lineinfile:
-    create: yes
+    create: true
     state: present
     name: /etc/nodepool/primary_node_private
     owner: "{{ ansible_user }}"
@@ -46,7 +46,7 @@
 
 - name: Create /etc/nodepool/sub_nodes
   lineinfile:
-    create: yes
+    create: true
     state: present
     name: /etc/nodepool/sub_nodes
     line: "{{ hostvars[item].subnode_public_ip }}"
@@ -61,7 +61,7 @@
 
 - name: Create /etc/nodepool/sub_nodes_private
   lineinfile:
-    create: yes
+    create: true
     state: present
     name: /etc/nodepool/sub_nodes_private
     line: "{{ hostvars[item].subnode_private_ip }}"
diff --git a/roles/nodepool-setup/tasks/main.yml b/roles/nodepool-setup/tasks/main.yml
index bacfb9822..2629a947b 100644
--- a/roles/nodepool-setup/tasks/main.yml
+++ b/roles/nodepool-setup/tasks/main.yml
@@ -33,28 +33,28 @@
 - when: not yum_contentdir.stat.exists
   block:
 
-  - name: Discover package architecture
-    command: rpm -q --qf "%{arch}" -f /etc/redhat-release
-    register: rpm_arch
+    - name: Discover package architecture
+      command: rpm -q --qf "%{arch}" -f /etc/redhat-release
+      register: rpm_arch
 
-  - debug:
-      msg: Package architecture is '{{ rpm_arch.stdout }}'
+    - debug:
+        msg: Package architecture is '{{ rpm_arch.stdout }}'
 
-  - name: Set contentdir to altarch
-    set_fact:
-      yum_contentdir_data: altarch
-    when: rpm_arch.stdout in ['aarch64', 'ppc64le']
+    - name: Set contentdir to altarch
+      set_fact:
+        yum_contentdir_data: altarch
+      when: rpm_arch.stdout in ['aarch64', 'ppc64le']
 
-  - name: Set contentdir to default centos arch
-    set_fact:
-      yum_contentdir_data: centos
-    when: rpm_arch.stdout not in ['aarch64', 'ppc64le']
+    - name: Set contentdir to default centos arch
+      set_fact:
+        yum_contentdir_data: centos
+      when: rpm_arch.stdout not in ['aarch64', 'ppc64le']
 
-  - name: Populate /etc/yum/vars/contentdir
-    copy:
-      dest: /etc/yum/vars/contentdir
-      content: "{{ yum_contentdir_data }}"
-    become: true
+    - name: Populate /etc/yum/vars/contentdir
+      copy:
+        dest: /etc/yum/vars/contentdir
+        content: "{{ yum_contentdir_data }}"
+      become: true
 
 - name: Install repos (will be removed by toci_gatetest)
   package:
@@ -98,7 +98,7 @@
   service:
     name: unbound
     state: started
-    enabled: yes
+    enabled: true
   become: true
 
 - name: start iptables service
@@ -131,7 +131,7 @@
   with_items:
     - "WORKSPACE=/tmp"
     - "DEVSTACK_GATE_TIMEOUT=300"
-    - "REMAINING_TIME=180" # 3 hours for quickstart run
+    - "REMAINING_TIME=180"  # 3 hours for quickstart run
     # In case of multinode
     - "EXTRA_VARS=' --extra-vars vxlan_mtu=1400'"
   become: true
@@ -139,26 +139,26 @@
 - when: update_subnodes|bool
   block:
 
-  - name: Update packages
-    yum:
-      name: '*'
-      state: latest
-    become: true
+    - name: Update packages
+      yum:
+        name: '*'
+        state: latest
+      become: true
 
-  - name: Reboot hosts
-    shell: sleep 2 && shutdown -r now
-    async: 1
-    poll: 0
-    ignore_errors: true
-    become: true
+    - name: Reboot hosts
+      shell: sleep 2 && shutdown -r now
+      async: 1
+      poll: 0
+      ignore_errors: true
+      become: true
 
-  - name: Wait for provisioned hosts to become reachable
-    local_action:
-      module: wait_for
-      host: "{{ hostvars[inventory_hostname].subnode_public_ip }}"
-      port: 22
-      delay: 35
-      sleep: 10
-      state: started
-      connect_timeout: 10
-      timeout: 180
+    - name: Wait for provisioned hosts to become reachable
+      local_action:
+        module: wait_for
+        host: "{{ hostvars[inventory_hostname].subnode_public_ip }}"
+        port: 22
+        delay: 35
+        sleep: 10
+        state: started
+        connect_timeout: 10
+        timeout: 180
diff --git a/roles/nodepool-setup/tasks/patch_repos.yml b/roles/nodepool-setup/tasks/patch_repos.yml
index 2dddde9c8..a6c7af134 100644
--- a/roles/nodepool-setup/tasks/patch_repos.yml
+++ b/roles/nodepool-setup/tasks/patch_repos.yml
@@ -1,3 +1,4 @@
+---
 - name: Check if repo should be changed
   set_fact:
     proj: "{{ repo_item.replace('.git', '').split('/')[-2:]|join('/') }}:"
diff --git a/roles/ovb-manage-stack/defaults/main.yml b/roles/ovb-manage-stack/defaults/main.yml
index 72877ed96..c8694b38c 100644
--- a/roles/ovb-manage-stack/defaults/main.yml
+++ b/roles/ovb-manage-stack/defaults/main.yml
@@ -3,7 +3,7 @@ release: master
 ovb_repo_version: a3786bca1604d6048562af80eca3bcad119e5065
 
 tmp:
-    idnum: "{{ 100000 |random }}"
+  idnum: "{{ 100000 |random }}"
 
 os_username: admin
 os_password: password
@@ -19,40 +19,40 @@ ssh_extra_args: '-F "{{ local_working_dir }}/ssh.config.ansible"'
 undercloud_key: "{{ local_working_dir }}/id_rsa_undercloud"
 nodepool_user: 'zuul'
 node_groups:
-    - 'undercloud'
-    - 'tester'
+  - 'undercloud'
+  - 'tester'
 templates_dir: "{{ local_working_dir }}/openstack-virtual-baremetal/templates"
 ovb_dir: "{{ local_working_dir }}/openstack-virtual-baremetal"
 heat_template: "{{ templates_dir }}/quintupleo.yaml"
 environment_list:
-    - "{{ templates_dir }}/resource-registry.yaml"
-    - "{{ local_working_dir }}/env-{{ idnum }}.yaml"
+  - "{{ templates_dir }}/resource-registry.yaml"
+  - "{{ local_working_dir }}/env-{{ idnum }}.yaml"
 boot_from_volume: false
 baremetal_boot_from_volume_size: 50
 undercloud_boot_from_volume_size: 50
 
 latest_guest_image:
-    newton: CentOS-7-x86_64-GenericCloud-released-latest
-    ocata: CentOS-7-x86_64-GenericCloud-released-latest
-    pike: CentOS-7-x86_64-GenericCloud-released-latest
-    queens: CentOS-7-x86_64-GenericCloud-released-latest
-    master: CentOS-7-x86_64-GenericCloud-released-latest
-    rhos-11: rhel-7.4-server-x86_64-latest
-    rhos-12: rhel-7.4-server-x86_64-latest
-    rhos-13: rhel-7.4-server-x86_64-latest
+  newton: CentOS-7-x86_64-GenericCloud-released-latest
+  ocata: CentOS-7-x86_64-GenericCloud-released-latest
+  pike: CentOS-7-x86_64-GenericCloud-released-latest
+  queens: CentOS-7-x86_64-GenericCloud-released-latest
+  master: CentOS-7-x86_64-GenericCloud-released-latest
+  rhos-11: rhel-7.4-server-x86_64-latest
+  rhos-12: rhel-7.4-server-x86_64-latest
+  rhos-13: rhel-7.4-server-x86_64-latest
 
 port_security: true
 
 baremetal_ports_template:
-    multiple-nics: baremetal-ports-all.yaml
-    multi-nic: baremetal-ports-all.yaml
-    public-bond: baremetal-ports-public-bond.yaml
+  multiple-nics: baremetal-ports-all.yaml
+  multi-nic: baremetal-ports-all.yaml
+  public-bond: baremetal-ports-public-bond.yaml
 
 baremetal_port_security_template:
-    none: baremetal-ports-default-port-security.yaml
-    multiple-nics: baremetal-ports-all-port-security.yaml
-    multi-nic: baremetal-ports-all-port-security.yaml
-    public-bond: baremetal-ports-public-bond-port-security.yaml
+  none: baremetal-ports-default-port-security.yaml
+  multiple-nics: baremetal-ports-all-port-security.yaml
+  multi-nic: baremetal-ports-all-port-security.yaml
+  public-bond: baremetal-ports-public-bond-port-security.yaml
 
 existing_key_location: '~/.ssh/id_rsa'
 remove_image_from_host_cloud: false
@@ -76,7 +76,7 @@ provision_net_cidr: 192.0.2.0/24
 undercloud_name: 'undercloud-{{ idnum }}'
 undercloud_image: 'undercloud-{{ idnum }}.qcow2'
 undercloud_flavor: m1.xlarge
-external_net:  '10.2.1.0/22'
+external_net: '10.2.1.0/22'
 
 network_isolation_type: multiple-nics
 
@@ -90,11 +90,11 @@ registered_releases:
   - rhos-13
 
 baremetal_driver: >-
-    {% if release not in ['newton', 'ocata', 'pike'] -%}
-    "ipmi"
-    {%- else -%}
-    "pxe_ipmitool"
-    {%- endif -%}
+  {% if release not in ['newton', 'ocata', 'pike'] -%}
+  "ipmi"
+  {%- else -%}
+  "pxe_ipmitool"
+  {%- endif -%}
 
 # OVB environment clean up
 cleanup_stacks_keypairs: false
diff --git a/roles/ovb-manage-stack/meta/main.yml b/roles/ovb-manage-stack/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/ovb-manage-stack/meta/main.yml
+++ b/roles/ovb-manage-stack/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/ovb-manage-stack/tasks/ovb-cleanup-stacks-keypairs.yml b/roles/ovb-manage-stack/tasks/ovb-cleanup-stacks-keypairs.yml
index ce70e6ed0..addc4353c 100644
--- a/roles/ovb-manage-stack/tasks/ovb-cleanup-stacks-keypairs.yml
+++ b/roles/ovb-manage-stack/tasks/ovb-cleanup-stacks-keypairs.yml
@@ -1,14 +1,14 @@
 ---
 - name: Create OVB environment clean up script
   template:
-      src: "{{ cleanup_stacks_keypairs_script }}"
-      dest: "{{ local_working_dir }}/cleanup-stacks-keypairs.sh"
-      mode: 0755
+    src: "{{ cleanup_stacks_keypairs_script }}"
+    dest: "{{ local_working_dir }}/cleanup-stacks-keypairs.sh"
+    mode: 0755
 
 - name: Remove existing stacks and key pairs
   shell: >
-      set -o pipefail &&
-      {{ local_working_dir }}/cleanup-stacks-keypairs.sh 2>&1 {{ timestamper_cmd }} >
-      {{ cleanup_stacks_keypairs_log }}
+    set -o pipefail &&
+    {{ local_working_dir }}/cleanup-stacks-keypairs.sh 2>&1 {{ timestamper_cmd }} >
+    {{ cleanup_stacks_keypairs_log }}
   args:
     executable: /bin/bash
diff --git a/roles/ovb-manage-stack/tasks/ovb-create-stack.yml b/roles/ovb-manage-stack/tasks/ovb-create-stack.yml
index 574282fde..4d3877f15 100644
--- a/roles/ovb-manage-stack/tasks/ovb-create-stack.yml
+++ b/roles/ovb-manage-stack/tasks/ovb-create-stack.yml
@@ -12,9 +12,9 @@
 
 - name: Clone Openstack Virtual Baremetal repo if it does not exist
   git:
-      repo: https://github.com/cybertron/openstack-virtual-baremetal.git
-      dest: "{{ local_working_dir }}/openstack-virtual-baremetal"
-      version: "{{ ovb_repo_version }}"
+    repo: https://github.com/cybertron/openstack-virtual-baremetal.git
+    dest: "{{ local_working_dir }}/openstack-virtual-baremetal"
+    version: "{{ ovb_repo_version }}"
 
 - include: ovb-cleanup-stacks-keypairs.yml
   when: cleanup_stacks_keypairs|bool
@@ -29,18 +29,18 @@
 
 - name: copy key inserted in image to undercloud_key location
   copy:
-      src: "{{ existing_key_location }}{{ item }}"
-      dest: "{{ local_working_dir }}/id_rsa_undercloud{{ item }}"
-      mode: 0600
+    src: "{{ existing_key_location }}{{ item }}"
+    dest: "{{ local_working_dir }}/id_rsa_undercloud{{ item }}"
+    mode: 0600
   with_items:
-      - ""
-      - .pub
+    - ""
+    - .pub
 
 - name: Copy deploy stack parameters template
   template:
-      src: env.yaml.j2
-      dest: "{{ local_working_dir }}/env-{{ idnum }}.yaml"
-      mode: 0755
+    src: env.yaml.j2
+    dest: "{{ local_working_dir }}/env-{{ idnum }}.yaml"
+    mode: 0755
 
 - name: Add keypair
   shell: >
@@ -54,9 +54,9 @@
 
 - name: copy clouds.yaml file
   template:
-      src: clouds.yaml.j2
-      dest: "{{ local_working_dir }}/clouds.yaml"
-      mode: 0755
+    src: clouds.yaml.j2
+    dest: "{{ local_working_dir }}/clouds.yaml"
+    mode: 0755
 
 - name: Deploy stack
   shell: >
@@ -92,19 +92,19 @@
 
 - name: Show stack status
   debug:
-      var: stack_status.stdout_lines
+    var: stack_status.stdout_lines
 
 - block:
-  - name: Get full stack status info in case of failure
-    shell: openstack stack show "{{ stack_name }}"
-    register: failed_stack
+    - name: Get full stack status info in case of failure
+      shell: openstack stack show "{{ stack_name }}"
+      register: failed_stack
 
-  - name: Show stack status in case of failure
-    debug: var="failed_stack.stdout"
+    - name: Show stack status in case of failure
+      debug: var="failed_stack.stdout"
 
-  - name: Fail if stack did not deploy successfully
-    fail:
-       msg: "Stack {{ stack_name }} did not deploy successfully. See the stack status message above."
+    - name: Fail if stack did not deploy successfully
+      fail:
+        msg: "Stack {{ stack_name }} did not deploy successfully. See the stack status message above."
   when: stack_status.stdout.find("CREATE_COMPLETE") == -1
 
 - name: Return floating ip outputs
@@ -124,64 +124,63 @@
 
 - name: Add provisioned undercloud host
   add_host:
-      name: undercloud
-      hostname: "{{ undercloud_ip }}"
-      groups: "{{ node_groups| join(',') }}"
-      ansible_host: "{{ undercloud_ip }}"
-      ansible_user: root
-      ansible_fqdn: undercloud
-      ansible_private_key_file: "{{ undercloud_key }}"
-      ansible_ssh_extra_args: "{{ ssh_extra_args }}"
-      undercloud_ip: "{{ undercloud_ip }}"
+    name: undercloud
+    hostname: "{{ undercloud_ip }}"
+    groups: "{{ node_groups| join(',') }}"
+    ansible_host: "{{ undercloud_ip }}"
+    ansible_user: root
+    ansible_fqdn: undercloud
+    ansible_private_key_file: "{{ undercloud_key }}"
+    ansible_ssh_extra_args: "{{ ssh_extra_args }}"
+    undercloud_ip: "{{ undercloud_ip }}"
 
 - name: Wait for provisioned host to become reachable
-  command:
-      ssh -o BatchMode=yes -o "StrictHostKeyChecking=no" root@{{ undercloud_ip }} -i "{{ undercloud_key }}"
+  command: |
+    ssh -o BatchMode=yes -o "StrictHostKeyChecking=no" root@{{ undercloud_ip }} -i "{{ undercloud_key }}"
   register: result
   until: result is success
   retries: 300
   delay: 5
 
-- block:
+- when: ovb_setup_user|default('false')|bool
+  block:
 
-  - name: Setup user
-    user:
-      name: "{{ nodepool_user }}"
-      groups: wheel
-      append: yes
-    become: true
-    delegate_to: undercloud
+    - name: Setup user
+      user:
+        name: "{{ nodepool_user }}"
+        groups: wheel
+        append: true
+      become: true
+      delegate_to: undercloud
 
-  - name: Setup keys
-    authorized_key:
-      user: "{{ nodepool_user }}"
-      state: present
-      key: "{{ lookup('file', '{{ undercloud_key }}.pub') }}"
-    become: true
-    become_user: "{{ nodepool_user }}"
-    delegate_to: undercloud
+    - name: Setup keys
+      authorized_key:
+        user: "{{ nodepool_user }}"
+        state: present
+        key: "{{ lookup('file', '{{ undercloud_key }}.pub') }}"
+      become: true
+      become_user: "{{ nodepool_user }}"
+      delegate_to: undercloud
 
-  - name: Allow user to have passwordless sudo
-    lineinfile:
-      dest: /etc/sudoers
-      state: present
-      line: '{{ nodepool_user }} ALL=(ALL) NOPASSWD:ALL'
-      validate: 'visudo -cf %s'
-    become: true
-    delegate_to: undercloud
+    - name: Allow user to have passwordless sudo
+      lineinfile:
+        dest: /etc/sudoers
+        state: present
+        line: '{{ nodepool_user }} ALL=(ALL) NOPASSWD:ALL'
+        validate: 'visudo -cf %s'
+      become: true
+      delegate_to: undercloud
 
-  - name: Add undercloud with non-root user
-    add_host:
-      name: subnode-0
-      hostname: "{{ undercloud_ip }}"
-      groups: subnodes
-      ansible_user: "{{ nodepool_user }}"
-      ansible_host: "{{ undercloud_ip }}"
-      ansible_private_key_file: "{{ undercloud_key }}"
-      subnode_public_ip: "{{ undercloud_ip }}"
-      subnode_private_ip: 192.168.23.23
-
-  when: ovb_setup_user|default('false')|bool
+    - name: Add undercloud with non-root user
+      add_host:
+        name: subnode-0
+        hostname: "{{ undercloud_ip }}"
+        groups: subnodes
+        ansible_user: "{{ nodepool_user }}"
+        ansible_host: "{{ undercloud_ip }}"
+        ansible_private_key_file: "{{ undercloud_key }}"
+        subnode_public_ip: "{{ undercloud_ip }}"
+        subnode_private_ip: 192.168.23.23
 
 - name: Build nodes.json file to be used as instackenv.json
   shell: >
@@ -193,12 +192,11 @@
 
 - name: remove clouds.yaml file
   file:
-      path: "{{ local_working_dir }}/clouds.yaml"
-      state: absent
+    path: "{{ local_working_dir }}/clouds.yaml"
+    state: absent
 
 - name: Dump hosts to file
   template:
     src: ovb_hosts.j2
     dest: '{{ local_working_dir }}/ovb_hosts'
   when: ovb_dump_hosts|default('false')|bool
-
diff --git a/roles/ovb-manage-stack/tasks/ovb-delete-stack.yml b/roles/ovb-manage-stack/tasks/ovb-delete-stack.yml
index 9f85298a5..dc6c8119f 100644
--- a/roles/ovb-manage-stack/tasks/ovb-delete-stack.yml
+++ b/roles/ovb-manage-stack/tasks/ovb-delete-stack.yml
@@ -1,21 +1,21 @@
 ---
 - name: Clone Openstack Virtual Baremetal repo if it does not exist
   git:
-      repo: https://github.com/cybertron/openstack-virtual-baremetal.git
-      dest: "{{ local_working_dir }}/openstack-virtual-baremetal"
-      version: "{{ ovb_repo_version }}"
+    repo: https://github.com/cybertron/openstack-virtual-baremetal.git
+    dest: "{{ local_working_dir }}/openstack-virtual-baremetal"
+    version: "{{ ovb_repo_version }}"
 
 - name: copy clouds.yaml file
   template:
-      src: clouds.yaml.j2
-      dest: "{{ local_working_dir }}/clouds.yaml"
-      mode: 0755
+    src: clouds.yaml.j2
+    dest: "{{ local_working_dir }}/clouds.yaml"
+    mode: 0755
 
 - name: Remove stack
   os_stack:
-      name: "{{ stack_name }}"
-      cloud: "{{ cloud_name }}"
-      state: absent
+    name: "{{ stack_name }}"
+    cloud: "{{ cloud_name }}"
+    state: absent
   environment:
     OS_CLIENT_CONFIG_FILE: "{{ local_working_dir }}/clouds.yaml"
   ignore_errors: true
@@ -32,6 +32,5 @@
 
 - name: remove clouds.yaml file
   file:
-      path: "{{ local_working_dir }}/clouds.yaml"
-      state: absent
-
+    path: "{{ local_working_dir }}/clouds.yaml"
+    state: absent
diff --git a/roles/overcloud-delete/meta/main.yml b/roles/overcloud-delete/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/overcloud-delete/meta/main.yml
+++ b/roles/overcloud-delete/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/overcloud-delete/tasks/main.yml b/roles/overcloud-delete/tasks/main.yml
index 30e30853e..da19adc47 100644
--- a/roles/overcloud-delete/tasks/main.yml
+++ b/roles/overcloud-delete/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 # Generate a script from templates. These are scripts
 # rather than additional ansible tasks so that they can be run
 # manually from the undercloud host.
diff --git a/roles/overcloud-deploy/defaults/main.yml b/roles/overcloud-deploy/defaults/main.yml
index 86534ec9a..0d986b079 100644
--- a/roles/overcloud-deploy/defaults/main.yml
+++ b/roles/overcloud-deploy/defaults/main.yml
@@ -158,7 +158,7 @@ hypervisor_wait: true
 overcloud_services:
   - name: 'ControllerServices:'
     services:
-    - OS::TripleO::Services::Kernel
+      - OS::TripleO::Services::Kernel
 
 ara_overcloud_db_path: "/var/lib/mistral/overcloud/ara_overcloud.sqlite"
 override_ansiblecfg: true
diff --git a/roles/overcloud-deploy/files/hardware_environments/common/plan-parameter-neutron-bridge.yaml b/roles/overcloud-deploy/files/hardware_environments/common/plan-parameter-neutron-bridge.yaml
index cb750f600..06d1ff133 100644
--- a/roles/overcloud-deploy/files/hardware_environments/common/plan-parameter-neutron-bridge.yaml
+++ b/roles/overcloud-deploy/files/hardware_environments/common/plan-parameter-neutron-bridge.yaml
@@ -1,2 +1,3 @@
+---
 parameters:
   Controller-1::NeutronExternalNetworkBridge: "''"
diff --git a/roles/overcloud-deploy/files/hardware_environments/virt/hw_settings.yml b/roles/overcloud-deploy/files/hardware_environments/virt/hw_settings.yml
index db8c4e804..d00a8527e 100644
--- a/roles/overcloud-deploy/files/hardware_environments/virt/hw_settings.yml
+++ b/roles/overcloud-deploy/files/hardware_environments/virt/hw_settings.yml
@@ -1,3 +1,4 @@
+---
 hw_env:
   env_type: virt
   libvirt_type: qemu
diff --git a/roles/overcloud-deploy/files/hardware_environments/virt/network_configs/single_nic_vlans_ipv4/hw_settings.yml b/roles/overcloud-deploy/files/hardware_environments/virt/network_configs/single_nic_vlans_ipv4/hw_settings.yml
index db8c4e804..d00a8527e 100644
--- a/roles/overcloud-deploy/files/hardware_environments/virt/network_configs/single_nic_vlans_ipv4/hw_settings.yml
+++ b/roles/overcloud-deploy/files/hardware_environments/virt/network_configs/single_nic_vlans_ipv4/hw_settings.yml
@@ -1,3 +1,4 @@
+---
 hw_env:
   env_type: virt
   libvirt_type: qemu
diff --git a/roles/overcloud-deploy/files/hardware_environments/virt/network_configs/single_nic_vlans_ipv6/hw_settings.yml b/roles/overcloud-deploy/files/hardware_environments/virt/network_configs/single_nic_vlans_ipv6/hw_settings.yml
index 869a065a9..5124e8814 100644
--- a/roles/overcloud-deploy/files/hardware_environments/virt/network_configs/single_nic_vlans_ipv6/hw_settings.yml
+++ b/roles/overcloud-deploy/files/hardware_environments/virt/network_configs/single_nic_vlans_ipv6/hw_settings.yml
@@ -1,3 +1,4 @@
+---
 hw_env:
     env_type: virt
     libvirt_type: qemu
diff --git a/roles/overcloud-deploy/files/hardware_environments/virt/network_configs/single_nic_vlans_ipv6/single_nic_vlans_ipv6.yml b/roles/overcloud-deploy/files/hardware_environments/virt/network_configs/single_nic_vlans_ipv6/single_nic_vlans_ipv6.yml
index 096e48c51..fc2ff7307 100644
--- a/roles/overcloud-deploy/files/hardware_environments/virt/network_configs/single_nic_vlans_ipv6/single_nic_vlans_ipv6.yml
+++ b/roles/overcloud-deploy/files/hardware_environments/virt/network_configs/single_nic_vlans_ipv6/single_nic_vlans_ipv6.yml
@@ -1,3 +1,4 @@
+---
 parameters:
     ServiceNetMap:
         NeutronTenantNetwork: tenant
@@ -7,7 +8,7 @@ parameters:
         CinderIscsiNetwork: storage
         GlanceApiNetwork: storage
         GlanceRegistryNetwork: internal_api
-        KeystoneAdminApiNetwork: ctlplane # allows undercloud to config endpoints
+        KeystoneAdminApiNetwork: ctlplane  # allows undercloud to config endpoints
         KeystonePublicApiNetwork: internal_api
         NeutronApiNetwork: internal_api
         HeatApiNetwork: internal_api
diff --git a/roles/overcloud-deploy/meta/main.yml b/roles/overcloud-deploy/meta/main.yml
index d2301de57..3af8158ad 100644
--- a/roles/overcloud-deploy/meta/main.yml
+++ b/roles/overcloud-deploy/meta/main.yml
@@ -1,3 +1,4 @@
+---
 dependencies:
   - tripleo
   - extras-common
diff --git a/roles/overcloud-deploy/tasks/create-scripts.yml b/roles/overcloud-deploy/tasks/create-scripts.yml
index 92e63b65c..2b4479803 100644
--- a/roles/overcloud-deploy/tasks/create-scripts.yml
+++ b/roles/overcloud-deploy/tasks/create-scripts.yml
@@ -1,3 +1,4 @@
+---
 # Generate a number of scripts from templates.  These are scripts
 # rather than additional ansible tasks so that they can be run
 # manually from the undercloud host.
diff --git a/roles/overcloud-deploy/tasks/deploy-overcloud.yml b/roles/overcloud-deploy/tasks/deploy-overcloud.yml
index edcebae91..a4961fb0f 100644
--- a/roles/overcloud-deploy/tasks/deploy-overcloud.yml
+++ b/roles/overcloud-deploy/tasks/deploy-overcloud.yml
@@ -1,9 +1,10 @@
+---
 - name: Deploy the overcloud
   shell: >
     set -o pipefail &&
     {{ working_dir }}/overcloud-deploy.sh 2>&1 {{ timestamper_cmd }} > {{ deploy_log }}
   register: deploy_script_result
-  ignore_errors: True
+  ignore_errors: true
   when: step_deploy_overcloud|bool
 
 - name: Export actual used deploy args for persistence to other plays
diff --git a/roles/overcloud-deploy/tasks/main.yml b/roles/overcloud-deploy/tasks/main.yml
index 79a21d69a..64d6d96cf 100644
--- a/roles/overcloud-deploy/tasks/main.yml
+++ b/roles/overcloud-deploy/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - include: pre-deploy.yml
   tags:
     - overcloud-scripts
diff --git a/roles/overcloud-deploy/tasks/post-deploy.yml b/roles/overcloud-deploy/tasks/post-deploy.yml
index fb42879a9..2491fa6be 100644
--- a/roles/overcloud-deploy/tasks/post-deploy.yml
+++ b/roles/overcloud-deploy/tasks/post-deploy.yml
@@ -1,3 +1,4 @@
+---
 # This makes the overcloudrc file available locally.  This file
 # contains credentials for accessing OpenStack API services on the
 # overcloud.
diff --git a/roles/overcloud-deploy/tasks/pre-deploy.yml b/roles/overcloud-deploy/tasks/pre-deploy.yml
index 44ba939c7..a47019ba8 100644
--- a/roles/overcloud-deploy/tasks/pre-deploy.yml
+++ b/roles/overcloud-deploy/tasks/pre-deploy.yml
@@ -1,3 +1,4 @@
+---
 # Note.. the order of heat templates and args is very important.  The last environment that sets a variable takes precedent.
 
 - name: Deprecation message for network isolation types
@@ -103,14 +104,14 @@
 
 - name: Set cloud-name variables
   set_fact:
-      cloud_name_args: >-
-          -e {{ working_dir }}/cloud-names.yaml
+    cloud_name_args: >-
+        -e {{ working_dir }}/cloud-names.yaml
   when: release not in ['mitaka', 'liberty']
 
 - name: Set the hostname_map config if defined
   set_fact:
-      hostnamemap_args: >-
-          -e {{ working_dir }}/hostnamemap.yaml
+    hostnamemap_args: >-
+        -e {{ working_dir }}/hostnamemap.yaml
   when:
     - groups['overcloud'] is defined
     - groups['overcloud'][0] is defined
@@ -150,10 +151,10 @@
 
 - name: set novajoin/TLS everywhere fact
   set_fact:
-      tls_everywhere_args: >-
-          -e {{ overcloud_templates_path }}/environments/services/haproxy-public-tls-certmonger.yaml
-          -e {{ overcloud_templates_path }}/environments/ssl/enable-internal-tls.yaml
-          -e {{ overcloud_templates_path }}/environments/ssl/tls-everywhere-endpoints-dns.yaml
+    tls_everywhere_args: >-
+        -e {{ overcloud_templates_path }}/environments/services/haproxy-public-tls-certmonger.yaml
+        -e {{ overcloud_templates_path }}/environments/ssl/enable-internal-tls.yaml
+        -e {{ overcloud_templates_path }}/environments/ssl/tls-everywhere-endpoints-dns.yaml
   when:
     - enable_tls_everywhere|bool
     - release not in ['mitaka', 'liberty', 'newton']
@@ -273,4 +274,3 @@
   when:
     - ci_job_end_time is defined
     - '"ovb" not in lookup("env", "TOCI_JOBTYPE")'
-
diff --git a/roles/overcloud-deploy/tests/test.yml b/roles/overcloud-deploy/tests/test.yml
index 7bbf15e29..a115b9986 100644
--- a/roles/overcloud-deploy/tests/test.yml
+++ b/roles/overcloud-deploy/tests/test.yml
@@ -2,4 +2,4 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - ansible-role-tripleo-overcloud
\ No newline at end of file
+    - ansible-role-tripleo-overcloud
diff --git a/roles/overcloud-prep-config/defaults/main.yml b/roles/overcloud-prep-config/defaults/main.yml
index 09bbb5b34..973b19276 100644
--- a/roles/overcloud-prep-config/defaults/main.yml
+++ b/roles/overcloud-prep-config/defaults/main.yml
@@ -1,13 +1,13 @@
 ---
 
 network_isolation: true
-network_isolation_type: single-nic-vlans # multiple-nics, bond-with-vlans, public-bond
+network_isolation_type: single-nic-vlans  # multiple-nics, bond-with-vlans, public-bond
 network_environment_file: network-environment.yaml.j2
 
 external_network_cidr: 192.168.23.0/24
 undercloud_external_network_cidr: >-
   {%- if overcloud_ipv6|bool %}2001:db8:fd00:1000::/64{% else %}10.0.0.1/24{% endif -%}
-overcloud_dns_servers: [ '{{ external_network_cidr|nthhost(1) }}' ]
+overcloud_dns_servers: ['{{ external_network_cidr|nthhost(1) }}']
 
 overcloud_public_vip: "{{ undercloud_external_network_cidr|nthhost(5) }}"
 ssl_overcloud: false
diff --git a/roles/overcloud-prep-config/meta/main.yml b/roles/overcloud-prep-config/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/overcloud-prep-config/meta/main.yml
+++ b/roles/overcloud-prep-config/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/overcloud-prep-config/tasks/main.yml b/roles/overcloud-prep-config/tasks/main.yml
index c897b8df7..f16689b15 100644
--- a/roles/overcloud-prep-config/tasks/main.yml
+++ b/roles/overcloud-prep-config/tasks/main.yml
@@ -69,8 +69,8 @@
     download_templates_rpm: "{{ download_overcloud_templates_rpm|default('') }}"
     prep_post_hook_script: "{{ overcloud_prep_post_hook_script|default('') }}"
   when:
-     - overcloud_templates_refspec is defined or overcloud_templates_branch is defined
-     - overcloud_templates_repo is defined
+    - overcloud_templates_refspec is defined or overcloud_templates_branch is defined
+    - overcloud_templates_repo is defined
 
 - name: Copy extra THT config files on the undercloud
   copy:
diff --git a/roles/overcloud-prep-containers/meta/main.yml b/roles/overcloud-prep-containers/meta/main.yml
index d56408db7..a99ff864c 100644
--- a/roles/overcloud-prep-containers/meta/main.yml
+++ b/roles/overcloud-prep-containers/meta/main.yml
@@ -1,3 +1,4 @@
+---
 dependencies:
   - extras-common
   - container-prep
diff --git a/roles/overcloud-prep-containers/tasks/create-scripts.yml b/roles/overcloud-prep-containers/tasks/create-scripts.yml
index 8e9b81573..2a2b3c411 100644
--- a/roles/overcloud-prep-containers/tasks/create-scripts.yml
+++ b/roles/overcloud-prep-containers/tasks/create-scripts.yml
@@ -1,3 +1,4 @@
+---
 # Create the scripts that will be used to setup the overcloud images
 
 - name: set the service environments for container image prepare
diff --git a/roles/overcloud-prep-containers/tasks/overcloud-prep-containers.yml b/roles/overcloud-prep-containers/tasks/overcloud-prep-containers.yml
index 676aa0dff..5826347ab 100644
--- a/roles/overcloud-prep-containers/tasks/overcloud-prep-containers.yml
+++ b/roles/overcloud-prep-containers/tasks/overcloud-prep-containers.yml
@@ -6,32 +6,32 @@
       when: ansible_python.version.major == 2
       block:
 
-      - command: "{{ python_cmd }} -m pip --version"
-        register: have_pip
-        changed_when: false
-        failed_when: false
-
-      - when: have_pip.rc != 0
-        become: true
-        block:
-
-        - name: check if python setup tool is installed
-          shell: "{{ python_cmd }} -m easy_install --version"
-          register: easy_install_exists
+        - command: "{{ python_cmd }} -m pip --version"
+          register: have_pip
           changed_when: false
           failed_when: false
 
-        - name: Install python setuptools (easy_install)
-          when: easy_install_exists.rc != 0
-          package:
-            state: latest
-            name:
-              - python2-setuptools
-              # python2-setuptools deprecates python-setuptools the former
-              # one being too old to be usable. included in openstack distro.
+        - when: have_pip.rc != 0
+          become: true
+          block:
 
-        - name: easy-install pip
-          command: "{{ python_cmd }} -m easy_install pip"
+            - name: check if python setup tool is installed
+              shell: "{{ python_cmd }} -m easy_install --version"
+              register: easy_install_exists
+              changed_when: false
+              failed_when: false
+
+            - name: Install python setuptools (easy_install)
+              when: easy_install_exists.rc != 0
+              package:
+                state: latest
+                name:
+                  - python2-setuptools
+                  # python2-setuptools deprecates python-setuptools the former
+                  # one being too old to be usable. included in openstack distro.
+
+            - name: easy-install pip
+              command: "{{ python_cmd }} -m easy_install pip"
 
     - name: Update pip
       pip:
diff --git a/roles/overcloud-prep-flavors/meta/main.yml b/roles/overcloud-prep-flavors/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/overcloud-prep-flavors/meta/main.yml
+++ b/roles/overcloud-prep-flavors/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/overcloud-prep-flavors/tasks/create-scripts.yml b/roles/overcloud-prep-flavors/tasks/create-scripts.yml
index 7a84bae21..e7a1bf07a 100644
--- a/roles/overcloud-prep-flavors/tasks/create-scripts.yml
+++ b/roles/overcloud-prep-flavors/tasks/create-scripts.yml
@@ -1,3 +1,4 @@
+---
 # Creat the scripts that will be used to setup flavors for the overcloud
 
 - name: Create overcloud-prep-flavors script
diff --git a/roles/overcloud-prep-flavors/tasks/main.yml b/roles/overcloud-prep-flavors/tasks/main.yml
index 1180d3ab6..0d5c690a0 100644
--- a/roles/overcloud-prep-flavors/tasks/main.yml
+++ b/roles/overcloud-prep-flavors/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - include: create-scripts.yml
   tags:
     - undercloud-scripts
diff --git a/roles/overcloud-prep-flavors/tasks/overcloud-prep-flavors.yml b/roles/overcloud-prep-flavors/tasks/overcloud-prep-flavors.yml
index 9dfc493b5..72377ff67 100644
--- a/roles/overcloud-prep-flavors/tasks/overcloud-prep-flavors.yml
+++ b/roles/overcloud-prep-flavors/tasks/overcloud-prep-flavors.yml
@@ -1,3 +1,4 @@
+---
 - name: Prepare the scripts for overcloud flavors
   shell: >
     set -o pipefail &&
diff --git a/roles/overcloud-prep-images/meta/main.yml b/roles/overcloud-prep-images/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/overcloud-prep-images/meta/main.yml
+++ b/roles/overcloud-prep-images/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/overcloud-prep-images/tasks/create-scripts.yml b/roles/overcloud-prep-images/tasks/create-scripts.yml
index b7890cf46..c6b032a23 100644
--- a/roles/overcloud-prep-images/tasks/create-scripts.yml
+++ b/roles/overcloud-prep-images/tasks/create-scripts.yml
@@ -1,3 +1,4 @@
+---
 # Create the scripts that will be used to setup the overcloud images
 
 - name: Create overcloud prep-images script
diff --git a/roles/overcloud-prep-images/tasks/main.yml b/roles/overcloud-prep-images/tasks/main.yml
index 6c0696214..eb865c4be 100644
--- a/roles/overcloud-prep-images/tasks/main.yml
+++ b/roles/overcloud-prep-images/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - include: create-scripts.yml
   tags:
     - undercloud-scripts
diff --git a/roles/overcloud-prep-images/tasks/overcloud-prep-images.yml b/roles/overcloud-prep-images/tasks/overcloud-prep-images.yml
index 4a7f8ba00..2cfed89fa 100644
--- a/roles/overcloud-prep-images/tasks/overcloud-prep-images.yml
+++ b/roles/overcloud-prep-images/tasks/overcloud-prep-images.yml
@@ -1,3 +1,4 @@
+---
 - name: Prepare the overcloud images for deploy
   shell: >
     set -o pipefail &&
diff --git a/roles/overcloud-prep-network/meta/main.yml b/roles/overcloud-prep-network/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/overcloud-prep-network/meta/main.yml
+++ b/roles/overcloud-prep-network/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/overcloud-prep-network/tasks/create-scripts.yml b/roles/overcloud-prep-network/tasks/create-scripts.yml
index ef66ba154..b2e0eff60 100644
--- a/roles/overcloud-prep-network/tasks/create-scripts.yml
+++ b/roles/overcloud-prep-network/tasks/create-scripts.yml
@@ -1,3 +1,4 @@
+---
 # Creat the overcloud-prep-network scripts that will be used to setup the undercloud for network isolation
 
 - name: Create overcloud-prep-network script
diff --git a/roles/overcloud-prep-network/tasks/main.yml b/roles/overcloud-prep-network/tasks/main.yml
index fe1b1ac6e..7f0092bd2 100644
--- a/roles/overcloud-prep-network/tasks/main.yml
+++ b/roles/overcloud-prep-network/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - include: create-scripts.yml
   tags:
     - undercloud-scripts
diff --git a/roles/overcloud-prep-network/tasks/overcloud-prep-network.yml b/roles/overcloud-prep-network/tasks/overcloud-prep-network.yml
index de1c0a70f..86b19cf40 100644
--- a/roles/overcloud-prep-network/tasks/overcloud-prep-network.yml
+++ b/roles/overcloud-prep-network/tasks/overcloud-prep-network.yml
@@ -1,3 +1,4 @@
+---
 - name: Prepare the network-isolation required networks on the undercloud
   shell: >
     set -o pipefail &&
diff --git a/roles/overcloud-scale/meta/main.yml b/roles/overcloud-scale/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/overcloud-scale/meta/main.yml
+++ b/roles/overcloud-scale/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/overcloud-ssl/meta/main.yml b/roles/overcloud-ssl/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/overcloud-ssl/meta/main.yml
+++ b/roles/overcloud-ssl/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/overcloud-ssl/tasks/main.yml b/roles/overcloud-ssl/tasks/main.yml
index 52c71fb09..d03658861 100644
--- a/roles/overcloud-ssl/tasks/main.yml
+++ b/roles/overcloud-ssl/tasks/main.yml
@@ -26,11 +26,11 @@
 
 - name: fetch template from single remote host
   tls_tht:
-      enable_tls_overcloud: "{{ ssl_overcloud }}"
-      source_dir: "/usr/share/openstack-tripleo-heat-templates/"
-      dest_dir: "{{ working_dir }}/"
-      cert_filename: "{{ working_dir }}/server-cert.pem"
-      cert_ca_filename: "{{ working_dir }}/overcloud-cacert.pem"
-      key_filename: "{{ working_dir }}/server-key.pem"
-      tht_release: '{{ release }}'
+    enable_tls_overcloud: "{{ ssl_overcloud }}"
+    source_dir: "/usr/share/openstack-tripleo-heat-templates/"
+    dest_dir: "{{ working_dir }}/"
+    cert_filename: "{{ working_dir }}/server-cert.pem"
+    cert_ca_filename: "{{ working_dir }}/overcloud-cacert.pem"
+    key_filename: "{{ working_dir }}/server-key.pem"
+    tht_release: '{{ release }}'
   when: ssl_overcloud|bool or undercloud_generate_service_certificate|bool
diff --git a/roles/overcloud-ssl/tests/test.yml b/roles/overcloud-ssl/tests/test.yml
index 5274fcccd..c9ac8cec4 100644
--- a/roles/overcloud-ssl/tests/test.yml
+++ b/roles/overcloud-ssl/tests/test.yml
@@ -2,4 +2,4 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - ansible-role-tripleo-ssl
\ No newline at end of file
+    - ansible-role-tripleo-ssl
diff --git a/roles/set-libvirt-type/tasks/main.yml b/roles/set-libvirt-type/tasks/main.yml
index 0a9195b5c..2edd4d256 100644
--- a/roles/set-libvirt-type/tasks/main.yml
+++ b/roles/set-libvirt-type/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - name: Enable kvm nested virtualization
   block:
     - name: Check cpu vendor
diff --git a/roles/snapshot-libvirt/defaults/main.yml b/roles/snapshot-libvirt/defaults/main.yml
index a85e1f8bc..a36ca349e 100644
--- a/roles/snapshot-libvirt/defaults/main.yml
+++ b/roles/snapshot-libvirt/defaults/main.yml
@@ -1,3 +1,4 @@
+---
 # By default the role does nothing since both operations
 # are potentially destructive.
 snapshot_create: false
diff --git a/roles/standalone-upgrade/meta/main.yml b/roles/standalone-upgrade/meta/main.yml
index d56408db7..a99ff864c 100644
--- a/roles/standalone-upgrade/meta/main.yml
+++ b/roles/standalone-upgrade/meta/main.yml
@@ -1,3 +1,4 @@
+---
 dependencies:
   - extras-common
   - container-prep
diff --git a/roles/standalone-upgrade/tasks/main.yml b/roles/standalone-upgrade/tasks/main.yml
index eeff4fcef..8655f87db 100644
--- a/roles/standalone-upgrade/tasks/main.yml
+++ b/roles/standalone-upgrade/tasks/main.yml
@@ -29,4 +29,3 @@
   shell: >
     set -o pipefail &&
     {{ working_dir }}/standalone-upgrade.sh 2>&1 {{ timestamper_cmd }} > {{ working_dir }}/{{ standalone_upgrade_log }}
-
diff --git a/roles/standalone/meta/main.yml b/roles/standalone/meta/main.yml
index d56408db7..a99ff864c 100644
--- a/roles/standalone/meta/main.yml
+++ b/roles/standalone/meta/main.yml
@@ -1,3 +1,4 @@
+---
 dependencies:
   - extras-common
   - container-prep
diff --git a/roles/tht-prep-config/meta/main.yml b/roles/tht-prep-config/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/tht-prep-config/meta/main.yml
+++ b/roles/tht-prep-config/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/tripleo-validations/defaults/main.yml b/roles/tripleo-validations/defaults/main.yml
index 886d6dbbb..31c78094a 100644
--- a/roles/tripleo-validations/defaults/main.yml
+++ b/roles/tripleo-validations/defaults/main.yml
@@ -1,10 +1,10 @@
 ---
 val_working_dir: "{{ working_dir }}"
 
-run_tripleo_validations: False
-run_tripleo_validations_negative_tests: False
-run_tripleo_validations_setup: False
-exit_on_validations_failure: False
+run_tripleo_validations: false
+run_tripleo_validations_negative_tests: false
+run_tripleo_validations_setup: false
+exit_on_validations_failure: false
 
 # Tripleo-validations group name of tests, should be either pre-introspection,
 # pre-deployment or post-deployment.
diff --git a/roles/tripleo-validations/meta/main.yml b/roles/tripleo-validations/meta/main.yml
index a1f0ecb27..98bfef3b5 100644
--- a/roles/tripleo-validations/meta/main.yml
+++ b/roles/tripleo-validations/meta/main.yml
@@ -1,3 +1,3 @@
+---
 dependencies:
   - extras-common
-
diff --git a/roles/tripleo-validations/tasks/config.yml b/roles/tripleo-validations/tasks/config.yml
index e33f8d167..87635ef69 100644
--- a/roles/tripleo-validations/tasks/config.yml
+++ b/roles/tripleo-validations/tasks/config.yml
@@ -1,8 +1,9 @@
-
 ---
 
 - name: Ensure tripleo-validations rpm requirements are installed
-  yum: name=openstack-tripleo-validations state=present
+  yum:
+    name: openstack-tripleo-validations
+    state: present
   become: true
 
 - name: Create run-tripleo-validations.sh
@@ -14,21 +15,20 @@
 
 - when: run_tripleo_validations_negative_tests|bool
   block:
-  - name: Create run-preintro-validations-negative-tests.sh
-    template:
-      src: "{{ run_preintro_val_script }}"
-      dest: "{{ val_working_dir }}/run-preintro-validations-negative-tests.sh"
-      mode: 0755
+    - name: Create run-preintro-validations-negative-tests.sh
+      template:
+        src: "{{ run_preintro_val_script }}"
+        dest: "{{ val_working_dir }}/run-preintro-validations-negative-tests.sh"
+        mode: 0755
 
-  - name: Create run-predep-validations-negative-tests.sh
-    template:
-      src: "{{ run_predep_val_script }}"
-      dest: "{{ val_working_dir }}/run-predep-validations-negative-tests.sh"
-      mode: 0755
-
-  - name: Create run-postdep-validations-negative-tests.sh
-    template:
-      src: "{{ run_postdep_val_script }}"
-      dest: "{{ val_working_dir }}/run-postdep-validations-negative-tests.sh"
-      mode: 0755
+    - name: Create run-predep-validations-negative-tests.sh
+      template:
+        src: "{{ run_predep_val_script }}"
+        dest: "{{ val_working_dir }}/run-predep-validations-negative-tests.sh"
+        mode: 0755
 
+    - name: Create run-postdep-validations-negative-tests.sh
+      template:
+        src: "{{ run_postdep_val_script }}"
+        dest: "{{ val_working_dir }}/run-postdep-validations-negative-tests.sh"
+        mode: 0755
diff --git a/roles/tripleo-validations/tasks/main.yml b/roles/tripleo-validations/tasks/main.yml
index 05a2da7d0..ad7a8f31a 100644
--- a/roles/tripleo-validations/tasks/main.yml
+++ b/roles/tripleo-validations/tasks/main.yml
@@ -11,53 +11,52 @@
 
     - when: run_tripleo_validations|bool
       block:
-      - name: Clean failed_validations_log file if exists
-        file:
-          path: "{{ failed_validations_log }}"
-          state: absent
-        tags:
-          - tripleo-validations
+        - name: Clean failed_validations_log file if exists
+          file:
+            path: "{{ failed_validations_log }}"
+            state: absent
+          tags:
+            - tripleo-validations
 
-      - name: Run validations tests through Mistral
-        shell: >
-          {{ val_working_dir }}/run-tripleo-validations.sh {{ item }} >
-          {{ val_working_dir }}/validations_{{ item }}.log 2>&1
-        with_items:
-          - "{{ validations_group|default([]) }}"
-        tags:
-          - tripleo-validations
+        - name: Run validations tests through Mistral
+          shell: >
+            {{ val_working_dir }}/run-tripleo-validations.sh {{ item }} >
+            {{ val_working_dir }}/validations_{{ item }}.log 2>&1
+          with_items:
+            - "{{ validations_group|default([]) }}"
+          tags:
+            - tripleo-validations
 
-      - name: Check for failed validations log file
-        stat:
-          path: "{{ failed_validations_log }}"
-        register: failed_validations_log_file
-        tags:
-          - tripleo-validations
+        - name: Check for failed validations log file
+          stat:
+            path: "{{ failed_validations_log }}"
+          register: failed_validations_log_file
+          tags:
+            - tripleo-validations
 
-      - name: Get content of failed validations log file
-        command: cat {{ failed_validations_log }}
-        register: failed_validations_content
-        when: failed_validations_log_file.stat.exists|bool
-        tags:
-          - tripleo-validations
+        - name: Get content of failed validations log file
+          command: cat {{ failed_validations_log }}
+          register: failed_validations_content
+          when: failed_validations_log_file.stat.exists|bool
+          tags:
+            - tripleo-validations
 
-      - name: Display failed validations tests
-        fail:
-          msg:
-            "{{ failed_validations_content.stdout_lines }}"
-        ignore_errors: "{{ not (exit_on_validations_failure|bool) }}"
-        when: failed_validations_log_file.stat.exists|bool
-        tags:
-          - tripleo-validations
+        - name: Display failed validations tests
+          fail:
+            msg:
+              "{{ failed_validations_content.stdout_lines }}"
+          ignore_errors: "{{ not (exit_on_validations_failure|bool) }}"
+          when: failed_validations_log_file.stat.exists|bool
+          tags:
+            - tripleo-validations
 
     - when: run_tripleo_validations_negative_tests|bool
       block:
-      - name: Run negative tests for pre-introspection group
-        shell: >
-          set -o pipefail &&
-          {{ val_working_dir }}/run-preintro-validations-negative-tests.sh 2>&1 {{ timestamper_cmd }} >
-          {{ run_preintro_val_log }}
-        when: '"pre-introspection" in validations_group'
-        tags:
-          - tripleo-validations
-
+        - name: Run negative tests for pre-introspection group
+          shell: >
+            set -o pipefail &&
+            {{ val_working_dir }}/run-preintro-validations-negative-tests.sh 2>&1 {{ timestamper_cmd }} >
+            {{ run_preintro_val_log }}
+          when: '"pre-introspection" in validations_group'
+          tags:
+            - tripleo-validations
diff --git a/roles/undercloud-deploy/meta/main.yml b/roles/undercloud-deploy/meta/main.yml
index d56408db7..a99ff864c 100644
--- a/roles/undercloud-deploy/meta/main.yml
+++ b/roles/undercloud-deploy/meta/main.yml
@@ -1,3 +1,4 @@
+---
 dependencies:
   - extras-common
   - container-prep
diff --git a/roles/undercloud-deploy/tasks/create-scripts.yml b/roles/undercloud-deploy/tasks/create-scripts.yml
index 1eb141a86..613be314d 100644
--- a/roles/undercloud-deploy/tasks/create-scripts.yml
+++ b/roles/undercloud-deploy/tasks/create-scripts.yml
@@ -1,3 +1,4 @@
+---
 # Creat the scripts that will be used to deploy the undercloud
 # environment.
 - name: Check the dns information provided by the virthost
@@ -88,9 +89,9 @@
     download_templates_rpm: "{{ download_undercloud_templates_rpm }}"
     tht_rpm_url: "{{ undercloud_tht_rpm_url }}"
   when:
-     - undercloud_templates_branch is defined or undercloud_templates_refspec is defined
-     - undercloud_templates_repo is defined
-     - undercloud_templates_path is defined
+    - undercloud_templates_branch is defined or undercloud_templates_refspec is defined
+    - undercloud_templates_repo is defined
+    - undercloud_templates_path is defined
 
 - name: Create the undercloud parameter defaults file.
   template:
@@ -99,10 +100,10 @@
     mode: 0600
 
 - name: Create containers-prepare-parameter.yaml
+  when: containerized_undercloud|bool or containerized_overcloud|bool
   block:
 
-  - name: Write containers-prepare-parameter.yaml
-    template:
-      src: containers-prepare-parameter.yaml.j2
-      dest: "{{ working_dir }}/containers-prepare-parameter.yaml"
-  when: containerized_undercloud|bool or containerized_overcloud|bool
+    - name: Write containers-prepare-parameter.yaml
+      template:
+        src: containers-prepare-parameter.yaml.j2
+        dest: "{{ working_dir }}/containers-prepare-parameter.yaml"
diff --git a/roles/undercloud-deploy/tasks/install-undercloud.yml b/roles/undercloud-deploy/tasks/install-undercloud.yml
index b6a00b8dd..1b388df60 100644
--- a/roles/undercloud-deploy/tasks/install-undercloud.yml
+++ b/roles/undercloud-deploy/tasks/install-undercloud.yml
@@ -1,3 +1,4 @@
+---
 - name: Run dstat on the undercloud prior to undercloud install
   include_role:
     name: validate-perf
diff --git a/roles/undercloud-deploy/tasks/main.yml b/roles/undercloud-deploy/tasks/main.yml
index 4d1451bea..9e54beb2f 100644
--- a/roles/undercloud-deploy/tasks/main.yml
+++ b/roles/undercloud-deploy/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - name: gather facts used by role
   setup:
     gather_subset: "!min,distribution"
@@ -36,7 +37,7 @@
   become: true
   service:
     name: openstack-ironic-conductor
-    enabled: yes
+    enabled: true
     state: restarted
   tags:
     - undercloud-install
@@ -49,4 +50,3 @@
   tags:
     - undercloud-post-install
   when: (enable_vbmc|bool and undercloud_enable_ui|bool) or enable_libvirt_tripleo_ui|bool
-
diff --git a/roles/undercloud-deploy/tasks/post-install.yml b/roles/undercloud-deploy/tasks/post-install.yml
index 1c223d38e..e59af42bd 100644
--- a/roles/undercloud-deploy/tasks/post-install.yml
+++ b/roles/undercloud-deploy/tasks/post-install.yml
@@ -1,3 +1,4 @@
+---
 # Extract the undercloud admin password from
 # `undercloud-passwords.conf`.
 - when: not containerized_undercloud|bool
@@ -34,7 +35,7 @@
     src: /home/{{ undercloud_user }}/stackrc
     dest: "{{ working_dir }}/stackrc"
     owner: "{{ undercloud_user }}"
-    remote_src: yes
+    remote_src: true
     mode: 0640
   become: true
   when: containerized_undercloud|bool
diff --git a/roles/undercloud-deploy/tasks/tripleo-ui.yml b/roles/undercloud-deploy/tasks/tripleo-ui.yml
index 3526e0d64..ebd0b2cd9 100644
--- a/roles/undercloud-deploy/tasks/tripleo-ui.yml
+++ b/roles/undercloud-deploy/tasks/tripleo-ui.yml
@@ -28,7 +28,7 @@
         regexp: "'keystone':"
         line: "  'keystone': 'http://{{hostvars[groups['virthost'][0]].ansible_default_ipv4.address}}:5000/v3/',"
         dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: yes
+        backup: true
       become: true
       when: release in ['master', 'pike']
 
@@ -37,7 +37,7 @@
         regexp: "'keystone':"
         line: "  'keystone': 'http://{{hostvars[groups['virthost'][0]].ansible_default_ipv4.address}}:5000/v2/',"
         dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: yes
+        backup: true
       become: true
       when: release not in ['master', 'pike']
 
@@ -46,7 +46,7 @@
         regexp: "'heat':"
         line: "  'heat': 'http://{{hostvars[groups['virthost'][0]].ansible_default_ipv4.address}}:8004/v1/{{ heat_public_url.stdout }}',"
         dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: yes
+        backup: true
       become: true
 
     - name: update the ironic config in tripleo_ui_config.js, connect via virthost ip
@@ -54,7 +54,7 @@
         regexp: "'ironic':"
         line: "  'ironic': 'http://{{hostvars[groups['virthost'][0]].ansible_default_ipv4.address}}:6385',"
         dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: yes
+        backup: true
       become: true
 
     - name: update the ironic-inspector config in tripleo_ui_config.js, connect via virthost ip
@@ -62,7 +62,7 @@
         regexp: "'ironic-inspector':"
         line: "  'ironic-inspector': 'http://{{hostvars[groups['virthost'][0]].ansible_default_ipv4.address}}:5050',"
         dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: yes
+        backup: true
       become: true
 
     - name: update the mistral config in tripleo_ui_config.js, connect via virthost ip
@@ -70,7 +70,7 @@
         regexp: "'mistral':"
         line: "  'mistral': 'http://{{hostvars[groups['virthost'][0]].ansible_default_ipv4.address}}:8989/v2',"
         dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: yes
+        backup: true
       become: true
 
     - name: update the swift config in tripleo_ui_config.js, connect via virthost ip
@@ -78,7 +78,7 @@
         regexp: "'swift':"
         line: "  'swift': 'http://{{hostvars[groups['virthost'][0]].ansible_default_ipv4.address}}:8080/v1/{{ swift_public_url.stdout }}',"
         dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: yes
+        backup: true
       become: true
 
     - name: update the zaqar-websocket config in tripleo_ui_config.js, connect via virthost ip
@@ -86,7 +86,7 @@
         regexp: "'zaqar-websocket':"
         line: "  'zaqar-websocket': 'ws://{{hostvars[groups['virthost'][0]].ansible_default_ipv4.address}}:9000',"
         dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: yes
+        backup: true
       become: true
 
     - name: restart the httpd service
@@ -106,7 +106,7 @@
         regexp: \d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}
         replace: "{{hostvars[groups['virthost'][0]].ansible_default_ipv4.address}}"
         dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: yes
+        backup: true
       become: true
 
     - name: update config in tripleo_ui_config.js, for keystone v3
@@ -114,7 +114,7 @@
         regexp: keystone\/v2.0
         replace: "keystone/v3"
         dest: /var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js
-        backup: yes
+        backup: true
       become: true
       when: release in ['master', 'pike']
 
diff --git a/roles/undercloud-setup/meta/main.yml b/roles/undercloud-setup/meta/main.yml
index d56408db7..a99ff864c 100644
--- a/roles/undercloud-setup/meta/main.yml
+++ b/roles/undercloud-setup/meta/main.yml
@@ -1,3 +1,4 @@
+---
 dependencies:
   - extras-common
   - container-prep
diff --git a/roles/undercloud-setup/tasks/ansible_cfg.yml b/roles/undercloud-setup/tasks/ansible_cfg.yml
index a71bef420..92688070c 100644
--- a/roles/undercloud-setup/tasks/ansible_cfg.yml
+++ b/roles/undercloud-setup/tasks/ansible_cfg.yml
@@ -10,7 +10,7 @@
     - pip
     - setuptools
   # TODO(sshnaidm): https://bugs.launchpad.net/tripleo/+bug/1792622
-  ignore_errors: True
+  ignore_errors: true
 
 - name: Install ara
   become: true
@@ -18,7 +18,7 @@
     name: ara
     state: present
     version: "{{ undercloud_ara_version }}"
-  ignore_errors: True
+  ignore_errors: true
 
 - name: Update the default ansible callback setting in /etc/ansible/ansible.cfg
   become: true
@@ -43,6 +43,3 @@
     regexp: '^#library'
     line: |
       library=/usr/lib/python2.7/site-packages/ara/plugins/modules
-
-
-
diff --git a/roles/undercloud-setup/tasks/atop.yml b/roles/undercloud-setup/tasks/atop.yml
index fc53b4b01..5982331c8 100644
--- a/roles/undercloud-setup/tasks/atop.yml
+++ b/roles/undercloud-setup/tasks/atop.yml
@@ -1,9 +1,9 @@
-
+---
 - when: install_atop|bool
   ignore_errors: true
   become: true
   block:
-# Run atop in background
+    # Run atop in background
     - name: Install atop if configured so
       shell: |
         source /etc/ci/mirror_info.sh
diff --git a/roles/undercloud-setup/tasks/toci_vxlan_networking.yml b/roles/undercloud-setup/tasks/toci_vxlan_networking.yml
index e0c03242f..81515ce9e 100644
--- a/roles/undercloud-setup/tasks/toci_vxlan_networking.yml
+++ b/roles/undercloud-setup/tasks/toci_vxlan_networking.yml
@@ -25,4 +25,3 @@
     set -o pipefail &&
     {{ working_dir }}/toci_vxlan_networking.sh
     2>&1 {{ timestamper_cmd }} > {{ working_dir }}/toci_vxlan_networking.sh.log
-
diff --git a/roles/undercloud-setup/tasks/vxlan_networking.yml b/roles/undercloud-setup/tasks/vxlan_networking.yml
index 48cb18c3b..e776c1609 100644
--- a/roles/undercloud-setup/tasks/vxlan_networking.yml
+++ b/roles/undercloud-setup/tasks/vxlan_networking.yml
@@ -32,4 +32,3 @@
   shell: "ping -c 6 -W 3 {{ vxlan_networking_addr_prefix }}.2 || (sudo systemctl restart openvswitch && ping -c 6 -W 3 {{ vxlan_networking_addr_prefix }}.2)"
   delegate_to: "{{ item }}"
   with_items: "{{ groups['overcloud'] | default([]) }}"
-
diff --git a/roles/validate-ipmi/meta/main.yml b/roles/validate-ipmi/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/validate-ipmi/meta/main.yml
+++ b/roles/validate-ipmi/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/validate-ipmi/tests/test.yml b/roles/validate-ipmi/tests/test.yml
index e1dce2992..62cf91624 100644
--- a/roles/validate-ipmi/tests/test.yml
+++ b/roles/validate-ipmi/tests/test.yml
@@ -2,4 +2,4 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - ansible-role-tripleo-validate-ipmi
\ No newline at end of file
+    - ansible-role-tripleo-validate-ipmi
diff --git a/roles/validate-perf/defaults/main.yml b/roles/validate-perf/defaults/main.yml
index 211103e57..a9ae97495 100644
--- a/roles/validate-perf/defaults/main.yml
+++ b/roles/validate-perf/defaults/main.yml
@@ -1,3 +1,4 @@
+---
 dstat_log_name: dstat-csv.log
 dstat_options: tcmndrylpg
 dstat_delay: 1
diff --git a/roles/validate-perf/meta/main.yml b/roles/validate-perf/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/validate-perf/meta/main.yml
+++ b/roles/validate-perf/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/validate-perf/tasks/main.yml b/roles/validate-perf/tasks/main.yml
index 97d3762c3..e3e2bc7d9 100644
--- a/roles/validate-perf/tasks/main.yml
+++ b/roles/validate-perf/tasks/main.yml
@@ -1,5 +1,6 @@
 ---
 - name: Validate performance (dstat) on overcloud
+  become: true
   block:
   - name: Install the latest version of dstat on overcloud
     package:
@@ -24,6 +25,5 @@
     executable: /bin/bash
     changed_when: false
   rescue:
-  - debug:
-      msg: "Warning: Performance cannot be validated."
-  become: true
+    - debug:
+        msg: "Warning: Performance cannot be validated."
diff --git a/roles/validate-sanity-checks/meta/main.yml b/roles/validate-sanity-checks/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/validate-sanity-checks/meta/main.yml
+++ b/roles/validate-sanity-checks/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/validate-simple/defaults/main.yml b/roles/validate-simple/defaults/main.yml
index 3dddc0676..721ef48e8 100644
--- a/roles/validate-simple/defaults/main.yml
+++ b/roles/validate-simple/defaults/main.yml
@@ -1,3 +1,4 @@
+---
 tenantrc: >-
   overcloudrc
 validate_script: overcloud-validate.sh.j2
diff --git a/roles/validate-simple/files/tenantvm_floatingip.yaml b/roles/validate-simple/files/tenantvm_floatingip.yaml
index 0f31bc164..8928d9be9 100644
--- a/roles/validate-simple/files/tenantvm_floatingip.yaml
+++ b/roles/validate-simple/files/tenantvm_floatingip.yaml
@@ -1,3 +1,4 @@
+---
 heat_template_version: 2013-05-23
 
 description: >
@@ -48,40 +49,40 @@ resources:
     type: OS::Nova::KeyPair
     properties:
       save_private_key: true
-      name: {get_param: key_name }
+      name: {get_param: key_name}
 
   private_net:
     type: OS::Neutron::Net
     properties:
-      name: { get_param: private_net_name }
+      name: {get_param: private_net_name}
 
   private_subnet:
     type: OS::Neutron::Subnet
     properties:
-      network_id: { get_resource: private_net }
-      cidr: { get_param: private_net_cidr }
-      gateway_ip: { get_param: private_net_gateway }
+      network_id: {get_resource: private_net}
+      cidr: {get_param: private_net_cidr}
+      gateway_ip: {get_param: private_net_gateway}
       allocation_pools:
-        - start: { get_param: private_net_pool_start }
-          end: { get_param: private_net_pool_end }
+        - start: {get_param: private_net_pool_start}
+          end: {get_param: private_net_pool_end}
 
   router:
     type: OS::Neutron::Router
     properties:
       external_gateway_info:
-        network: { get_param: public_net_name }
+        network: {get_param: public_net_name}
 
   router_interface:
     type: OS::Neutron::RouterInterface
     properties:
-      router_id: { get_resource: router }
-      subnet_id: { get_resource: private_subnet }
+      router_id: {get_resource: router}
+      subnet_id: {get_resource: private_subnet}
 
   volume1:
     type: OS::Cinder::Volume
     properties:
       name: Volume1
-      image: { get_param: image }
+      image: {get_param: image}
       size: 1
 
   server1:
@@ -91,19 +92,19 @@ resources:
       name: Server1
       block_device_mapping:
         - device_name: vda
-          volume_id: { get_resource: volume1 }
-      flavor: { get_resource: test_flavor }
-      key_name: { get_resource: key_pair }
+          volume_id: {get_resource: volume1}
+      flavor: {get_resource: test_flavor}
+      key_name: {get_resource: key_pair}
       networks:
-        - port: { get_resource: server1_port }
+        - port: {get_resource: server1_port}
 
   server1_port:
     type: OS::Neutron::Port
     properties:
-      network_id: { get_resource: private_net }
+      network_id: {get_resource: private_net}
       fixed_ips:
-        - subnet_id: { get_resource: private_subnet }
-      security_groups: [{ get_resource: server_security_group }]
+        - subnet_id: {get_resource: private_subnet}
+      security_groups: [{get_resource: server_security_group}]
 
   server1_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -111,8 +112,8 @@ resources:
     # replace it by router_id with get_resource: router_interface
     depends_on: router_interface
     properties:
-      floating_network: { get_param: public_net_name }
-      port_id: { get_resource: server1_port }
+      floating_network: {get_param: public_net_name}
+      port_id: {get_resource: server1_port}
 
   server_security_group:
     type: OS::Neutron::SecurityGroup
@@ -136,7 +137,7 @@ resources:
 outputs:
   server1_private_ip:
     description: IP address of server1 in private network
-    value: { get_attr: [ server1, first_address ] }
+    value: {get_attr: [server1, first_address]}
   server1_public_ip:
     description: Floating IP address of server1 in public network
-    value: { get_attr: [ server1_floating_ip, floating_ip_address ] }
+    value: {get_attr: [server1_floating_ip, floating_ip_address]}
diff --git a/roles/validate-simple/meta/main.yml b/roles/validate-simple/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/validate-simple/meta/main.yml
+++ b/roles/validate-simple/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/validate-tempest/files/tempestmail/config.yaml b/roles/validate-tempest/files/tempestmail/config.yaml
index 8f29825e7..ceab2d295 100644
--- a/roles/validate-tempest/files/tempestmail/config.yaml
+++ b/roles/validate-tempest/files/tempestmail/config.yaml
@@ -1,22 +1,23 @@
-require_auth: True
+---
+require_auth: true
 mail_from: tripleoresults@gmail.com
 templates_path: template/
 log_url: 'http://logs.openstack.org/periodic/'
 api_server: 'http://tempest-sendmail.tripleo.org:8080/api/v1.0/sendmail'
-use_api_server: True
+use_api_server: true
 default_log_url: 'http://logs.openstack.org'
 emails:
   - mail: 'arxcruz@redhat.com'
     name: 'Arx Cruz'
   - mail: 'gcerami@redhat.com'
     name: 'Gabriele'
-    fail_only: True
+    fail_only: true
   - mail: 'sshnaidm@redhat.com'
     name: 'Sagi Shnaidman'
-    fail_only: True
+    fail_only: true
   - mail: 'rhos-telemetry@redhat.com'
     name: 'Rhos Telemetry'
-    fail_only: True
+    fail_only: true
     jobs:
       - 'gate-tripleo-ci-centos-7-scenario001-multinode-oooq-puppet'
       - 'gate-tripleo-ci-centos-7-scenario001-multinode-oooq-container'
@@ -26,7 +27,7 @@ emails:
       - 'telemetry_tempest_plugin.scenario.test_telemetry_integration.TestTelemetryIntegration'
   - mail: 'abregman@redhat.com'
     name: 'RHOS Networking'
-    fail_only: True
+    fail_only: true
     jobs:
       - 'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset020-master'
       - 'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset020-pike'
@@ -39,7 +40,7 @@ emails:
       - 'tempest.scenario.test_security_groups_basic_ops'
   - mail: 'rhos-storage-tests@redhat.com'
     name: 'RHOSP Storage - Cinder'
-    fail_only: True
+    fail_only: true
     regex:
       - '^tempest\.api\.volume\.'
       - '^cinder\.tests\.tempest\.'
@@ -47,23 +48,23 @@ emails:
       - '^tempest\.scenario\.test_volume_migrate_attached'
   - mail: 'rhos-storage-tests@redhat.com'
     name: 'RHOSP Storage - Glance'
-    fail_only: True
+    fail_only: true
     regex:
       - '^tempest\.api\.image\.'
   - mail: 'rhos-storage-tests@redhat.com'
     name: 'RHOSP Storage - Manila'
-    fail_only: True
+    fail_only: true
     regex:
       - '^manila_tempest_tests\.tests\.'
   - mail: 'rhos-storage-tests@redhat.com'
     name: 'RHOSP Storage - Sahara'
-    fail_only: True
+    fail_only: true
     regex:
       - '^sahara_tempest_plugin\.tests\.'
   - mail: 'rhos-storage-tests@redhat.com'
     name: 'RHOSP Storage - Swift'
-    fail_only: True
+    fail_only: true
     regex:
-       - '^tempest\.api\.object_storage\.'
-       - '^tempest\.scenario\.test_object_storage_basic_ops'
+      - '^tempest\.api\.object_storage\.'
+      - '^tempest\.scenario\.test_object_storage_basic_ops'
 template: template.html
diff --git a/roles/validate-tempest/files/tempestmail/config2.yaml b/roles/validate-tempest/files/tempestmail/config2.yaml
index 61cdb0720..10f10dcda 100644
--- a/roles/validate-tempest/files/tempestmail/config2.yaml
+++ b/roles/validate-tempest/files/tempestmail/config2.yaml
@@ -1,9 +1,10 @@
-require_auth: True
+---
+require_auth: true
 mail_from: tripleoresults@gmail.com
 templates_path: template/
 log_url: 'http://logs.openstack.org/periodic/'
 api_server: 'http://tempest-sendmail.tripleo.org:8080/api/v1.0/sendmail'
-use_api_server: True
+use_api_server: true
 default_log_url: 'http://logs.openstack.org'
 emails:
   - mail: 'arxcruz@gmail.com'
diff --git a/roles/validate-tempest/files/tempestmail/tests/fixtures/config.yaml b/roles/validate-tempest/files/tempestmail/tests/fixtures/config.yaml
index 96d8b6a4d..ce8977c1b 100644
--- a/roles/validate-tempest/files/tempestmail/tests/fixtures/config.yaml
+++ b/roles/validate-tempest/files/tempestmail/tests/fixtures/config.yaml
@@ -1,9 +1,10 @@
-require_auth: True
+---
+require_auth: true
 mail_from: tripleoresults@gmail.com
 templates_path: template/
 log_url: 'http://logs.openstack.org/periodic/'
 api_server: 'http://tempest-tripleoci.rhcloud.com/api/v1.0/sendmail'
-use_api_server: True
+use_api_server: true
 default_log_url: 'http://logs.openstack.org'
 emails:
   - mail: 'arxcruz@redhat.com'
@@ -17,4 +18,3 @@ emails:
   - mail: 'myoung@redhat.com'
     name: 'Matt Young'
 template: template.html
-
diff --git a/roles/validate-tempest/meta/main.yml b/roles/validate-tempest/meta/main.yml
index 819da26a3..98bfef3b5 100644
--- a/roles/validate-tempest/meta/main.yml
+++ b/roles/validate-tempest/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - extras-common
diff --git a/roles/validate-tempest/tasks/run-tempest.yml b/roles/validate-tempest/tasks/run-tempest.yml
index 5bb0d6d87..b211e31c7 100644
--- a/roles/validate-tempest/tasks/run-tempest.yml
+++ b/roles/validate-tempest/tasks/run-tempest.yml
@@ -4,4 +4,4 @@
     set -o pipefail &&
     {{ working_dir }}/tempest-setup.sh 2>&1 {{ timestamper_cmd }} > {{ tempest_log_file }}
   register: tempest_result
-  ignore_errors: True
+  ignore_errors: true
diff --git a/roles/validate-tempest/tasks/stackviz.yml b/roles/validate-tempest/tasks/stackviz.yml
index 8dbbe88c8..7e7cf32de 100644
--- a/roles/validate-tempest/tasks/stackviz.yml
+++ b/roles/validate-tempest/tasks/stackviz.yml
@@ -10,7 +10,7 @@
 
 - name: Set dstat fact
   set_fact:
-      tempest_dstat_opt: '--dstat /var/log/extra/dstat-csv.log'
+    tempest_dstat_opt: '--dstat /var/log/extra/dstat-csv.log'
   when: dstat_result.stat.exists
 
 - name: Set the proper permission for tempest directory and files
@@ -18,7 +18,7 @@
     dest: "{{ working_dir }}/tempest"
     owner: "{{ undercloud_user }}"
     group: "{{ undercloud_user }}"
-    recurse: yes
+    recurse: true
   become: true
 
 - name: Copy stackviz static file to home directory
@@ -32,7 +32,7 @@
     stackviz-export {{ tempest_dstat_opt | default('') }} --env -f {{ working_dir }}/tempest/testrepository.subunit {{ working_dir }}/stackviz/data
   register: stackviz_result
   args:
-      chdir: "{{ working_dir }}/tempest"
+    chdir: "{{ working_dir }}/tempest"
 
 - name: Ensure /var/log/extra exists
   file:
diff --git a/roles/validate-tempest/tasks/tempest-venv.yml b/roles/validate-tempest/tasks/tempest-venv.yml
index 70d7048f4..c6e0069db 100644
--- a/roles/validate-tempest/tasks/tempest-venv.yml
+++ b/roles/validate-tempest/tasks/tempest-venv.yml
@@ -47,8 +47,9 @@
 
 - name: Set tempest init command
   set_fact:
-      tempest_init: "{{ working_dir }}/tempest_git/tools/{% if release == 'newton' %}configure-tempest-directory{% else %}with_env.sh tempest init{% endif %}"
+    tempest_init: "{{ working_dir }}/tempest_git/tools/{% if release == 'newton' %}configure-tempest-directory{% else %}with_env.sh tempest init{% endif %}"
 
 - name: Set tempestconf call
   set_fact:
-      tempestconf: "{% if release == 'newton' %}{{ working_dir }}/tools/config_tempest.py{% else %}{{ working_dir }}/tempest_git/tools/with_venv.sh discover-tempest-config{% endif %}"
+    tempestconf: >
+      "{% if release == 'newton' %}{{ working_dir }}/tools/config_tempest.py{% else %}{{ working_dir }}/tempest_git/tools/with_venv.sh discover-tempest-config{% endif %}"
diff --git a/roles/validate-tempest/vars/tempest_skip_liberty.yml b/roles/validate-tempest/vars/tempest_skip_liberty.yml
index 9439c1000..1e4304bc9 100644
--- a/roles/validate-tempest/vars/tempest_skip_liberty.yml
+++ b/roles/validate-tempest/vars/tempest_skip_liberty.yml
@@ -1,3 +1,4 @@
+---
 known_failures:
   - test: 'tempest.scenario.test_volume_boot_pattern'
     reason: 'rdo-manager tempest smoke test failing on "floating ip pool not found"'
diff --git a/roles/validate-tempest/vars/tempest_skip_master.yml b/roles/validate-tempest/vars/tempest_skip_master.yml
index 5fab344c1..b9467120f 100644
--- a/roles/validate-tempest/vars/tempest_skip_master.yml
+++ b/roles/validate-tempest/vars/tempest_skip_master.yml
@@ -1,3 +1,4 @@
+---
 ## PLEASE READ ##
 ## Do not add tests to the skip list that are in    ##
 ## featureset016 - featureset019 w/o permission from ##
diff --git a/roles/validate-tempest/vars/tempest_skip_mitaka.yml b/roles/validate-tempest/vars/tempest_skip_mitaka.yml
index e0c0da2ea..5ac8fce68 100644
--- a/roles/validate-tempest/vars/tempest_skip_mitaka.yml
+++ b/roles/validate-tempest/vars/tempest_skip_mitaka.yml
@@ -1,3 +1,4 @@
+---
 known_failures:
   - test: 'tempest.scenario.test_volume_boot_pattern'
     reason: 'rdo-manager tempest smoke test failing on "floating ip pool not found"'
diff --git a/roles/validate-tempest/vars/tempest_skip_newton.yml b/roles/validate-tempest/vars/tempest_skip_newton.yml
index 74d4cbbb8..05a999654 100644
--- a/roles/validate-tempest/vars/tempest_skip_newton.yml
+++ b/roles/validate-tempest/vars/tempest_skip_newton.yml
@@ -1,3 +1,4 @@
+---
 known_failures:
   - test: 'tempest.api.telemetry.test_telemetry_notification_api'
     reason: 'ospd-8 poodle 2016-02-04.1 tempest.api.telemetry.test_telemetry_notification_api failing'
diff --git a/roles/validate-tempest/vars/tempest_skip_ocata.yml b/roles/validate-tempest/vars/tempest_skip_ocata.yml
index 9868e62f3..b2c020774 100644
--- a/roles/validate-tempest/vars/tempest_skip_ocata.yml
+++ b/roles/validate-tempest/vars/tempest_skip_ocata.yml
@@ -1,3 +1,4 @@
+---
 ## PLEASE READ ##
 ## Do not add tests to the skip list that are in    ##
 ## featureset016 - featureset019 w/o permission from ##
@@ -39,7 +40,7 @@ known_failures:
   - test: 'tempest.api.identity.admin.v3.test_roles.RolesV3TestJSON.test_implied_roles_create_check_show_delete'
     reason: 'Difference in Implied Roles check API return code'
     lp: 'https://bugs.launchpad.net/keystone/+bug/1660603'
- # skip list for undercloud
+  # skip list for undercloud
   - test: 'tempest.api.network.test_networks.NetworksTest.test_external_network_visibility'
     reason: 'Running on undercloud'
     undercloud: true
diff --git a/roles/validate-tempest/vars/tempest_skip_pike.yml b/roles/validate-tempest/vars/tempest_skip_pike.yml
index 4c292fb7c..382448b4c 100644
--- a/roles/validate-tempest/vars/tempest_skip_pike.yml
+++ b/roles/validate-tempest/vars/tempest_skip_pike.yml
@@ -1,3 +1,4 @@
+---
 ## PLEASE READ ##
 ## Do not add tests to the skip list that are in    ##
 ## featureset016 - featureset019 w/o permission from ##
@@ -17,7 +18,7 @@ known_failures:
   - test: 'tempest.api.identity.admin.v3.test_roles.RolesV3TestJSON.test_implied_roles_create_check_show_delete'
     reason: 'Difference in Implied Roles check API return code'
     lp: 'https://bugs.launchpad.net/keystone/+bug/1660603'
- # skip list for undercloud
+  # skip list for undercloud
   - test: 'tempest.api.network.test_networks.NetworksTest.test_external_network_visibility'
     reason: 'Running on undercloud'
     undercloud: true
diff --git a/roles/validate-tempest/vars/tempest_skip_queens.yml b/roles/validate-tempest/vars/tempest_skip_queens.yml
index 307439a5e..a4f1f9adb 100644
--- a/roles/validate-tempest/vars/tempest_skip_queens.yml
+++ b/roles/validate-tempest/vars/tempest_skip_queens.yml
@@ -1,3 +1,4 @@
+---
 ## PLEASE READ ##
 ## Do not add tests to the skip list that are in    ##
 ## featureset016 - featureset019 w/o permission from ##
@@ -10,7 +11,7 @@ known_failures:
   - test: 'neutron_tempest_plugin.scenario'
     reason: 'Neutron Tempest plugin scenario tests are not yet stable.'
     lp: 'https://launchpad.net/bugs/1737940'
- # skip list for undercloud
+  # skip list for undercloud
   - test: 'tempest.api.network.test_networks.NetworksTest.test_external_network_visibility'
     reason: 'Running on undercloud'
     undercloud: true
diff --git a/roles/validate-tempest/vars/tempest_skip_rocky.yml b/roles/validate-tempest/vars/tempest_skip_rocky.yml
index 6de560f0e..048325644 100644
--- a/roles/validate-tempest/vars/tempest_skip_rocky.yml
+++ b/roles/validate-tempest/vars/tempest_skip_rocky.yml
@@ -1,3 +1,4 @@
+---
 ## PLEASE READ ##
 ## Do not add tests to the skip list that are in    ##
 ## featureset016 - featureset019 w/o permission from ##
diff --git a/roles/validate-undercloud/meta/main.yml b/roles/validate-undercloud/meta/main.yml
index e7e849c51..937d01d10 100644
--- a/roles/validate-undercloud/meta/main.yml
+++ b/roles/validate-undercloud/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
     - extras-common
diff --git a/roles/validate-undercloud/tasks/main.yml b/roles/validate-undercloud/tasks/main.yml
index c4a6d3df6..9502186f0 100644
--- a/roles/validate-undercloud/tasks/main.yml
+++ b/roles/validate-undercloud/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 - name: gather facts used by role
   setup:
     gather_subset: "!min,pkg_mgr"
diff --git a/roles/virthost-full-cleanup/tests/test.yml b/roles/virthost-full-cleanup/tests/test.yml
index 856a6de37..ef8e51328 100644
--- a/roles/virthost-full-cleanup/tests/test.yml
+++ b/roles/virthost-full-cleanup/tests/test.yml
@@ -2,4 +2,4 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - ansible-role-tripleo-cleanup-nfo
\ No newline at end of file
+    - ansible-role-tripleo-cleanup-nfo