Lint fixes for ci-scripts and config folders

This normalizes the formatting of files from ci-scripts and config
folders in order to allow further hardening of linting.

Fixing linting was too big to be made in a single commit as it would
involve too many files to review and could merge conflicts with
existing changes. Thus doing it in few chunks would makes it possible.

Original full change is at https://review.openstack.org/#/c/627545/ and
will be the one merging the last.

Change-Id: Ifb215c0e2ea0ef7115897721f75ba8489bd59b97

ci-scripts/basic.sh

@@ -40,4 +40,3 @@ bash quickstart.sh \
     -e virthost_user=$VIRTHOST_USER \
     --release ${CI_ENV:+$CI_ENV/}$RELEASE${REL_TYPE:+-$REL_TYPE} \
     $VIRTHOST
-

ci-scripts/cleanup-stack-image-ovb.sh

@@ -26,4 +26,3 @@ bash quickstart.sh \
 --playbook $PLAYBOOK \
 localhost
 popd
-

ci-scripts/collect-logs.sh

@@ -51,4 +51,3 @@ bash quickstart.sh \
     --extra-vars @$WORKSPACE/config/general_config/${LOG_ENV}-logs.yml \
     --extra-vars artcl_verify_sphinx_build=$VERIFY_SPHINX \
     localhost
-

ci-scripts/devmode_tempest.sh

@@ -28,4 +28,3 @@ bash quickstart.sh \
     $VIRTHOST
 
 popd
-

ci-scripts/feature-scale-deploy.sh

@@ -53,4 +53,3 @@ bash quickstart.sh \
     --release ${CI_ENV:+$CI_ENV/}$RELEASE${REL_TYPE:+-$REL_TYPE} \
     --playbook scale_nodes_verify.yml \
     $VIRTHOST
-

ci-scripts/full-deploy-baremetal.sh

@@ -35,4 +35,3 @@ bash quickstart.sh \
     --release ${CI_ENV:+$CI_ENV/}$RELEASE${REL_TYPE:+-$REL_TYPE} \
     $OPT_ADDITIONAL_PARAMETERS \
     $VIRTHOST
-

ci-scripts/full-deploy-internal.sh

@@ -173,4 +173,3 @@ else
         $VIRTHOST
 
 fi
-

ci-scripts/get-node.sh

@@ -32,4 +32,3 @@ export VIRTHOST=`cat provisioned.csv | tail -1 | cut -d "," -f 3| sed -e 's/"//g
 export VIRTHOST_KEY=`cat provisioned.csv | tail -1 | cut -d "," -f 7| sed -e 's/"//g'`
 echo $VIRTHOST > $WORKSPACE/virthost
 echo $VIRTHOST_KEY > $WORKSPACE/cico_key.txt
-

ci-scripts/images.sh

@@ -47,4 +47,3 @@ bash quickstart.sh \
     --no-clone \
     --release ${CI_ENV:+$CI_ENV/}$RELEASE \
     $VIRTHOST
-

ci-scripts/include-gate-changes.sh

@@ -4,9 +4,9 @@
 : ${OPT_ADDITIONAL_PARAMETERS:=""}
 
 # preparation steps to run with the gated changes
-if [ "$JOB_TYPE" = "gate" ] ||
-   [ "$JOB_TYPE" = "dlrn-gate-check" ] ||
-   [ "$JOB_TYPE" = "standalone" ]; then
+if [ "$JOB_TYPE" = "gate" ] || \
+    [ "$JOB_TYPE" = "dlrn-gate-check" ] || \
+    [ "$JOB_TYPE" = "standalone" ]; then
 
     pushd $WORKSPACE/tripleo-quickstart
     sed -i.bak '/extras/d' $WORKSPACE/tripleo-quickstart/quickstart-extras-requirements.txt

ci-scripts/ooo-usbkey.sh

@@ -73,4 +73,3 @@ $scpcmd stack@$VIRTHOST:~/.quickstart/ssh.config* $WORKSPACE/
 $scpcmd stack@$VIRTHOST:~/.quickstart/hosts* $WORKSPACE/
 $scpcmd stack@$VIRTHOST:~/.quickstart/id_* $WORKSPACE/
 sed -i 's,\/home\/stack\/\.quickstart,'"$WORKSPACE"',g' $WORKSPACE/ssh.config.ansible
-

ci-scripts/ovb-image-upload.sh

@@ -28,4 +28,3 @@ bash quickstart.sh \
 --playbook $PLAYBOOK \
 localhost
 popd
-

ci-scripts/pre-commit-hook

@@ -37,4 +37,3 @@ if [ $? -ne 0 ]; then
 fi
 
 exit 0
-

ci-scripts/pre-commit.d/validate-yaml-in-commit

@@ -16,4 +16,3 @@ git diff --cached --name-only --diff-filter=ACM | grep '.yml' | (
 cd $tmpdir
 xargs --no-run-if-empty $SCRIPTS/validate-yaml
 )
-

ci-scripts/provision_centos_settings.yml

@@ -1,16 +1,17 @@
+---
 node:
   prefix:
-  - mf03f
-  - rhos-ci
-  - '37'
-  - rdo
-  - rmgr
+    - mf03f
+    - rhos-ci
+    - '37'
+    - rdo
+    - rmgr
 tmp:
   node_prefix: '{{ node.prefix | reject("none") | join("-") }}-'
   hostname_prefix: '{{ hostname.prefix | reject("none") | join("-") }}-'
   anchors:
-  - https://repos.fedorapeople.org/repos/openstack/openstack-rocky/rdo-release-rocky.rpm
-  - https://trunk.rdoproject.org/centos7-rocky/
+    - https://repos.fedorapeople.org/repos/openstack/openstack-rocky/rdo-release-rocky.rpm
+    - https://trunk.rdoproject.org/centos7-rocky/
 product:
   rpmrepo:
     CentOS: https://repos.fedorapeople.org/repos/openstack/openstack-rocky/rdo-release-rocky.rpm
@@ -59,41 +60,41 @@ workaround:
   set_key_encrypted_volumes: true
 hostname:
   prefix:
-  - nh1nv
-  - rmgr
+    - nh1nv
+    - rmgr
 instack_user_home: /home/stack
 job:
   archive:
-  - /var/log/
-  - /etc/yum.repos.d
-  - /etc/selinux
-  - /root/
-  - /var/lib/mysql
-  - /etc/nova
-  - /etc/ceilometer
-  - /etc/cinder
-  - /etc/glance
-  - /etc/keystone
-  - /etc/neutron
-  - /etc/swift
-  - /etc/heat
-  - /etc/libvirt
-  - /etc/rabbitmq
-  - /etc/ntp
-  - /etc/puppet
-  - /etc/qpid
-  - /etc/qpidd.conf
-  - /home/stack/.instack/install-undercloud.log
-  - /home/stack/stackrc
-  - /home/stack/*.log
-  - /home/stack/*.json
-  - /home/stack/*.conf
-  - /home/stack/deploy-overcloudrc
-  - /home/stack/network-environment.yaml
-  - /home/stack/tempest/*.xml
-  - /home/stack/tempest/*.log
-  - /home/stack/tempest/etc/*.conf
-  - /usr/share/openstack-tripleo-heat-templates
+    - /var/log/
+    - /etc/yum.repos.d
+    - /etc/selinux
+    - /root/
+    - /var/lib/mysql
+    - /etc/nova
+    - /etc/ceilometer
+    - /etc/cinder
+    - /etc/glance
+    - /etc/keystone
+    - /etc/neutron
+    - /etc/swift
+    - /etc/heat
+    - /etc/libvirt
+    - /etc/rabbitmq
+    - /etc/ntp
+    - /etc/puppet
+    - /etc/qpid
+    - /etc/qpidd.conf
+    - /home/stack/.instack/install-undercloud.log
+    - /home/stack/stackrc
+    - /home/stack/*.log
+    - /home/stack/*.json
+    - /home/stack/*.conf
+    - /home/stack/deploy-overcloudrc
+    - /home/stack/network-environment.yaml
+    - /home/stack/tempest/*.xml
+    - /home/stack/tempest/*.log
+    - /home/stack/tempest/etc/*.conf
+    - /usr/share/openstack-tripleo-heat-templates
   gzip_logs: true
   artifact_url: https://ci.centos.org/artifacts/rdo
   rsync_path: rdo@artifacts.ci.centos.org::rdo
@@ -117,8 +118,8 @@ provisioner:
       remote_user: stack
       name: host0
       groups:
-      - provisioned
-      - virthost
+        - provisioned
+        - virthost
   arch: x86_64
   key_file: /home/rhos-ci/rdo-ci-public.pem
   distro:
@@ -147,19 +148,19 @@ installer:
     command: --templates
   firewall:
     rules:
-    - ' -A INPUT -m state --state ESTABLISHED,RELATED -m comment --comment "001 QA
-      incoming related session exist the host interface MGMT" -j ACCEPT'
-    - ' -A INPUT -p tcp -m tcp --dport 22 -m comment --comment "002 QA incoming SSH"
-      -j ACCEPT'
-    - ' -A INPUT -p icmp -m comment --comment "003 QA incoming ICMP" -j ACCEPT'
-    - ' -A INPUT -i lo -m comment --comment "004 QA incoming loopback" -j ACCEPT'
-    - ' -A INPUT -p udp --sport 53 -m comment --comment "005 QA incoming DNS" -j ACCEPT'
-    - ' -A INPUT -p udp --sport 123 -m comment --comment "006 QA incoming NTP" -j
-      ACCEPT'
-    - ' -P INPUT DROP'
+      - ' -A INPUT -m state --state ESTABLISHED,RELATED -m comment --comment "001 QA
+        incoming related session exist the host interface MGMT" -j ACCEPT'
+      - ' -A INPUT -p tcp -m tcp --dport 22 -m comment --comment "002 QA incoming SSH"
+        -j ACCEPT'
+      - ' -A INPUT -p icmp -m comment --comment "003 QA incoming ICMP" -j ACCEPT'
+      - ' -A INPUT -i lo -m comment --comment "004 QA incoming loopback" -j ACCEPT'
+      - ' -A INPUT -p udp --sport 53 -m comment --comment "005 QA incoming DNS" -j ACCEPT'
+      - ' -A INPUT -p udp --sport 123 -m comment --comment "006 QA incoming NTP" -j
+        ACCEPT'
+      - ' -P INPUT DROP'
   network_restart: true
   post_action:
-  - none
+    - none
   tempest:
     skip_file: rdoci-rdo-liberty-rdo-manager
     test_white_regex: .*smoke
@@ -176,11 +177,11 @@ installer:
   images:
     7-director:
       files:
-      - no_op
+        - no_op
     version: last_known_good
     8-director:
       files:
-      - no_op
+        - no_op
   dib_dir: /home/stack/DIB
   updates:
     enabled: false
@@ -285,4 +286,3 @@ hw_env:
   network_cidr: 192.168.0.0/24
   ExternalNetworkVlanID: null
   network_type: flat
-

ci-scripts/releasenotes_tox.sh

@@ -25,4 +25,3 @@ EOF
 fi
 
 exit ${BUILD_RESULT}
-

ci-scripts/return-node.sh

@@ -6,4 +6,3 @@ set -eux
 VIRTHOST_KEY=$(head -n1 $WORKSPACE/cico_key.txt)
 $WORKSPACE/bin/cico node done $VIRTHOST_KEY
 $WORKSPACE/bin/cico inventory
-

ci-scripts/upgrade-baremetal.sh

@@ -40,4 +40,3 @@ bash quickstart.sh \
     --extra-vars nic_configs_dir=$WORKSPACE/$HW_ENV_DIR/network_configs/$NETWORK_ISOLATION/nic_configs/ \
     --release ${CI_ENV:+$CI_ENV/}$RELEASE${REL_TYPE:+-$REL_TYPE} \
     $VIRTHOST
-

ci-scripts/upgrade.sh

@@ -44,4 +44,3 @@ bash quickstart.sh \
     --playbook upgrade.yml \
     --release ${CI_ENV:+$CI_ENV/}$RELEASE${REL_TYPE:+-$REL_TYPE} \
     $VIRTHOST
-

ci-scripts/usbkey/RUN_ME.sh

@@ -77,4 +77,3 @@ EOF
 
 
 popd
-

ci-scripts/usbkey/quickstart-usb.yml

@@ -1,3 +1,4 @@
+---
 # This is the playbook used by the `quickstart.sh` script.
 
 # The [provision.yml](provision.yml.html) playbook is responsible for
@@ -18,30 +19,29 @@
 
 # The `libvirt/setup` role creates the undercloud and overcloud
 # virtual machines.
-- name:  Setup undercloud and overcloud vms
+- name: Setup undercloud and overcloud vms
   hosts: virthost
-  gather_facts: yes
+  gather_facts: true
   roles:
     - libvirt/teardown
     - libvirt/setup
 
 # Add the undercloud node to the generated
 # inventory.
-- name:  Inventory the undercloud
+- name: Inventory the undercloud
   hosts: localhost
-  gather_facts: yes
+  gather_facts: true
   vars:
-      inventory: undercloud
+    inventory: undercloud
   roles:
     - tripleo-inventory
 
 # DEPLOY ALL THE THINGS!  Depending on the currently selected set of
 # tags, this will deploy the undercloud, deploy the overcloud, and
 # perform some validation tests on the overcloud.
-- name:  Install undercloud and deploy overcloud
+- name: Install undercloud and deploy overcloud
   hosts: undercloud
-  gather_facts: no
+  gather_facts: false
   roles:
     - tripleo/undercloud
     - tripleo/overcloud
-

ci-scripts/usbkey/quickstart.sh

@@ -366,4 +366,3 @@ Virtual Environment Setup Complete
 ##################################
 EOF
 fi
-

ci-scripts/validate-yaml

@@ -54,8 +54,7 @@ def validate_directory(path):
 
     for dirpath, dirnames, filenames in os.walk(path):
         for filename in filenames:
-            if not (filename.endswith('.yml') or
-                    filename.endswith('.yaml')):
+            if not (filename.endswith('.yml') or filename.endswith('.yaml')):
                 continue
 
             filename = os.path.join(dirpath, filename)

config/environments/baseos_centos_libvirt.yml

@@ -34,4 +34,3 @@ hostname_correction: true
 # standalone interface
 standalone_interface: eth1
 standalone_ip: 192.168.24.2
-

config/environments/dev_privileged_libvirt.yml

@@ -4,7 +4,7 @@
 non_root_chown: true
 non_root_user: stack
 undercloud_user: stack
-working_dir: "/home/{{non_root_user}}"
+working_dir: "/home/{{ non_root_user }}"
 ssh_user: root
 libvirt_uri: qemu:///system
 

config/general_config/deprecated/composable_upgrade.yml

@@ -20,7 +20,7 @@ network_isolation: 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

config/general_config/deprecated/composable_upgrade_ovb.yml

@@ -13,7 +13,7 @@ extra_args: " --control-flavor baremetal --compute-flavor baremetal \
 
 # 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

config/general_config/deprecated/ipv6.yml

@@ -69,7 +69,7 @@ network_environment_args:
   StorageMgmtAllocationPools: [{"start": "fd00:fd00:fd00:4000::10", "end": "fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe"}]
   TenantNetCidr: 172.16.0.0/24
   TenantAllocationPools: [{"start": "172.16.0.10", "end": "172.16.0.250"}]
-  DnsServers: [ '{{ external_network_cidr6|nthhost(1) }}' ]
+  DnsServers: ['{{ external_network_cidr6|nthhost(1) }}']
 
 networks:
   - name: external
@@ -101,4 +101,3 @@ networks:
 
   - name: overcloud6
     bridge: brovc6
-

config/general_config/deprecated/minimal_pacemaker.yml

@@ -57,4 +57,3 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-

config/general_config/deprecated/no_netiso.yml

@@ -6,5 +6,4 @@ network_isolation: false
 
 # 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

config/general_config/featureset-multinode-common.yml

@@ -9,4 +9,3 @@ hypervisor_wait: false
 network_isolation: false
 package_installs: true
 non_root_user_setup: true
-

config/general_config/featureset002.yml

@@ -158,5 +158,3 @@ tempest_format: >-
   {%- else -%}
   packages
   {%- endif -%}
-
-

config/general_config/featureset004.yml

@@ -4,12 +4,12 @@ test_ping: true
 deployed_server: true
 
 # This enables the run of several tripleo-validations tests through Mistral
-run_tripleo_validations: True
+run_tripleo_validations: true
 # This enables the run of tripleo-validations negative tests through shell
 # scripts
-run_tripleo_validations_negative_tests: True
+run_tripleo_validations_negative_tests: true
 # Exit tripleo-quickstart on validations failure
-exit_on_validations_failure: False
+exit_on_validations_failure: false
 
 composable_scenario: multinode.yaml
 composable_services: false

config/general_config/featureset005.yml

@@ -2,12 +2,12 @@ undercloud_generate_service_certificate: false
 enable_opstools_repo: true
 
 # This enables the run of several tripleo-validations tests through Mistral
-run_tripleo_validations: True
+run_tripleo_validations: true
 # This enables the run of tripleo-validations negative tests through shell
 # scripts
-run_tripleo_validations_negative_tests: True
+run_tripleo_validations_negative_tests: true
 # Exit tripleo-quickstart on validations failure
-exit_on_validations_failure: False
+exit_on_validations_failure: false
 
 deployed_server: true
 composable_scenario: scenario001-multinode.yaml

config/general_config/featureset006.yml

@@ -1,12 +1,12 @@
 undercloud_generate_service_certificate: false
 
 # This enables the run of several tripleo-validations tests through Mistral
-run_tripleo_validations: True
+run_tripleo_validations: true
 # This enables the run of tripleo-validations negative tests through shell
 # scripts
-run_tripleo_validations_negative_tests: True
+run_tripleo_validations_negative_tests: true
 # Exit tripleo-quickstart on validations failure
-exit_on_validations_failure: False
+exit_on_validations_failure: false
 
 # pacemaker settings are configured in the scenario template
 # do not set `enable_pacemaker` in the featureset

config/general_config/featureset007.yml

@@ -1,12 +1,12 @@
 undercloud_generate_service_certificate: false
 
 # This enables the run of several tripleo-validations tests through Mistral
-run_tripleo_validations: True
+run_tripleo_validations: true
 # This enables the run of tripleo-validations negative tests through shell
 # scripts
-run_tripleo_validations_negative_tests: True
+run_tripleo_validations_negative_tests: true
 # Exit tripleo-quickstart on validations failure
-exit_on_validations_failure: False
+exit_on_validations_failure: false
 
 # pacemaker settings are configured in the scenario template
 # do not set `enable_pacemaker` in the featureset

config/general_config/featureset008.yml

@@ -1,12 +1,12 @@
 undercloud_generate_service_certificate: false
 
 # This enables the run of several tripleo-validations tests through Mistral
-run_tripleo_validations: True
+run_tripleo_validations: true
 # This enables the run of tripleo-validations negative tests through shell
 # scripts
-run_tripleo_validations_negative_tests: True
+run_tripleo_validations_negative_tests: true
 # Exit tripleo-quickstart on validations failure
-exit_on_validations_failure: False
+exit_on_validations_failure: false
 
 # pacemaker settings are configured in the scenario template
 # do not set `enable_pacemaker` in the featureset
@@ -68,7 +68,7 @@ tempest_whitelist: >-
   {%- else -%}{{ tempest_whitelist_old }}
   {%- endif -%}
 
-manila_max_api_version: { 'newton': '2.22', 'ocata': '2.32', 'pike': '2.40', 'queens': '2.42' }
+manila_max_api_version: {'newton': '2.22', 'ocata': '2.32', 'pike': '2.40', 'queens': '2.42'}
 
 tempest_extra_config: >
   {

config/general_config/featureset010.yml

@@ -28,12 +28,12 @@ undercloud_generate_service_certificate: false
 ssl_overcloud: false
 
 # This enables the run of several tripleo-validations tests through Mistral
-run_tripleo_validations: True
+run_tripleo_validations: true
 # This enables the run of tripleo-validations negative tests through shell
 # scripts
-run_tripleo_validations_negative_tests: True
+run_tripleo_validations_negative_tests: true
 # Exit tripleo-quickstart on validations failure
-exit_on_validations_failure: False
+exit_on_validations_failure: false
 
 composable_roles: true
 overcloud_roles:

config/general_config/featureset016.yml

@@ -163,5 +163,3 @@ tempest_extra_config: {'telemetry.alarm_granularity': '60'}
 # This is a workaround to have test_volume_boot_pattern passing, it's failing
 # due a concurrency, for more information, check lp #1742936
 tempest_workers: 1
-
-

config/general_config/featureset017.yml

@@ -174,5 +174,3 @@ tempest_extra_config: >-
 # This is a workaround to have test_volume_boot_pattern passing, it's failing
 # due a concurrency, for more information, check lp 1744151
 tempest_workers: 1
-
-

config/general_config/featureset018.yml

@@ -150,5 +150,3 @@ tempest_plugins: >-
   {% if release not in ['newton', 'ocata', 'pike'] -%}{{ tempest_plugins_new }}
   {%- else -%}{{ tempest_plugins_old }}
   {%- endif -%}
-
-

config/general_config/featureset019.yml

@@ -144,7 +144,7 @@ tempest_whitelist: >-
   {%- else -%}{{ tempest_whitelist_old }}
   {%- endif -%}
 
-manila_max_api_version: { 'newton': '2.22', 'ocata': '2.32', 'pike': '2.40', 'queens': '2.42' }
+manila_max_api_version: {'newton': '2.22', 'ocata': '2.32', 'pike': '2.40', 'queens': '2.42'}
 
 tempest_extra_config: >
   {

config/general_config/featureset020.yml

@@ -114,5 +114,3 @@ tempest_format: >-
   {%- else -%}
   packages
   {%- endif -%}
-
-

config/general_config/featureset024.yml

@@ -9,7 +9,7 @@ overcloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 step_introspect: true
 
 # Tell tripleo about our environment.
-#network_environment_file: ovb-multiple-nics-v6.yaml
+# network_environment_file: ovb-multiple-nics-v6.yaml
 overcloud_ipv6: true
 enable_pacemaker: true
 network_isolation: true
@@ -61,4 +61,3 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-

config/general_config/featureset025.yml

@@ -54,4 +54,3 @@ artcl_create_docs_payload:
     - overcloud-deploy
     - overcloud-deploy-post
     - overcloud-validate
-

config/general_config/featureset030.yml

@@ -87,5 +87,3 @@ run_tempest: true
 test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
-
-

config/general_config/featureset033.yml

@@ -17,9 +17,9 @@ ssl_overcloud: false
 
 # Centos Virt-SIG repo for atomic package
 add_repos:
-    # NOTE(trown) The atomic package from centos-extras does not work for
-    # us but its version is higher than the one from the virt-sig. Hence,
-    # using priorities to ensure we get the virt-sig package.
+  # NOTE(trown) The atomic package from centos-extras does not work for
+  # us but its version is higher than the one from the virt-sig. Hence,
+  # using priorities to ensure we get the virt-sig package.
   - type: package
     pkg_name: yum-plugin-priorities
   - type: generic
@@ -108,4 +108,3 @@ tempest_format: >-
 tempest_config: false
 test_ping: false
 run_tempest: false
-

config/general_config/featureset036.yml

@@ -16,7 +16,7 @@ run_tripleo_validations: false
 # scripts
 run_tripleo_validations_negative_tests: false
 # Exit tripleo-quickstart on validations failure
-exit_on_validations_failure: False
+exit_on_validations_failure: false
 
 deployed_server: true
 composable_scenario: scenario002-multinode.yaml
@@ -67,7 +67,7 @@ overcloud_ssh_user: "tripleo-admin"
 
 # Workaround for deploying newton from queen.
 overcloud_prep_post_hook_script: |
-  cat > {{overcloud_templates_path}}/plan-environment.yaml<<EOF
+  cat > {{ overcloud_templates_path }}/plan-environment.yaml<<EOF
   version: 1.0
 
   name: overcloud

config/general_config/featureset037.yml

@@ -91,4 +91,3 @@ ctlplane_masquerade: >-
   {%- else -%}
   false
   {%- endif -%}
-

config/general_config/featureset039.yml

@@ -4,7 +4,7 @@
 # TLS everywhere related vars. #
 # 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
 enable_tls_everywhere: true
 novajoin_connect_timeout: 60
 novajoin_read_timeout: 60

config/general_config/featureset051.yml

@@ -100,7 +100,6 @@ overcloud_roles:
       - Tenant
 
 
-
 deploy_steps_ansible_workflow: true
 config_download_args: >-
   {% if release in ['queens'] -%}

config/general_config/ipa.yml

@@ -3,7 +3,7 @@
 # TLS everywhere related vars. #
 # 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
 enable_tls_everywhere: true
 novajoin_connect_timeout: 60
 novajoin_read_timeout: 60
@@ -35,7 +35,7 @@ overcloud_cloud_name_ctlplane: "overcloud.ctlplane.{{ tripleo_domain }}"
 
 # Define FreeIPA server as DNS server for under/overcloud.
 custom_nameserver:
-- "{{ freeipa_internal_ip }}"
+  - "{{ freeipa_internal_ip }}"
 undercloud_undercloud_nameservers: ["{{ freeipa_internal_ip }}"]
 overcloud_dns_servers: ["{{ freeipa_internal_ip }}"]
 

config/nodes/1ctlr.yml

@@ -13,4 +13,3 @@ deployed_server_overcloud_roles:
 
 topology: >-
   --compute-scale 0
-

config/nodes/1ctlr_1comp_64gb.yml

@@ -1,4 +1,3 @@
-
 # This will require (2*16) ==  32 GB for the overcloud nodes,
 # plus another 18GB for the undercloud, total  50 gb
 control_memory: 16384

config/nodes/2ctlr.yml

@@ -19,4 +19,3 @@ deployed_server_overcloud_roles:
 
 topology: >-
   --compute-scale 0
-

config/nodes/3ctlr_1comp.yml

@@ -40,4 +40,3 @@ overcloud_nodes:
 topology: >-
   --compute-scale 1
   --control-scale 3
-

config/nodes/3ctlr_1comp_192gb.yml

@@ -14,7 +14,7 @@ default_vcpu: 6
 
 # 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
 
 node_count: 4
 

config/nodes/3ctlr_1comp_64gb.yml

@@ -15,7 +15,7 @@ default_vcpu: 2
 
 # 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
 
 node_count: 4
 

config/nodes/3ctlr_3comp.yml

@@ -50,4 +50,3 @@ network_isolation_type: 'single-nic-vlans'
 topology: >-
   --compute-scale 3
   --control-scale 3
-

config/release/centosci/master-consistent.yml

@@ -2,4 +2,3 @@ release: master
 undercloud_image_url: http://artifacts.ci.centos.org/artifacts/rdo/images/master/delorean/consistent/testing/undercloud.qcow2
 overcloud_image_url: http://artifacts.ci.centos.org/artifacts/rdo/images/master/delorean/consistent/testing/overcloud-full.tar
 ipa_image_url: http://artifacts.ci.centos.org/artifacts/rdo/images/master/delorean/consistent/testing/ironic-python-agent.tar
-

config/release/centosci/master-current-tripleo.yml

@@ -7,18 +7,18 @@ ipa_image_url: https://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_has
 overcloud_as_undercloud: true
 update_images: true
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 
 repos:
   - type: generic

config/release/centosci/newton-cloudsig-stable.yml

@@ -2,4 +2,3 @@ release: newton
 undercloud_image_url: http://artifacts.ci.centos.org/artifacts/rdo/images/newton/cbs/cloudsig-stable/testing/undercloud.qcow2
 overcloud_image_url: http://artifacts.ci.centos.org/artifacts/rdo/images/newton/cbs/cloudsig-stable/testing/overcloud-full.tar
 ipa_image_url: http://artifacts.ci.centos.org/artifacts/rdo/images/newton/cbs/cloudsig-stable/testing/ironic-python-agent.tar
-

config/release/centosci/newton-cloudsig-testing.yml

@@ -2,4 +2,3 @@ release: newton
 undercloud_image_url: http://artifacts.ci.centos.org/artifacts/rdo/images/newton/cbs/cloudsig-testing/testing/undercloud.qcow2
 overcloud_image_url: http://artifacts.ci.centos.org/artifacts/rdo/images/newton/cbs/cloudsig-testing/testing/overcloud-full.tar
 ipa_image_url: http://artifacts.ci.centos.org/artifacts/rdo/images/newton/cbs/cloudsig-testing/testing/ironic-python-agent.tar
-

config/release/centosci/newton-consistent.yml

@@ -2,4 +2,3 @@ release: newton
 undercloud_image_url: http://artifacts.ci.centos.org/artifacts/rdo/images/newton/delorean/consistent/testing/undercloud.qcow2
 overcloud_image_url: http://artifacts.ci.centos.org/artifacts/rdo/images/newton/delorean/consistent/testing/overcloud-full.tar
 ipa_image_url: http://artifacts.ci.centos.org/artifacts/rdo/images/newton/delorean/consistent/testing/ironic-python-agent.tar
-

config/release/centosci/newton.yml

@@ -23,4 +23,3 @@ repo_cmd_after: |
   sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0
   sudo yum repolist;
   sudo yum update -y
-

config/release/centosci/ocata-cloudsig-stable.yml

@@ -17,4 +17,3 @@ overcloud_repo_paths:
   - "$(ls /etc/yum.repos.d/CentOS-OpenStack-ocata*)"
   - "$(ls /etc/yum.repos.d/CentOS-QEMU*)"
   - "$(ls /etc/yum.repos.d/CentOS-Ceph-*)"
-

config/release/centosci/ocata-cloudsig-testing.yml

@@ -19,4 +19,3 @@ repo_cmd_after: |
 overcloud_repo_paths:
   - "$(ls /etc/yum.repos.d/rdo*)"
   - "$(ls /etc/yum.repos.d/CentOS-Ceph-*)"
-

config/release/centosci/ocata-current-tripleo.yml

@@ -6,18 +6,18 @@ ipa_image_url: https://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_has
 overcloud_as_undercloud: true
 update_images: true
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 
 repos:
   - type: generic

config/release/centosci/pike-cloudsig-stable.yml

@@ -17,4 +17,3 @@ overcloud_repo_paths:
   - "$(ls /etc/yum.repos.d/CentOS-OpenStack-pike*)"
   - "$(ls /etc/yum.repos.d/CentOS-QEMU*)"
   - "$(ls /etc/yum.repos.d/CentOS-Ceph-*)"
-

config/release/centosci/pike-cloudsig-testing.yml

@@ -19,4 +19,3 @@ repo_cmd_after: |
 overcloud_repo_paths:
   - "$(ls /etc/yum.repos.d/rdo*)"
   - "$(ls /etc/yum.repos.d/CentOS-Ceph-*)"
-

config/release/centosci/pike-current-tripleo.yml

@@ -7,18 +7,18 @@ ipa_image_url: https://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_has
 overcloud_as_undercloud: true
 update_images: true
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 
 repos:
   - type: generic

config/release/centosci/queens-current-tripleo.yml

@@ -7,18 +7,18 @@ ipa_image_url: https://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_has
 overcloud_as_undercloud: true
 update_images: true
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 
 repos:
   - type: generic

config/release/centosci/rocky-current-tripleo.yml

@@ -7,18 +7,18 @@ ipa_image_url: https://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_has
 overcloud_as_undercloud: true
 update_images: true
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 
 repos:
   - type: generic

config/release/rhos-11-rhn-baseos-undercloud.yml.example

@@ -37,4 +37,3 @@ rhsm_repos:
   - name: rhel-{{ rhel_version_number }}-server-openstack-{{ osp_release_version_number }}-rpms
   - name: rhel-{{ rhel_version_number }}-server-rhceph-{{ rhceph_version_number }}-osd-rpms
   - name: rhel-{{ rhel_version_number }}-server-rhceph-{{ rhceph_version_number }}-mon-rpms
-

config/release/rocky.yml

@@ -7,18 +7,18 @@ ipa_image_url: https://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_has
 overcloud_as_undercloud: true
 update_images: true
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 
 repos:
   - type: generic

config/release/stable/newton.yml

@@ -11,4 +11,3 @@ repo_cmd_after: |
   sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0
   sudo yum repolist;
   sudo yum update -y
-

config/release/stable/ocata.yml

@@ -11,4 +11,3 @@ repo_cmd_after: |
   sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0
   sudo yum repolist;
   sudo yum update -y
-

config/release/stable/pike.yml

@@ -11,4 +11,3 @@ repo_cmd_after: |
   sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0
   sudo yum repolist;
   sudo yum update -y
-

config/release/tripleo-ci/CentOS-7/consistent-master.yml

@@ -7,18 +7,18 @@ delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag)
 docker_image_tag: *promotion-testing-tag
 
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: master
 dlrn_hash_tag: consistent
 overcloud_image_url: https://images.rdoproject.org/master/rdo_trunk/current-tripleo/overcloud-full.tar

config/release/tripleo-ci/CentOS-7/consistent-newton.yml

@@ -9,18 +9,18 @@ docker_image_tag: *promotion-testing-tag
 
 
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: newton
 dlrn_hash_tag: consistent
 overcloud_image_url: https://images.rdoproject.org/newton/rdo_trunk/current-tripleo/overcloud-full.tar
@@ -104,4 +104,3 @@ repo_cmd_after: |
   {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
   {% endif %}
-

config/release/tripleo-ci/CentOS-7/consistent-ocata.yml

@@ -9,18 +9,18 @@ docker_image_tag: *promotion-testing-tag
 
 
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: ocata
 dlrn_hash_tag: consistent
 overcloud_image_url: https://images.rdoproject.org/ocata/rdo_trunk/current-tripleo/overcloud-full.tar
@@ -103,4 +103,3 @@ repo_cmd_after: |
   sudo yum repolist;
   sudo yum clean metadata
   sudo yum update -y
-

config/release/tripleo-ci/CentOS-7/consistent-pike.yml

@@ -9,18 +9,18 @@ docker_ceph_tag: v3.0.3-stable-3.0-jewel-centos-7-x86_64
 
 
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: pike
 dlrn_hash_tag: consistent
 overcloud_image_url: https://images.rdoproject.org/pike/rdo_trunk/current-tripleo/overcloud-full.tar

config/release/tripleo-ci/CentOS-7/consistent-queens.yml

@@ -7,18 +7,18 @@ delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag)
 docker_image_tag: *promotion-testing-tag
 
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: queens
 dlrn_hash_tag: consistent
 overcloud_image_url: https://images.rdoproject.org/queens/rdo_trunk/current-tripleo/overcloud-full.tar

config/release/tripleo-ci/CentOS-7/consistent-rocky.yml

@@ -7,18 +7,18 @@ delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag)
 docker_image_tag: *promotion-testing-tag
 
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: rocky
 dlrn_hash_tag: consistent
 overcloud_image_url: https://images.rdoproject.org/rocky/rdo_trunk/current-tripleo/overcloud-full.tar

config/release/tripleo-ci/CentOS-7/master-undercloud-queens-overcloud.yml

@@ -1,6 +1,6 @@
 release: master
-#TODO Figure out if we can remove target_upgrade_version to replace by
-#     release so we avoid duplication.
+# TODO Figure out if we can remove target_upgrade_version to replace by
+#      release so we avoid duplication.
 target_upgrade_version: master
 overcloud_release: queens
 dlrn_hash_tag: current-tripleo
@@ -19,23 +19,23 @@ undercloud_image_url: https://images.rdoproject.org/master/delorean/{{ dlrn_hash
 ipa_image_url: https://images.rdoproject.org/master/delorean/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
 overcloud_image_url: https://images.rdoproject.org/queens/delorean/{{ overcloud_dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
 images:
-    - name: undercloud
-      url: "{{ undercloud_image_url }}"
-      type: qcow2
-    - name: overcloud-full
-      url: "{{ overcloud_image_url }}"
-      type: tar
-    - name: ipa_images
-      url: "{{ ipa_image_url }}"
-      type: tar
+  - name: undercloud
+    url: "{{ undercloud_image_url }}"
+    type: qcow2
+  - name: overcloud-full
+    url: "{{ overcloud_image_url }}"
+    type: tar
+  - name: ipa_images
+    url: "{{ ipa_image_url }}"
+    type: tar
 
 use_external_images: true
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 
 repo_cmd_before: |
   sudo rm -rf /etc/yum.repos.d/delorean*;

config/release/tripleo-ci/CentOS-7/master-undercloud-rocky-overcloud.yml

@@ -1,6 +1,6 @@
 release: master
-#TODO Figure out if we can remove target_upgrade_version to replace by
-#     release so we avoid duplication.
+# TODO Figure out if we can remove target_upgrade_version to replace by
+#      release so we avoid duplication.
 target_upgrade_version: master
 overcloud_release: rocky
 dlrn_hash_tag: current-tripleo
@@ -19,23 +19,23 @@ undercloud_image_url: https://images.rdoproject.org/master/delorean/{{ dlrn_hash
 ipa_image_url: https://images.rdoproject.org/master/delorean/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
 overcloud_image_url: https://images.rdoproject.org/rocky/delorean/{{ overcloud_dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
 images:
-    - name: undercloud
-      url: "{{ undercloud_image_url }}"
-      type: qcow2
-    - name: overcloud-full
-      url: "{{ overcloud_image_url }}"
-      type: tar
-    - name: ipa_images
-      url: "{{ ipa_image_url }}"
-      type: tar
+  - name: undercloud
+    url: "{{ undercloud_image_url }}"
+    type: qcow2
+  - name: overcloud-full
+    url: "{{ overcloud_image_url }}"
+    type: tar
+  - name: ipa_images
+    url: "{{ ipa_image_url }}"
+    type: tar
 
 use_external_images: true
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 
 repo_cmd_before: |
   sudo rm -rf /etc/yum.repos.d/delorean*;

config/release/tripleo-ci/CentOS-7/master.yml

@@ -1,18 +1,18 @@
 devmode: true
 overcloud_as_undercloud: true
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: master
 dlrn_hash_tag: current-tripleo
 dlrn_hash_tag_newest: current

config/release/tripleo-ci/CentOS-7/newton.yml

@@ -1,18 +1,18 @@
 devmode: true
 overcloud_as_undercloud: true
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: newton
 dlrn_hash_tag: current-passed-ci
 dlrn_hash_tag_newest: current
@@ -117,4 +117,3 @@ repo_cmd_after: |
   {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
   {% endif %}
-

config/release/tripleo-ci/CentOS-7/ocata.yml

@@ -1,18 +1,18 @@
 devmode: true
 overcloud_as_undercloud: true
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: ocata
 dlrn_hash_tag: current-tripleo
 dlrn_hash_tag_newest: current
@@ -122,4 +122,3 @@ repo_cmd_after: |
   {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
   {% endif %}
-

config/release/tripleo-ci/CentOS-7/pike-undercloud-ocata-overcloud.yml

@@ -1,6 +1,6 @@
 release: pike
-#TODO Figure out if we can remove target_upgrade_version to replace by
-#     release so we avoid duplication.
+# TODO Figure out if we can remove target_upgrade_version to replace by
+#      release so we avoid duplication.
 target_upgrade_version: pike
 overcloud_release: ocata
 dlrn_hash_tag: current-tripleo
@@ -18,23 +18,23 @@ undercloud_image_url: https://images.rdoproject.org/pike/delorean/{{ dlrn_hash|d
 ipa_image_url: https://images.rdoproject.org/pike/delorean/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
 overcloud_image_url: https://images.rdoproject.org/ocata/delorean/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/overcloud-full.tar
 images:
-    - name: undercloud
-      url: "{{ undercloud_image_url }}"
-      type: qcow2
-    - name: overcloud-full
-      url: "{{ overcloud_image_url }}"
-      type: tar
-    - name: ipa_images
-      url: "{{ ipa_image_url }}"
-      type: tar
+  - name: undercloud
+    url: "{{ undercloud_image_url }}"
+    type: qcow2
+  - name: overcloud-full
+    url: "{{ overcloud_image_url }}"
+    type: tar
+  - name: ipa_images
+    url: "{{ ipa_image_url }}"
+    type: tar
 
 use_external_images: true
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 
 repo_cmd_before: |
   sudo rm -rf /etc/yum.repos.d/delorean*;
@@ -138,4 +138,3 @@ repo_cmd_after: |
 undercloud_rpm_dependencies: >-
   python-tripleoclient
   ceph-ansible
-

config/release/tripleo-ci/CentOS-7/pike.yml

@@ -1,18 +1,18 @@
 devmode: true
 overcloud_as_undercloud: true
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: pike
 dlrn_hash_tag: current-tripleo
 dlrn_hash_tag_newest: current

config/release/tripleo-ci/CentOS-7/promotion-testing-hash-master.yml

@@ -7,18 +7,18 @@ delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag)
 docker_image_tag: *promotion-testing-tag
 
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: master
 dlrn_hash_tag: tripleo-ci-testing
 overcloud_image_url: https://images.rdoproject.org/master/rdo_trunk/current-tripleo/overcloud-full.tar

config/release/tripleo-ci/CentOS-7/promotion-testing-hash-newton.yml

@@ -9,18 +9,18 @@ docker_image_tag: *promotion-testing-tag
 
 
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: newton
 dlrn_hash_tag: tripleo-ci-testing
 overcloud_image_url: https://images.rdoproject.org/newton/rdo_trunk/current-tripleo/overcloud-full.tar
@@ -104,4 +104,3 @@ repo_cmd_after: |
   {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
   {% endif %}
-

config/release/tripleo-ci/CentOS-7/promotion-testing-hash-ocata.yml

@@ -9,18 +9,18 @@ docker_image_tag: *promotion-testing-tag
 
 
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: ocata
 dlrn_hash_tag: tripleo-ci-testing
 overcloud_image_url: https://images.rdoproject.org/ocata/rdo_trunk/current-tripleo/overcloud-full.tar
@@ -107,4 +107,3 @@ repo_cmd_after: |
   {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
   {% endif %}
-

config/release/tripleo-ci/CentOS-7/promotion-testing-hash-pike.yml

@@ -9,18 +9,18 @@ docker_ceph_tag: v3.0.3-stable-3.0-jewel-centos-7-x86_64
 
 
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: pike
 dlrn_hash_tag: tripleo-ci-testing
 overcloud_image_url: https://images.rdoproject.org/pike/rdo_trunk/current-tripleo/overcloud-full.tar

config/release/tripleo-ci/CentOS-7/promotion-testing-hash-queens.yml

@@ -7,18 +7,18 @@ delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag)
 docker_image_tag: *promotion-testing-tag
 
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: queens
 dlrn_hash_tag: tripleo-ci-testing
 overcloud_image_url: https://images.rdoproject.org/queens/rdo_trunk/current-tripleo/overcloud-full.tar

config/release/tripleo-ci/CentOS-7/promotion-testing-hash-rocky.yml

@@ -7,18 +7,18 @@ delorean_hash_label: &promotion-testing-tag "{{ dlrn_hash|default(dlrn_hash_tag)
 docker_image_tag: *promotion-testing-tag
 
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: rocky
 dlrn_hash_tag: tripleo-ci-testing
 overcloud_image_url: https://images.rdoproject.org/rocky/rdo_trunk/current-tripleo/overcloud-full.tar

config/release/tripleo-ci/CentOS-7/queens-undercloud-newton-overcloud.yml

@@ -4,7 +4,7 @@ target_upgrade_version: queens
 
 overcloud_templates_branch: newton-eol
 overcloud_templates_repo: https://git.openstack.org/openstack/tripleo-heat-templates
-overcloud_templates_path: "{{working_dir}}/tripleo-heat-templates"
+overcloud_templates_path: "{{ working_dir }}/tripleo-heat-templates"
 
 dlrn_hash_tag: current-passed-ci
 dlrn_hash_tag_newest: current
@@ -18,22 +18,22 @@ overcloud_image_url: https://images.rdoproject.org/newton/delorean/consistent/st
 use_external_images: true
 
 images:
-    - name: undercloud
-      url: "{{ undercloud_image_url }}"
-      type: qcow2
-    - name: overcloud-full
-      url: "{{ overcloud_image_url }}"
-      type: tar
-    - name: ipa_images
-      url: "{{ ipa_image_url }}"
-      type: tar
+  - name: undercloud
+    url: "{{ undercloud_image_url }}"
+    type: qcow2
+  - name: overcloud-full
+    url: "{{ overcloud_image_url }}"
+    type: tar
+  - name: ipa_images
+    url: "{{ ipa_image_url }}"
+    type: tar
 
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 
 repo_cmd_before: |
   sudo rm -rf /etc/yum.repos.d/delorean*;

config/release/tripleo-ci/CentOS-7/queens-undercloud-pike-overcloud.yml

@@ -1,12 +1,12 @@
 release: queens
-#TODO Figure out if we can remove target_upgrade_version to replace by
-#     release so we avoid duplication.
+# TODO Figure out if we can remove target_upgrade_version to replace by
+#      release so we avoid duplication.
 target_upgrade_version: queens
 overcloud_release: pike
 dlrn_hash_tag: current-tripleo
 dlrn_hash_tag_newest: current
 docker_registry_host: docker.io
-docker_registry_namespace: "tripleo{{release}}"
+docker_registry_namespace: "tripleo{{ release }}"
 docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
 overcloud_docker_registry_namespace: "tripleo{{ overcloud_release }}"
 overcloud_docker_image_tag: "{{ overcloud_dlrn_hash }}"
@@ -20,23 +20,23 @@ undercloud_image_url: https://images.rdoproject.org/queens/delorean/{{ dlrn_hash
 ipa_image_url: https://images.rdoproject.org/queens/delorean/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
 overcloud_image_url: https://images.rdoproject.org/pike/delorean/{{ overcloud_dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
 images:
-    - name: undercloud
-      url: "{{ undercloud_image_url }}"
-      type: qcow2
-    - name: overcloud-full
-      url: "{{ overcloud_image_url }}"
-      type: tar
-    - name: ipa_images
-      url: "{{ ipa_image_url }}"
-      type: tar
+  - name: undercloud
+    url: "{{ undercloud_image_url }}"
+    type: qcow2
+  - name: overcloud-full
+    url: "{{ overcloud_image_url }}"
+    type: tar
+  - name: ipa_images
+    url: "{{ ipa_image_url }}"
+    type: tar
 
 use_external_images: true
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 
 repo_cmd_before: |
   sudo rm -rf /etc/yum.repos.d/delorean*;

config/release/tripleo-ci/CentOS-7/queens.yml

@@ -1,18 +1,18 @@
 devmode: true
 overcloud_as_undercloud: true
 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
 inject_images:
-    - "ironic-python-agent.initramfs"
-    - "ironic-python-agent.kernel"
-    - "overcloud-full.qcow2"
-    - "overcloud-full.initrd"
-    - "overcloud-full.vmlinuz"
+  - "ironic-python-agent.initramfs"
+  - "ironic-python-agent.kernel"
+  - "overcloud-full.qcow2"
+  - "overcloud-full.initrd"
+  - "overcloud-full.vmlinuz"
 release: queens
 dlrn_hash_tag: current-tripleo
 dlrn_hash_tag_newest: current