From cc82349363cd963059a4f241a1d30ede69b3d744 Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Fri, 16 Nov 2018 12:42:51 +0000 Subject: [PATCH] Adapt code to newer code style (linters) Makes those files conformant with current linting rules and avoids linting errors when we need to toch them again. Previous doing "pre-commit run -a" uncovered these errors, now is no longer reporting any other errors. Change-Id: Ie4cf229c8f11c2b55b323eac23c89483b26d3781 --- playbooks/baremetal-full-overcloud-prep.yml | 46 ++++++------- .../baremetal-full-overcloud-validate.yml | 29 ++++----- playbooks/baremetal-full-overcloud.yml | 19 +++--- playbooks/baremetal-full-undercloud.yml | 20 +++--- playbooks/baremetal-prep-virthost.yml | 13 ++-- playbooks/baremetal-undercloud.yml | 8 +-- playbooks/build-images-v2.yml | 4 +- playbooks/build-test-packages.yml | 4 +- playbooks/cleanup-destructive.yml | 4 +- playbooks/collect-logs.yml | 8 +-- playbooks/deploy-delete.yml | 9 +-- playbooks/multinode-overcloud-prep.yml | 23 ++++--- playbooks/multinode-overcloud-update.yml | 3 +- playbooks/multinode-overcloud-upgrade.yml | 7 +- playbooks/multinode-overcloud.yml | 9 ++- playbooks/multinode-standalone-upgrade.yml | 6 +- playbooks/multinode-standalone.yml | 8 +-- playbooks/multinode-undercloud.yml | 12 ++-- playbooks/multinode-validate.yml | 12 ++-- playbooks/nodepool-setup.yml | 4 +- playbooks/ovb-setup.yml | 44 ++++++++----- playbooks/provision_multinodes.yml | 2 +- .../quickstart-extras-overcloud-prep.yml | 37 ++++++----- playbooks/quickstart-extras-overcloud.yml | 17 ++--- playbooks/quickstart-extras-undercloud.yml | 22 +++---- playbooks/quickstart-extras-validate.yml | 23 +++---- playbooks/repo-setup.yml | 4 +- playbooks/scale_nodes_verify.yml | 4 +- playbooks/snapshot-libvirt.yml | 9 ++- playbooks/tempest.yml | 4 +- playbooks/tripleo-validations.yml | 15 ++--- roles/baremetal-prep-overcloud/README.md | 2 +- .../tasks/adjust-mtu-dnsmasq-ironic.yml | 4 +- .../tasks/allow-traffic-for-controller.yml | 2 +- roles/baremetal-prep-virthost/README.md | 2 +- roles/baremetal-prep-virthost/tasks/main.yml | 2 +- roles/baremetal-undercloud/README.md | 16 ++--- roles/build-test-packages/tasks/main.yml | 56 ++++++++-------- roles/collect-logs/tasks/ara_influxdb.yml | 2 +- roles/collect-logs/tasks/collect.yml | 10 +-- roles/collect-logs/tasks/create-docs.yml | 12 ++-- roles/collect-logs/tasks/publish.yml | 14 ++-- roles/freeipa-setup/README.md | 2 +- roles/install-built-repo/README.md | 4 +- roles/multinodes/README.md | 2 +- roles/overcloud-prep-flavors/README.md | 2 +- roles/overcloud-prep-images/README.md | 2 +- roles/overcloud-prep-network/README.md | 2 +- roles/snapshot-libvirt/README.md | 4 +- roles/undercloud-deploy/README.md | 4 +- roles/undercloud-setup/README.md | 2 +- .../tasks/ovb_setup_connectivity.yml | 2 +- roles/validate-tempest/README.md | 2 +- roles/validate-tempest/tasks/main.yml | 2 +- roles/validate-tempest/tasks/pre-tempest.yml | 27 ++++---- .../tasks/tempest-results.yml | 7 +- roles/validate-tempest/tasks/tempest-rpm.yml | 6 +- roles/validate-ui/defaults/main.yml | 2 +- roles/validate-ui/meta/main.yml | 1 + roles/virthost-full-cleanup/meta/main.yml | 1 + roles/virthost-full-cleanup/tasks/main.yml | 65 ++++++++++--------- zuul.d/layout.yaml | 1 + 62 files changed, 357 insertions(+), 334 deletions(-) diff --git a/playbooks/baremetal-full-overcloud-prep.yml b/playbooks/baremetal-full-overcloud-prep.yml index 76034e3e0..0662fc8ef 100644 --- a/playbooks/baremetal-full-overcloud-prep.yml +++ b/playbooks/baremetal-full-overcloud-prep.yml @@ -1,79 +1,79 @@ --- -- name: Prepare the undercloud networks for the overcloud deployment +- name: Prepare the undercloud networks for the overcloud deployment hosts: undercloud - gather_facts: no + gather_facts: false roles: - overcloud-prep-network tags: - overcloud-prep-network -- name: copy over config files +- name: copy over config files hosts: undercloud - gather_facts: no + gather_facts: false roles: - overcloud-prep-config tags: - overcloud-prep-config -- name: Perpare the baremetal overcloud +- name: Perpare the baremetal overcloud hosts: undercloud - gather_facts: yes + gather_facts: true roles: - baremetal-prep-overcloud tags: - baremetal-prep-overcloud -- name: Prepare overcloud containers +- name: Prepare overcloud containers hosts: undercloud - gather_facts: no + gather_facts: false roles: - - { role: overcloud-prep-containers, when: containerized_overcloud|bool } + - {role: overcloud-prep-containers, when: containerized_overcloud|bool} tags: - overcloud-prep-containers - name: Run tripleo-validations pre-introspection tests hosts: undercloud - gather_facts: no + gather_facts: false tags: - tripleo-validations vars: validations_group: ['pre-introspection'] roles: - - { role: tripleo-validations, - when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} + - {role: tripleo-validations, + when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} -- name: Prepare the overcloud images for deployment +- name: Prepare the overcloud images for deployment hosts: undercloud - gather_facts: no + gather_facts: false roles: - overcloud-prep-images tags: - overcloud-prep-images -- name: Prepare overcloud flavors +- name: Prepare overcloud flavors hosts: undercloud - gather_facts: no + gather_facts: false roles: - - { role: overcloud-prep-flavors, - when: step_overcloud_prep_flavors|default(true)|bool } + - {role: overcloud-prep-flavors, + when: step_overcloud_prep_flavors|default(true)|bool} tags: - overcloud-prep-flavors - name: Prepare the SSL Configuration for the overcloud deployment hosts: undercloud - gather_facts: no + gather_facts: false roles: - - { role: overcloud-ssl } + - {role: overcloud-ssl} tags: - overcloud-ssl - name: Run tripleo-validations pre-deployment tests hosts: undercloud - gather_facts: no + gather_facts: false tags: - tripleo-validations vars: validations_group: ['pre-deployment'] roles: - - { role: tripleo-validations, - when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} + - {role: tripleo-validations, + when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} diff --git a/playbooks/baremetal-full-overcloud-validate.yml b/playbooks/baremetal-full-overcloud-validate.yml index 7610016a7..38857d892 100644 --- a/playbooks/baremetal-full-overcloud-validate.yml +++ b/playbooks/baremetal-full-overcloud-validate.yml @@ -5,43 +5,42 @@ tags: - overcloud-validate roles: - - { role: validate-perf, - when: validate_performance|bool and run_tempest|bool } + - {role: validate-perf, + when: validate_performance|bool and run_tempest|bool} ignore_errors: true - name: Sanity check the overcloud services hosts: undercloud tags: - overcloud-validate - gather_facts: no + gather_facts: false roles: - - { role: validate-sanity-checks, - when: run_sanity_checks|default(false)|bool } + - {role: validate-sanity-checks, + when: run_sanity_checks|default(false)|bool} # Validate the deployment -- name: validate the overcloud +- name: validate the overcloud hosts: undercloud tags: - overcloud-validate - gather_facts: no + gather_facts: false roles: - - { role: validate-simple, when: test_ping|bool } + - {role: validate-simple, when: test_ping|bool} # Execute tempest against the overcloud deployment -- name: Execute tempest against the overcloud +- name: Execute tempest against the overcloud hosts: undercloud tags: - overcloud-validate - gather_facts: no + gather_facts: false roles: - - { role: validate-tempest, when: run_tempest|bool } + - {role: validate-tempest, when: run_tempest|bool} - name: Delete the overcloud hosts: undercloud tags: - overcloud-delete - gather_facts: no + gather_facts: false roles: - - { role: overcloud-delete, - when: step_delete_overcloud|default(false)|bool } - + - {role: overcloud-delete, + when: step_delete_overcloud|default(false)|bool} diff --git a/playbooks/baremetal-full-overcloud.yml b/playbooks/baremetal-full-overcloud.yml index f3598e5e1..78d8b9cb5 100644 --- a/playbooks/baremetal-full-overcloud.yml +++ b/playbooks/baremetal-full-overcloud.yml @@ -1,24 +1,24 @@ --- -- name: Deploy the overcloud +- name: Deploy the overcloud hosts: undercloud - gather_facts: no + gather_facts: false roles: - overcloud-deploy tags: - overcloud-deploy # Add the overcloud nodes to the generated inventory. -- name: Inventory the overcloud +- name: Inventory the overcloud hosts: undercloud - gather_facts: yes + gather_facts: true tags: - overcloud-deploy vars: - inventory: all + inventory: all roles: - tripleo-inventory -- name: Check the result of the deployment +- name: Check the result of the deployment hosts: localhost tags: - overcloud-deploy @@ -33,12 +33,11 @@ - name: Run tripleo-validations post-deployment tests hosts: undercloud - gather_facts: no + gather_facts: false tags: - tripleo-validations vars: validations_group: ['post-deployment'] roles: - - { role: tripleo-validations, - when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} - + - {role: tripleo-validations, + when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} diff --git a/playbooks/baremetal-full-undercloud.yml b/playbooks/baremetal-full-undercloud.yml index 9eeee319d..b75c0fead 100644 --- a/playbooks/baremetal-full-undercloud.yml +++ b/playbooks/baremetal-full-undercloud.yml @@ -1,7 +1,7 @@ --- -- name: Deploy the undercloud +- name: Deploy the undercloud hosts: undercloud - gather_facts: yes + gather_facts: true roles: - undercloud-deploy tags: @@ -9,28 +9,28 @@ - name: Configure tripleo-validations hosts: undercloud - gather_facts: no + gather_facts: false tags: - tripleo-validations vars: - run_tripleo_validations_setup: True + run_tripleo_validations_setup: true roles: - - { role: tripleo-validations, - when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} + - {role: tripleo-validations, + when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} - name: Validate the undercloud hosts: undercloud roles: - - { role: validate-undercloud, - when: run_validate_undercloud|default(false)|bool } + - {role: validate-undercloud, + when: run_validate_undercloud|default(false)|bool} tags: - validate-undercloud - name: Build images for quickstart hosts: undercloud - gather_facts: no + gather_facts: false roles: - - { role: build-images, when: to_build|default(false)|bool } + - {role: build-images, when: to_build|default(false)|bool} tags: - get-images - images diff --git a/playbooks/baremetal-prep-virthost.yml b/playbooks/baremetal-prep-virthost.yml index 8ea395261..59dcbc264 100644 --- a/playbooks/baremetal-prep-virthost.yml +++ b/playbooks/baremetal-prep-virthost.yml @@ -34,25 +34,24 @@ roles: - environment/setup -- name: Setup undercloud and baremetal vms and networks in libvirt +- name: Setup undercloud and baremetal vms and networks in libvirt hosts: virthost - gather_facts: yes + gather_facts: true roles: - 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 - name: Prepare the host for PXE forwarding hosts: virthost - gather_facts: no + gather_facts: false roles: - baremetal-prep-virthost - diff --git a/playbooks/baremetal-undercloud.yml b/playbooks/baremetal-undercloud.yml index 9b806253c..f768f45c2 100644 --- a/playbooks/baremetal-undercloud.yml +++ b/playbooks/baremetal-undercloud.yml @@ -8,7 +8,7 @@ - name: Add the undercloud node to the generated inventory hosts: localhost - gather_facts: yes + gather_facts: true roles: - tripleo-inventory tags: @@ -16,7 +16,7 @@ - name: Setup repositories hosts: undercloud - gather_facts: yes + gather_facts: true roles: - repo-setup tags: @@ -24,7 +24,7 @@ - name: Install packages hosts: undercloud - gather_facts: no + gather_facts: false roles: - baremetal-undercloud/packages tags: @@ -32,7 +32,7 @@ - name: Fetch the overcloud images hosts: undercloud - gather_facts: no + gather_facts: false roles: - fetch-images tags: diff --git a/playbooks/build-images-v2.yml b/playbooks/build-images-v2.yml index 2a03bc512..11ecde50c 100644 --- a/playbooks/build-images-v2.yml +++ b/playbooks/build-images-v2.yml @@ -13,9 +13,9 @@ tags: - provision -- name: Inventory the virthost +- name: Inventory the virthost hosts: localhost - gather_facts: yes + gather_facts: true roles: - tripleo-inventory tags: diff --git a/playbooks/build-test-packages.yml b/playbooks/build-test-packages.yml index 5d9539b99..72cf0f8af 100644 --- a/playbooks/build-test-packages.yml +++ b/playbooks/build-test-packages.yml @@ -13,9 +13,9 @@ tags: - provision -- name: Inventory the virthost +- name: Inventory the virthost hosts: localhost - gather_facts: yes + gather_facts: true roles: - tripleo-inventory tags: diff --git a/playbooks/cleanup-destructive.yml b/playbooks/cleanup-destructive.yml index 668b3d4df..e0e79875e 100644 --- a/playbooks/cleanup-destructive.yml +++ b/playbooks/cleanup-destructive.yml @@ -10,8 +10,8 @@ ansible_user: "root" ansible_host: "{{ virthost }}" -- name: Clean up tripleo packages and libvirt +- name: Clean up tripleo packages and libvirt hosts: virthost - gather_facts: no + gather_facts: false roles: - virthost-full-cleanup diff --git a/playbooks/collect-logs.yml b/playbooks/collect-logs.yml index 4ed2e0c6c..880a8b945 100644 --- a/playbooks/collect-logs.yml +++ b/playbooks/collect-logs.yml @@ -6,14 +6,14 @@ - name: Ensure the overcloud nodes are added to the generated inventory hosts: undercloud - gather_facts: yes + gather_facts: true tags: - collect-logs vars: - inventory: all + inventory: all roles: - tripleo-inventory - ignore_errors: yes + ignore_errors: true - name: Collect logs hosts: all:!localhost:!127.0.0.2 @@ -23,4 +23,4 @@ - name: Create docs, publish logs hosts: localhost roles: - - {role: collect-logs, artcl_collect: false } + - {role: collect-logs, artcl_collect: false} diff --git a/playbooks/deploy-delete.yml b/playbooks/deploy-delete.yml index 132d9fae0..947167579 100644 --- a/playbooks/deploy-delete.yml +++ b/playbooks/deploy-delete.yml @@ -1,15 +1,16 @@ +--- # This is the playbook used by the `quickstart.sh` script. - include: quickstart-extras.yml - name: Collect logs, create docs, publish hosts: all:!localhost - gather_facts: no + gather_facts: false roles: - - { role: tripleo-collect-logs, artcl_collect: true } + - {role: tripleo-collect-logs, artcl_collect: true} - name: test overcloud deletion hosts: undercloud - gather_facts: no + gather_facts: false roles: - - { role: overcloud-delete } + - {role: overcloud-delete} diff --git a/playbooks/multinode-overcloud-prep.yml b/playbooks/multinode-overcloud-prep.yml index ee0eceebe..21408d9d9 100644 --- a/playbooks/multinode-overcloud-prep.yml +++ b/playbooks/multinode-overcloud-prep.yml @@ -1,7 +1,7 @@ --- - name: Run overcloud prep config hosts: undercloud - gather_facts: no + gather_facts: false roles: - role: overcloud-prep-config # only run when we know we have to, save time otherwise @@ -11,24 +11,27 @@ - name: Run overcloud prep roles hosts: undercloud - gather_facts: no + gather_facts: false roles: - - { role: overcloud-prep-images, step_overcloud_image: false, step_glance_upload: true, step_register: false } + - {role: overcloud-prep-images, + step_overcloud_image: false, + step_glance_upload: true, + step_register: false} - name: Run tripleo-validations pre-introspection tests hosts: undercloud - gather_facts: no + gather_facts: false tags: - tripleo-validations vars: validations_group: ['pre-introspection'] roles: - - { role: tripleo-validations, - when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} + - {role: tripleo-validations, + when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} - name: Prepare for containerized deployment hosts: undercloud - gather_facts: no + gather_facts: false tags: - overcloud-prep-containers roles: @@ -38,11 +41,11 @@ - name: Run tripleo-validations pre-deployment tests hosts: undercloud - gather_facts: no + gather_facts: false tags: - tripleo-validations vars: validations_group: ['pre-deployment'] roles: - - { role: tripleo-validations, - when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} + - {role: tripleo-validations, + when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} diff --git a/playbooks/multinode-overcloud-update.yml b/playbooks/multinode-overcloud-update.yml index 718eba8a8..af04fbca5 100644 --- a/playbooks/multinode-overcloud-update.yml +++ b/playbooks/multinode-overcloud-update.yml @@ -1,6 +1,7 @@ +--- - name: Run tripleo-upgrade role to update the overcloud hosts: undercloud - gather_facts: yes + gather_facts: true tags: - overcloud-update roles: diff --git a/playbooks/multinode-overcloud-upgrade.yml b/playbooks/multinode-overcloud-upgrade.yml index e04084bd3..5d429ee79 100644 --- a/playbooks/multinode-overcloud-upgrade.yml +++ b/playbooks/multinode-overcloud-upgrade.yml @@ -1,8 +1,9 @@ +--- - name: Generate repo-setup script for overcloud upgrade hosts: undercloud tags: - overcloud-upgrade - gather_facts: no + gather_facts: false vars: repo_run_live: false repo_setup_script: "repo-setup-{{ target_upgrade_version }}.sh" @@ -18,7 +19,7 @@ - name: Prepare containers for Upgrade hosts: undercloud - gather_facts: no + gather_facts: false tags: - overcloud-prep-containers roles: @@ -35,7 +36,7 @@ - name: Run tripleo-upgrade role to upgrade overcloud hosts: undercloud - gather_facts: yes + gather_facts: true tags: - overcloud-upgrade vars: diff --git a/playbooks/multinode-overcloud.yml b/playbooks/multinode-overcloud.yml index 796ade9f1..24e69f594 100644 --- a/playbooks/multinode-overcloud.yml +++ b/playbooks/multinode-overcloud.yml @@ -1,7 +1,7 @@ --- - name: Deploy the overcloud hosts: undercloud - gather_facts: no + gather_facts: false roles: - overcloud-deploy environment: @@ -22,12 +22,11 @@ - name: Run tripleo-validations post-deployment tests hosts: undercloud - gather_facts: no + gather_facts: false tags: - tripleo-validations vars: validations_group: ['post-deployment'] roles: - - { role: tripleo-validations, - when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} - + - {role: tripleo-validations, + when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} diff --git a/playbooks/multinode-standalone-upgrade.yml b/playbooks/multinode-standalone-upgrade.yml index 75cf7b07e..9846e7cc0 100644 --- a/playbooks/multinode-standalone-upgrade.yml +++ b/playbooks/multinode-standalone-upgrade.yml @@ -41,7 +41,7 @@ artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz" roles: - build-test-packages - - { role: install-built-repo, when: compressed_gating_repo is defined } + - {role: install-built-repo, when: compressed_gating_repo is defined} tags: - standalone-upgrade @@ -56,8 +56,8 @@ - name: Validate the Standalone upgrade hosts: undercloud - gather_facts: no + gather_facts: false roles: - - { role: validate-tempest, when: run_tempest|bool } + - {role: validate-tempest, when: run_tempest|bool} tags: - standalone-upgrade diff --git a/playbooks/multinode-standalone.yml b/playbooks/multinode-standalone.yml index 0b156dd67..977e5ea2e 100644 --- a/playbooks/multinode-standalone.yml +++ b/playbooks/multinode-standalone.yml @@ -1,7 +1,7 @@ --- - name: Add the overcloud nodes to the generated inventory hosts: undercloud - gather_facts: yes + gather_facts: true tags: - standalone vars: @@ -22,7 +22,7 @@ artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz" roles: - build-test-packages - - { role: install-built-repo, when: compressed_gating_repo is defined } + - {role: install-built-repo, when: compressed_gating_repo is defined} tags: - build @@ -44,8 +44,8 @@ - name: Validate the undercloud hosts: undercloud - gather_facts: no + gather_facts: false roles: - - { role: validate-tempest, when: run_tempest|bool } + - {role: validate-tempest, when: run_tempest|bool} tags: - standalone diff --git a/playbooks/multinode-undercloud.yml b/playbooks/multinode-undercloud.yml index 8738dd620..61519de39 100644 --- a/playbooks/multinode-undercloud.yml +++ b/playbooks/multinode-undercloud.yml @@ -1,7 +1,7 @@ --- - name: Add the overcloud nodes to the generated inventory hosts: undercloud - gather_facts: yes + gather_facts: true tags: - overcloud-deploy vars: @@ -47,7 +47,7 @@ artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz" roles: - build-test-packages - - { role: install-built-repo, when: compressed_gating_repo is defined } + - {role: install-built-repo, when: compressed_gating_repo is defined} tags: - build @@ -71,14 +71,14 @@ - name: Configure tripleo-validations hosts: undercloud - gather_facts: no + gather_facts: false tags: - tripleo-validations vars: - run_tripleo_validations_setup: True + run_tripleo_validations_setup: true roles: - - { role: tripleo-validations, - when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} + - {role: tripleo-validations, + when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} - name: Validate the undercloud hosts: undercloud diff --git a/playbooks/multinode-validate.yml b/playbooks/multinode-validate.yml index 24ca9554b..9eee46db4 100644 --- a/playbooks/multinode-validate.yml +++ b/playbooks/multinode-validate.yml @@ -4,17 +4,17 @@ tags: - overcloud-validate roles: - - { role: validate-perf, - when: validate_performance|bool and run_tempest|bool } + - {role: validate-perf, + when: validate_performance|bool and run_tempest|bool} ignore_errors: true # Validate the deployment -- name: validate the overcloud +- name: validate the overcloud hosts: undercloud tags: - overcloud-validate - undercloud-validate - gather_facts: no + gather_facts: false roles: - - { role: validate-simple, when: test_ping|bool } - - { role: validate-tempest, when: run_tempest|bool } + - {role: validate-simple, when: test_ping|bool} + - {role: validate-tempest, when: run_tempest|bool} diff --git a/playbooks/nodepool-setup.yml b/playbooks/nodepool-setup.yml index e352053fa..be8efdf4e 100644 --- a/playbooks/nodepool-setup.yml +++ b/playbooks/nodepool-setup.yml @@ -1,7 +1,7 @@ +--- # setup the nodepool nodes - name: Setup the provisioned virtual machines to look like nodepool nodes hosts: subnodes - gather_facts: yes + gather_facts: true roles: - nodepool-setup - diff --git a/playbooks/ovb-setup.yml b/playbooks/ovb-setup.yml index 6af91cae4..efc411a51 100644 --- a/playbooks/ovb-setup.yml +++ b/playbooks/ovb-setup.yml @@ -5,28 +5,28 @@ - include: prepare-slave.yml when: use_testenv_broker|default(false)|bool -- name: Inventory the undercloud instance +- name: Inventory the undercloud instance hosts: localhost - gather_facts: yes + gather_facts: true roles: - tripleo-inventory - name: Setup the undercloud hosts: undercloud - gather_facts: yes + gather_facts: true roles: - undercloud-setup tasks: - name: Add eth2 interface from eth2.conf command: os-net-config -c {{ working_dir }}/eth2.conf -v - become: yes + become: true when: - network_isolation|bool - use_testenv_broker|default(false)|bool -- name: Inventory the undercloud instance +- name: Inventory the undercloud instance hosts: localhost - gather_facts: yes + gather_facts: true roles: - tripleo-inventory @@ -42,14 +42,14 @@ artg_repos_dir: "{{ repo_clone_dir|default('/opt/stack/new') }}" ib_create_web_repo: "{{ to_build|bool }}" roles: - - { role: build-test-packages, when: build_test_packages|default(false)|bool } - - { role: install-built-repo, when: compressed_gating_repo is defined } + - {role: build-test-packages, when: build_test_packages|default(false)|bool} + - {role: install-built-repo, when: compressed_gating_repo is defined} tags: - build - name: Get images for quickstart hosts: undercloud - gather_facts: no + gather_facts: false vars: ib_repo_image_inject: "{{ not to_build|bool }}" ib_repo_run_live: false @@ -57,9 +57,23 @@ modify_image_vc_cpu: 4 modify_image_vc_verbose: true roles: - - { role: fetch-images, when: not to_build|bool } - - { role: repo-setup, repo_inject_image_path: "$HOME/overcloud-full.qcow2", repo_run_live: false, when: not to_build|bool } - - { role: repo-setup, repo_inject_image_path: "$HOME/ironic-python-agent.initramfs", repo_run_live: false, initramfs_image: true, libguestfs_mode: false, when: not to_build|bool } - - { role: install-built-repo, ib_repo_image_path: "$HOME/overcloud-full.qcow2", when: compressed_gating_repo is defined and not to_build|bool } - - { role: install-built-repo, ib_repo_image_path: "$HOME/ironic-python-agent.initramfs", initramfs_image: true, libguestfs_mode: false, when: compressed_gating_repo is defined and not to_build|bool } - + - {role: fetch-images, + when: not to_build|bool} + - {role: repo-setup, + repo_inject_image_path: "$HOME/overcloud-full.qcow2", + repo_run_live: false, + when: not to_build|bool} + - {role: repo-setup, + repo_inject_image_path: "$HOME/ironic-python-agent.initramfs", + repo_run_live: false, + initramfs_image: true, + libguestfs_mode: false, + when: not to_build|bool} + - {role: install-built-repo, + ib_repo_image_path: "$HOME/overcloud-full.qcow2", + when: compressed_gating_repo is defined and not to_build|bool} + - {role: install-built-repo, + ib_repo_image_path: "$HOME/ironic-python-agent.initramfs", + initramfs_image: true, + libguestfs_mode: false, + when: compressed_gating_repo is defined and not to_build|bool} diff --git a/playbooks/provision_multinodes.yml b/playbooks/provision_multinodes.yml index 27c7c51c2..792ddae24 100644 --- a/playbooks/provision_multinodes.yml +++ b/playbooks/provision_multinodes.yml @@ -1,6 +1,6 @@ --- - name: Multinode hosts: localhost - gather_facts: no + gather_facts: false roles: - role: multinodes diff --git a/playbooks/quickstart-extras-overcloud-prep.yml b/playbooks/quickstart-extras-overcloud-prep.yml index 4233e8711..4cb73e9b7 100644 --- a/playbooks/quickstart-extras-overcloud-prep.yml +++ b/playbooks/quickstart-extras-overcloud-prep.yml @@ -1,25 +1,26 @@ +--- # Prepare any additional configuration files required by the overcloud -- name: Prepare configuration files for the overcloud deployment +- name: Prepare configuration files for the overcloud deployment hosts: undercloud - gather_facts: no + gather_facts: false tags: - overcloud-prep-config roles: - overcloud-prep-config # Prepare the overcloud for a containerized deployment -- name: Prepare overcloud containers +- name: Prepare overcloud containers hosts: undercloud - gather_facts: no + gather_facts: false tags: - overcloud-prep-containers roles: - overcloud-prep-containers # Prepare the overcloud images for deployment -- name: Prepare the overcloud images for deployment +- name: Prepare the overcloud images for deployment hosts: undercloud - gather_facts: no + gather_facts: false tags: - overcloud-prep-images roles: @@ -27,28 +28,28 @@ - name: Run tripleo-validations pre-introspection tests hosts: undercloud - gather_facts: no + gather_facts: false tags: - tripleo-validations vars: validations_group: ['pre-introspection'] roles: - - { role: tripleo-validations, - when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} + - {role: tripleo-validations, + when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} # Prepare the overcloud flavor configuration -- name: Prepare overcloud flavors +- name: Prepare overcloud flavors hosts: undercloud - gather_facts: no + gather_facts: false tags: - overcloud-prep-flavors roles: - overcloud-prep-flavors # Prepare the undercloud networks for the overcloud deployment -- name: Prepare the undercloud networks for the overcloud deployment +- name: Prepare the undercloud networks for the overcloud deployment hosts: undercloud - gather_facts: no + gather_facts: false tags: - overcloud-prep-network roles: @@ -56,20 +57,20 @@ - name: Run tripleo-validations pre-deployment tests hosts: undercloud - gather_facts: no + gather_facts: false tags: - tripleo-validations vars: validations_group: ['pre-deployment'] roles: - - { role: tripleo-validations, - when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} + - {role: tripleo-validations, + when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} - name: Prepare the SSL Configuration for the overcloud deployment hosts: undercloud - gather_facts: no + gather_facts: false tags: - overcloud-scripts - overcloud-ssl roles: - - { role: overcloud-ssl } + - {role: overcloud-ssl} diff --git a/playbooks/quickstart-extras-overcloud.yml b/playbooks/quickstart-extras-overcloud.yml index 24144c1a0..7bf6f5c99 100644 --- a/playbooks/quickstart-extras-overcloud.yml +++ b/playbooks/quickstart-extras-overcloud.yml @@ -1,7 +1,8 @@ +--- # Deploy the overcloud -- name: Deploy the overcloud +- name: Deploy the overcloud hosts: undercloud - gather_facts: yes + gather_facts: true tags: - overcloud-deploy roles: @@ -9,28 +10,28 @@ - name: Add the overcloud nodes to the generated inventory hosts: undercloud - gather_facts: yes + gather_facts: true tags: - overcloud-deploy - overcloud-inventory vars: - inventory: all + inventory: all roles: - tripleo-inventory - name: Run tripleo-validations post-deployment tests hosts: undercloud - gather_facts: no + gather_facts: false tags: - tripleo-validations vars: validations_group: ['post-deployment'] roles: - - { role: tripleo-validations, - when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} + - {role: tripleo-validations, + when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} # Check the results of the deployment, note after inventory has executed -- name: Check the result of the deployment +- name: Check the result of the deployment hosts: localhost tags: - overcloud-deploy diff --git a/playbooks/quickstart-extras-undercloud.yml b/playbooks/quickstart-extras-undercloud.yml index 9e061018c..47e5c7a93 100644 --- a/playbooks/quickstart-extras-undercloud.yml +++ b/playbooks/quickstart-extras-undercloud.yml @@ -1,27 +1,28 @@ +--- # Deploy the FreeIPA server - name: Deploy the FreeIPA server hosts: supplemental - gather_facts: no + gather_facts: false tags: - freeipa-setup roles: - - { role: freeipa-setup, when: deploy_supplemental_node|bool and enable_tls_everywhere|bool } + - {role: freeipa-setup, when: deploy_supplemental_node|bool and enable_tls_everywhere|bool} # setup for the undercloud - name: Setup the undercloud hosts: undercloud - gather_facts: no + gather_facts: false vars: ansible_user: root tags: - undercloud-setup roles: - - { role: undercloud-setup, when: undercloud_setup|bool } + - {role: undercloud-setup, when: undercloud_setup|bool} # Deploy the undercloud -- name: Deploy the undercloud +- name: Deploy the undercloud hosts: undercloud - gather_facts: no + gather_facts: false tags: - undercloud-deploy roles: @@ -29,12 +30,11 @@ - name: Configure tripleo-validations hosts: undercloud - gather_facts: no + gather_facts: false tags: - tripleo-validations vars: - run_tripleo_validations_setup: True + run_tripleo_validations_setup: true roles: - - { role: tripleo-validations, - when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} - + - {role: tripleo-validations, + when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} diff --git a/playbooks/quickstart-extras-validate.yml b/playbooks/quickstart-extras-validate.yml index 8dd64976b..70d5dee83 100644 --- a/playbooks/quickstart-extras-validate.yml +++ b/playbooks/quickstart-extras-validate.yml @@ -1,35 +1,36 @@ +--- # Validate the deployment - name: setup dstat performance monitoring hosts: overcloud tags: - overcloud-validate roles: - - { role: validate-perf, - when: validate_performance|bool and run_tempest|bool } + - {role: validate-perf, + when: validate_performance|bool and run_tempest|bool} ignore_errors: true -- name: validate the overcloud +- name: validate the overcloud hosts: undercloud tags: - overcloud-validate - gather_facts: no + gather_facts: false roles: - - { role: validate-simple, when: test_ping|bool } + - {role: validate-simple, when: test_ping|bool} # Execute tempest against the overcloud deployment -- name: Execute tempest against the overcloud +- name: Execute tempest against the overcloud hosts: undercloud tags: - overcloud-validate - gather_facts: no + gather_facts: false roles: - - { role: validate-tempest, when: tempest_config|bool or run_tempest|bool } + - {role: validate-tempest, when: tempest_config|bool or run_tempest|bool} # Execute simple TripleO-UI validations -- name: Execute simple TripleO-UI validations +- name: Execute simple TripleO-UI validations hosts: localhost tags: - tripleoui-validate - gather_facts: yes + gather_facts: true roles: - - { role: validate-ui, when: validate_ui_simple|bool and undercloud_enable_ui|default(true)|bool } + - {role: validate-ui, when: validate_ui_simple|bool and undercloud_enable_ui|default(true)|bool} diff --git a/playbooks/repo-setup.yml b/playbooks/repo-setup.yml index a71080b72..5a3d9c95c 100644 --- a/playbooks/repo-setup.yml +++ b/playbooks/repo-setup.yml @@ -1,6 +1,6 @@ --- -- name: Setup repositories +- name: Setup repositories hosts: undercloud - gather_facts: yes + gather_facts: true roles: - repo-setup diff --git a/playbooks/scale_nodes_verify.yml b/playbooks/scale_nodes_verify.yml index 2f9f909d2..9d422e743 100644 --- a/playbooks/scale_nodes_verify.yml +++ b/playbooks/scale_nodes_verify.yml @@ -7,7 +7,7 @@ # Re-inventory the overcloud - name: Inventory the overcloud hosts: undercloud - gather_facts: yes + gather_facts: true vars: inventory: all roles: @@ -16,6 +16,6 @@ # Validate the overcloud - name: Validate the overcloud post-delete-node hosts: undercloud - gather_facts: no + gather_facts: false roles: - validate-simple diff --git a/playbooks/snapshot-libvirt.yml b/playbooks/snapshot-libvirt.yml index a305c0682..efcc103c9 100644 --- a/playbooks/snapshot-libvirt.yml +++ b/playbooks/snapshot-libvirt.yml @@ -1,13 +1,12 @@ --- -- name: Snapshot virts +- name: Snapshot virts hosts: virthost - gather_facts: yes + gather_facts: true vars: - libvirt_uri: qemu:///system - overcloud_nodes: - - name: subnode-0 - - name: subnode-1 + - name: subnode-0 + - name: subnode-1 roles: - snapshot-libvirt become: true - diff --git a/playbooks/tempest.yml b/playbooks/tempest.yml index 6909055db..20eb4e1fc 100644 --- a/playbooks/tempest.yml +++ b/playbooks/tempest.yml @@ -1,6 +1,6 @@ --- -- name: Run tempest +- name: Run tempest hosts: undercloud - gather_facts: no + gather_facts: false roles: - validate-tempest diff --git a/playbooks/tripleo-validations.yml b/playbooks/tripleo-validations.yml index 1bebc99e3..5f4b70a4c 100644 --- a/playbooks/tripleo-validations.yml +++ b/playbooks/tripleo-validations.yml @@ -2,23 +2,22 @@ - name: Configure tripleo-validations hosts: undercloud - gather_facts: no + gather_facts: false tags: - tripleo-validations vars: - run_tripleo_validations_setup: True + run_tripleo_validations_setup: true roles: - - { role: tripleo-validations, - when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} + - {role: tripleo-validations, + when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} - name: Run tripleo-validations pre-introspection tests hosts: undercloud - gather_facts: no + gather_facts: false tags: - tripleo-validations vars: validations_group: ['pre-introspection'] roles: - - { role: tripleo-validations, - when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} - + - {role: tripleo-validations, + when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} diff --git a/roles/baremetal-prep-overcloud/README.md b/roles/baremetal-prep-overcloud/README.md index b1c6f49a6..05dbbcfb7 100644 --- a/roles/baremetal-prep-overcloud/README.md +++ b/roles/baremetal-prep-overcloud/README.md @@ -34,7 +34,7 @@ Example Playbook - name: Prepare for deployment on baremetal overcloud hosts: virthost - gather_facts: no + gather_facts: false roles: - ansible-role-tripleo-overcloud-prep-baremetal diff --git a/roles/baremetal-prep-overcloud/tasks/adjust-mtu-dnsmasq-ironic.yml b/roles/baremetal-prep-overcloud/tasks/adjust-mtu-dnsmasq-ironic.yml index c5e4f1e8e..bafff9625 100644 --- a/roles/baremetal-prep-overcloud/tasks/adjust-mtu-dnsmasq-ironic.yml +++ b/roles/baremetal-prep-overcloud/tasks/adjust-mtu-dnsmasq-ironic.yml @@ -7,9 +7,7 @@ mode: 0755 - name: Adjust MTU values and modify dnsmasq-ironic.conf - become: yes + become: true shell: > "{{ working_dir }}"/adjust-interface-mtus.sh when: step_adjust_mtu|bool - - diff --git a/roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml b/roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml index de6001948..606911d21 100644 --- a/roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml +++ b/roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml @@ -7,7 +7,7 @@ mode: 0755 - name: Allow traffic for the controller - become: yes + become: true shell: > "{{ working_dir }}"/allow-traffic-for-controller.sh when: diff --git a/roles/baremetal-prep-virthost/README.md b/roles/baremetal-prep-virthost/README.md index a40cfd861..b9bc2f7b8 100644 --- a/roles/baremetal-prep-virthost/README.md +++ b/roles/baremetal-prep-virthost/README.md @@ -32,7 +32,7 @@ Example Playbook - name: Prepare the host for PXE forwarding hosts: virthost - gather_facts: no + gather_facts: false roles: - ansible-role-tripleo-baremetal-prep-virthost diff --git a/roles/baremetal-prep-virthost/tasks/main.yml b/roles/baremetal-prep-virthost/tasks/main.yml index a63ccd4ef..e6c6ea3b6 100644 --- a/roles/baremetal-prep-virthost/tasks/main.yml +++ b/roles/baremetal-prep-virthost/tasks/main.yml @@ -9,6 +9,6 @@ wait_for: path="{{ working_dir }}/add-provisioning-interface.sh" - name: Add provisioning interface to the "brovc" bridge - become: yes + become: true shell: > "{{ working_dir }}"/add-provisioning-interface.sh diff --git a/roles/baremetal-undercloud/README.md b/roles/baremetal-undercloud/README.md index 176b521e2..71a8e0cb6 100644 --- a/roles/baremetal-undercloud/README.md +++ b/roles/baremetal-undercloud/README.md @@ -219,7 +219,7 @@ others coming from various related to tripleo-quickstart: # Machine at this point is provided - name: Add the undercloud node to the generated inventory hosts: localhost - gather_facts: yes + gather_facts: true roles: - tripleo-inventory tags: @@ -228,7 +228,7 @@ others coming from various related to tripleo-quickstart: # Deploy the undercloud - name: Install undercloud hosts: undercloud - gather_facts: no + gather_facts: false roles: - tripleo/undercloud tags: @@ -245,7 +245,7 @@ others coming from various related to tripleo-quickstart: # Prepare any additional configuration files required by the overcloud - name: Prepare configuration files for the overcloud deployment hosts: undercloud - gather_facts: no + gather_facts: false roles: - overcloud-prep-config tags: @@ -254,7 +254,7 @@ others coming from various related to tripleo-quickstart: # Prepare the overcloud images for deployment - name: Prepare the overcloud images for deployment hosts: undercloud - gather_facts: no + gather_facts: false roles: - overcloud-prep-images tags: @@ -263,7 +263,7 @@ others coming from various related to tripleo-quickstart: # Prepare the overcloud flavor configuration - name: Prepare overcloud flavors hosts: undercloud - gather_facts: no + gather_facts: false roles: - overcloud-prep-flavors tags: @@ -272,7 +272,7 @@ others coming from various related to tripleo-quickstart: # Prepare the undercloud networks for the overcloud deployment - name: Prepare the undercloud networks for the overcloud deployment hosts: undercloud - gather_facts: no + gather_facts: false roles: - overcloud-prep-network tags: @@ -281,7 +281,7 @@ others coming from various related to tripleo-quickstart: # Deploy the overcloud - name: Deploy the overcloud hosts: undercloud - gather_facts: yes + gather_facts: true roles: - overcloud-deploy tags: @@ -289,7 +289,7 @@ others coming from various related to tripleo-quickstart: - name: Add the overcloud nodes to the generated inventory hosts: undercloud - gather_facts: yes + gather_facts: true vars: inventory: all roles: diff --git a/roles/build-test-packages/tasks/main.yml b/roles/build-test-packages/tasks/main.yml index 93fb57ee7..9abadb13e 100644 --- a/roles/build-test-packages/tasks/main.yml +++ b/roles/build-test-packages/tasks/main.yml @@ -18,32 +18,32 @@ when: python_cmd is not defined - name: Ensure DLRN package dependencies - become: yes + become: true package: state: present name: - - createrepo - - gcc - - git - - libffi-devel - - mock - - openssl-devel - - redhat-rpm-config - - rsync - - rpm-build - - rpmdevtools - - sqlite - - > - {% if ansible_python.version.major == 3 %} - python3-libselinux - {% else %} - libselinux-python - {% endif %} + - createrepo + - gcc + - git + - libffi-devel + - mock + - openssl-devel + - redhat-rpm-config + - rsync + - rpm-build + - rpmdevtools + - sqlite + - > + {% if ansible_python.version.major == 3 %} + python3-libselinux + {% else %} + libselinux-python + {% endif %} - name: Check if virtualenv is in the system shell: "{{ python_cmd }} -m virtualenv --version" args: - warn: no + warn: false register: virtualenv_exist changed_when: false failed_when: false @@ -60,17 +60,17 @@ {% endif %} - name: Create mock group - become: yes + become: true group: name: mock state: present - name: Add user to mock group - become: yes + become: true user: name: '{{ ansible_user_id }}' groups: mock - append: yes + append: true - name: Ensure DLRN dir is present file: @@ -81,7 +81,7 @@ shell: rm -rf '{{ build_repo_dir }}/DLRN/*' args: - warn: no + warn: false register: result changed_when: result.stdout or result.stderr @@ -117,7 +117,7 @@ pip install -r requirements.txt; python setup.py install; args: - chdir: '{{ build_repo_dir }}/DLRN' + chdir: '{{ build_repo_dir }}/DLRN' when: dlrn_pre_installed|bool - name: copy the DLRN scripts in the virtualenv to the scripts dir @@ -138,8 +138,10 @@ gawk '{ print $0 }; /^# repos$/ { exit }' {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}.cfg > {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg; cat /etc/yum.repos.d/quickstart-{{ ansible_distribution | lower }}-*.repo >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg; - find /etc/yum.repos.d -name "delorean*repo" ! -name "delorean*build-deps.repo" -exec cat {} \; >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg; - find /etc/yum.repos.d -name "delorean*build-deps.repo" -exec sed 's/enabled=.*/enabled=1/g' {} \; >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg; + find /etc/yum.repos.d -name "delorean*repo" ! -name "delorean*build-deps.repo" -exec cat {} \; + >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg; + find /etc/yum.repos.d -name "delorean*build-deps.repo" -exec sed 's/enabled=.*/enabled=1/g' {} \; + >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg; echo '"""' >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg; mkdir -p /tmp/fake-dlrn-repos/current; touch /tmp/fake-dlrn-repos/delorean-deps.repo; @@ -224,7 +226,7 @@ exit $?; done; args: - chdir: '{{ build_repo_dir }}/DLRN' + chdir: '{{ build_repo_dir }}/DLRN' register: repo_built_multi when: not artg_build_one|bool diff --git a/roles/collect-logs/tasks/ara_influxdb.yml b/roles/collect-logs/tasks/ara_influxdb.yml index 890825480..c58afe406 100644 --- a/roles/collect-logs/tasks/ara_influxdb.yml +++ b/roles/collect-logs/tasks/ara_influxdb.yml @@ -16,7 +16,7 @@ only_successful_tasks: "{{ influxdb_only_successful_tasks }}" - name: Get ARA json data for undercloud - become: yes + become: true shell: "{{ local_working_dir }}/bin/ara result list --all -f json" register: ara_root_data diff --git a/roles/collect-logs/tasks/collect.yml b/roles/collect-logs/tasks/collect.yml index 01309622e..b1b00c6a8 100644 --- a/roles/collect-logs/tasks/collect.yml +++ b/roles/collect-logs/tasks/collect.yml @@ -306,7 +306,7 @@ dest: "/tmp/{{ inventory_hostname }}-rsync-filter" - name: Gather the logs to /tmp - become: yes + become: true shell: > set -o pipefail && rsync --quiet --recursive --copy-links --prune-empty-dirs @@ -333,16 +333,16 @@ fetch: src: "/tmp/{{ inventory_hostname }}.tar.gz" dest: "{{ artcl_collect_dir }}/{{ inventory_hostname }}.tar.gz" - flat: yes - validate_checksum: no + flat: true + validate_checksum: false when: artcl_tar_gz|bool - name: Fetch log archive (tar) fetch: src: "/tmp/{{ inventory_hostname }}.tar" dest: "{{ artcl_collect_dir }}/{{ inventory_hostname }}.tar" - flat: yes - validate_checksum: no + flat: true + validate_checksum: false when: artcl_gzip_only|bool - name: Delete temporary log directory after collection diff --git a/roles/collect-logs/tasks/create-docs.yml b/roles/collect-logs/tasks/create-docs.yml index 65425eac7..157779361 100644 --- a/roles/collect-logs/tasks/create-docs.yml +++ b/roles/collect-logs/tasks/create-docs.yml @@ -8,8 +8,8 @@ shell: > gunzip "{{ artcl_collect_dir }}/undercloud/home/{{ undercloud_user }}/{{ item }}.sh.gz"; with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}" - ignore_errors: yes - when: artcl_gzip_only|bool + ignore_errors: true + when: artcl_gzip_only|bool - name: Generate rST docs from scripts and move to Sphinx src dir shell: > @@ -17,19 +17,19 @@ "{{ artcl_collect_dir }}/undercloud/home/{{ undercloud_user }}/{{ item }}.sh" > \ "{{ artcl_docs_source_dir }}/{{ item }}.rst" with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}" - ignore_errors: yes + ignore_errors: true - name: Fetch static rST docs to include in output docs shell: > cp "{{ artcl_docs_source_dir }}/../static/{{ item }}.rst" "{{ artcl_docs_source_dir }}" with_items: "{{ artcl_create_docs_payload.included_static_docs }}" - ignore_errors: yes + ignore_errors: true - name: Generate fresh index.rst for Sphinx template: src: index.rst.j2 dest: "{{ artcl_docs_source_dir }}/index.rst" - force: yes + force: true - name: Ensure docs dir exists file: @@ -41,4 +41,4 @@ set -o pipefail && sphinx-build -b html "{{ artcl_docs_source_dir }}" "{{ artcl_docs_build_dir }}" 2>&1 {{ timestamper_cmd }} > {{ artcl_collect_dir }}/docs/sphinx_build.log - ignore_errors: yes + ignore_errors: true diff --git a/roles/collect-logs/tasks/publish.yml b/roles/collect-logs/tasks/publish.yml index 2aebdc4bd..5b95596ad 100644 --- a/roles/collect-logs/tasks/publish.yml +++ b/roles/collect-logs/tasks/publish.yml @@ -21,35 +21,35 @@ {{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.json; cp -r {{ local_working_dir }}/ara_oooq {{ artcl_collect_dir }}/; {% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq;{% endif %} - ignore_errors: yes + ignore_errors: true - name: Generate and retrieve root the ARA static playbook report - become: yes + become: true shell: > {{ local_working_dir }}/bin/ara generate html {{ local_working_dir }}/ara_oooq_root; {{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.oooq.root.json; cp -r {{ local_working_dir }}/ara_oooq_root {{ artcl_collect_dir }}/; {% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq_root;{% endif %} - ignore_errors: yes + ignore_errors: true - name: Generate and retrieve the ARA static playbook report for OC deploy - become: yes + become: true shell: > {{ local_working_dir }}/bin/ara generate html {{ local_working_dir }}/ara_oooq_oc; {{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.oooq.oc.json; cp -r {{ local_working_dir }}/ara_oooq_oc {{ artcl_collect_dir }}/; {% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq_oc;{% endif %} - ignore_errors: yes + ignore_errors: true environment: ARA_DATABASE: 'sqlite:///{{ ara_overcloud_db_path }}' - include: ara_graphite.yml when: ara_graphite_server is defined - ignore_errors: yes + ignore_errors: true - include: ara_influxdb.yml when: influxdb_url is defined or influxdb_create_data_file|bool - ignore_errors: yes + ignore_errors: true - name: fetch stackviz results to the root of the collect_dir shell: > diff --git a/roles/freeipa-setup/README.md b/roles/freeipa-setup/README.md index ab7d3385f..705b40ad7 100644 --- a/roles/freeipa-setup/README.md +++ b/roles/freeipa-setup/README.md @@ -30,7 +30,7 @@ Sample playbook to call the role # Deploy the FreeIPA Server - name: Deploy FreeIPA hosts: freeipa_host - gather_facts: no + gather_facts: false roles: - freeipa-setup ``` diff --git a/roles/install-built-repo/README.md b/roles/install-built-repo/README.md index 164636d10..c84143b60 100644 --- a/roles/install-built-repo/README.md +++ b/roles/install-built-repo/README.md @@ -36,13 +36,13 @@ Including an example of how to use this role --- - name: Run repo install hosts: undercloud - gather_facts: no + gather_facts: false roles: - install-built-repo - name: Run repo install hosts: undercloud - gather_facts: no + gather_facts: false vars: ib_repo_image_inject: true ib_repo_image_path: "{{ working_dir }}/overcloud-full.qcow2" diff --git a/roles/multinodes/README.md b/roles/multinodes/README.md index 2e9d9c891..0ee813b55 100644 --- a/roles/multinodes/README.md +++ b/roles/multinodes/README.md @@ -52,7 +52,7 @@ Example Playbook --- - name: Multinode hosts: localhost - gather_facts: no + gather_facts: false roles: - role: multinodes diff --git a/roles/overcloud-prep-flavors/README.md b/roles/overcloud-prep-flavors/README.md index 6a5bb14ca..c833754cf 100644 --- a/roles/overcloud-prep-flavors/README.md +++ b/roles/overcloud-prep-flavors/README.md @@ -30,7 +30,7 @@ Example Playbook - name: Copy configuration files hosts: virthost - gather_facts: no + gather_facts: false roles: - ansible-role-tripleo-overcloud-prep-config diff --git a/roles/overcloud-prep-images/README.md b/roles/overcloud-prep-images/README.md index 7cfc6208f..f6ed14331 100644 --- a/roles/overcloud-prep-images/README.md +++ b/roles/overcloud-prep-images/README.md @@ -47,7 +47,7 @@ Example Playbook - name: Copy configuration files hosts: virthost - gather_facts: no + gather_facts: false roles: - ansible-role-tripleo-overcloud-prep-config diff --git a/roles/overcloud-prep-network/README.md b/roles/overcloud-prep-network/README.md index 2e0b757ce..88da2e3fd 100644 --- a/roles/overcloud-prep-network/README.md +++ b/roles/overcloud-prep-network/README.md @@ -76,7 +76,7 @@ Example Playbook - name: Copy configuration files hosts: virthost - gather_facts: no + gather_facts: false roles: - ansible-role-tripleo-overcloud-prep-config diff --git a/roles/snapshot-libvirt/README.md b/roles/snapshot-libvirt/README.md index d36e0dc23..42f3e90f7 100644 --- a/roles/snapshot-libvirt/README.md +++ b/roles/snapshot-libvirt/README.md @@ -39,7 +39,7 @@ Example Usage --- - name: Create a snapshot (or update a snapshot) hosts: virthost - gather_facts: yes + gather_facts: true vars: - snapshot_create: true - libvirt_volume_path: /opt/vm_images @@ -53,7 +53,7 @@ Example Usage - name: Restore a snapshot hosts: virthost - gather_facts: yes + gather_facts: true vars: - snapshot_restore: true - libvirt_volume_path: /opt/vm_images diff --git a/roles/undercloud-deploy/README.md b/roles/undercloud-deploy/README.md index c8dbf134a..49747c65f 100644 --- a/roles/undercloud-deploy/README.md +++ b/roles/undercloud-deploy/README.md @@ -196,7 +196,7 @@ Sample playbook to call the role # Deploy the undercloud - name: Install undercloud hosts: undercloud - gather_facts: no + gather_facts: false roles: - undercloud-deploy ``` @@ -319,7 +319,7 @@ And an example playbook to call the role is: # Deploy the undercloud - name: Deploy undercloud (experimental) hosts: undercloud - gather_facts: no + gather_facts: false vars: containerized_undercloud: true undercloud_install_script: undercloud-deploy.sh.j2 diff --git a/roles/undercloud-setup/README.md b/roles/undercloud-setup/README.md index 2409a4ff0..fd7fe3531 100644 --- a/roles/undercloud-setup/README.md +++ b/roles/undercloud-setup/README.md @@ -58,7 +58,7 @@ Example Playbook - name: Set up CentOS undercloud node to run TripleO Quickstart hosts: undercloud - gather_facts: no + gather_facts: false roles: - undercloud-setup diff --git a/roles/undercloud-setup/tasks/ovb_setup_connectivity.yml b/roles/undercloud-setup/tasks/ovb_setup_connectivity.yml index fdee2881a..90e051dca 100644 --- a/roles/undercloud-setup/tasks/ovb_setup_connectivity.yml +++ b/roles/undercloud-setup/tasks/ovb_setup_connectivity.yml @@ -11,7 +11,7 @@ mode: 0755 - name: Setup interfaces, connectivity on the undercloud - become: yes + become: true shell: > set -o pipefail && {{ working_dir }}/ovb-undercloud-connectivity.sh 2>&1 {{ timestamper_cmd }} > diff --git a/roles/validate-tempest/README.md b/roles/validate-tempest/README.md index 283181bf2..bd1102281 100644 --- a/roles/validate-tempest/README.md +++ b/roles/validate-tempest/README.md @@ -145,7 +145,7 @@ Example Playbook --- - name: Run tempest hosts: undercloud - gather_facts: no + gather_facts: false roles: - validate-tempest diff --git a/roles/validate-tempest/tasks/main.yml b/roles/validate-tempest/tasks/main.yml index dfa42bf65..0d44be95d 100644 --- a/roles/validate-tempest/tasks/main.yml +++ b/roles/validate-tempest/tasks/main.yml @@ -53,7 +53,7 @@ when: run_tempest|bool tags: - run-stackviz - ignore_errors: yes + ignore_errors: true - include: post-tempest.yml when: post_tempest|bool and run_tempest|bool diff --git a/roles/validate-tempest/tasks/pre-tempest.yml b/roles/validate-tempest/tasks/pre-tempest.yml index ba6a0df35..38b0a3547 100644 --- a/roles/validate-tempest/tasks/pre-tempest.yml +++ b/roles/validate-tempest/tasks/pre-tempest.yml @@ -1,16 +1,16 @@ --- - name: Set the number of workers in tempest set_fact: - tempest_workers: "{{ ansible_processor_vcpus|int // 2 }}" + tempest_workers: "{{ ansible_processor_vcpus|int // 2 }}" when: tempest_workers is not defined - name: Set rc file to be sourced to run tempest set_fact: - rc_file: "{{ working_dir }}/{% if tempest_undercloud %}stackrc{% else %}overcloudrc{% endif %}" + rc_file: "{{ working_dir }}/{% if tempest_undercloud %}stackrc{% else %}overcloudrc{% endif %}" - name: Set rc file to be sourced to run tempest with in container set_fact: - rc_file_container: "{{ tempest_data }}/{% if tempest_undercloud %}stackrc{% else %}overcloudrc{% endif %}" + rc_file_container: "{{ tempest_data }}/{% if tempest_undercloud %}stackrc{% else %}overcloudrc{% endif %}" when: tempest_format == 'container' - name: Create overcloud tempest setup script @@ -44,17 +44,20 @@ when: tempest_whitelist|length > 0 - name: Install packages to generate subunit results - become: yes - package: name={{ item }} state=present - with_items: - - python-subunit - - subunit-filters - - python-os-testr + become: true + package: + name: + - python-subunit + - subunit-filters + - python-os-testr + state: present when: tempest_format in ['container', 'packages'] - name: Install stestr - become: yes - package: name=python-stestr state=present + become: true + package: + name: python-stestr + state: present when: tempest_format in ['container', 'packages'] and release not in ['newton', 'ocata'] - ignore_errors: true @@ -87,5 +90,5 @@ --to-file "{{ working_dir }}/{{ skip_file }}" --format txt args: chdir: "{{ working_dir }}/bugcheck" - ignore_errors: yes + ignore_errors: true when: check_tempest_bugs|bool diff --git a/roles/validate-tempest/tasks/tempest-results.yml b/roles/validate-tempest/tasks/tempest-results.yml index 4917ddd91..5638aa72f 100644 --- a/roles/validate-tempest/tasks/tempest-results.yml +++ b/roles/validate-tempest/tasks/tempest-results.yml @@ -41,13 +41,13 @@ fetch: src: "{{ working_dir }}/tempest/tempest.html" dest: "{{ local_working_dir }}/tempest.html" - flat: yes + flat: true - name: Fetch nosetests results fetch: src: "{{ working_dir }}/tempest/tempest.xml" dest: "{{ local_working_dir }}/nosetests.xml" - flat: yes + flat: true - name: Copying tempestmail files synchronize: @@ -71,5 +71,4 @@ --skip-file "{{ working_dir }}/tempestmail/tempest_skip_{{ release }}.yml" args: chdir: "{{ working_dir }}/tempestmail" - ignore_errors: yes - + ignore_errors: true diff --git a/roles/validate-tempest/tasks/tempest-rpm.yml b/roles/validate-tempest/tasks/tempest-rpm.yml index c78491742..34379434c 100644 --- a/roles/validate-tempest/tasks/tempest-rpm.yml +++ b/roles/validate-tempest/tasks/tempest-rpm.yml @@ -19,7 +19,7 @@ - name: Install openstack services tempest plugins yum: state=latest name={{ item }} with_items: "{{ tempest_plugins }}" - become: yes + become: true when: tempest_plugins|length > 0 - name: Install openstack tempest @@ -38,8 +38,8 @@ - name: Set tempest init command set_fact: - tempest_init: "{% if release == 'newton' %}/usr/share/openstack-tempest-*/tools/configure-tempest-directory{% else %}tempest init {{ tempest_dir }}{% endif %}" + tempest_init: "{% if release == 'newton' %}/usr/share/openstack-tempest-*/tools/configure-tempest-directory{% else %}tempest init {{ tempest_dir }}{% endif %}" - name: Set tempestconf call set_fact: - tempestconf: "{% if release == 'newton' %}{{ tempest_dir }}/tools/config_tempest.py{% else %}/usr/bin/discover-tempest-config{% endif %}" + tempestconf: "{% if release == 'newton' %}{{ tempest_dir }}/tools/config_tempest.py{% else %}/usr/bin/discover-tempest-config{% endif %}" diff --git a/roles/validate-ui/defaults/main.yml b/roles/validate-ui/defaults/main.yml index d7036dab3..e4aea6730 100644 --- a/roles/validate-ui/defaults/main.yml +++ b/roles/validate-ui/defaults/main.yml @@ -2,4 +2,4 @@ validate_ui_simple: false ui_validate_simple_script: validate_ui_simple.sh.j2 ui_validate_simple_log: validate_ui_simple.log -virthost_addr: "{{ hostvars[groups['virthost'][0]].ansible_host }}" \ No newline at end of file +virthost_addr: "{{ hostvars[groups['virthost'][0]].ansible_host }}" diff --git a/roles/validate-ui/meta/main.yml b/roles/validate-ui/meta/main.yml index 819da26a3..98bfef3b5 100644 --- a/roles/validate-ui/meta/main.yml +++ b/roles/validate-ui/meta/main.yml @@ -1,2 +1,3 @@ +--- dependencies: - extras-common diff --git a/roles/virthost-full-cleanup/meta/main.yml b/roles/virthost-full-cleanup/meta/main.yml index 819da26a3..98bfef3b5 100644 --- a/roles/virthost-full-cleanup/meta/main.yml +++ b/roles/virthost-full-cleanup/meta/main.yml @@ -1,2 +1,3 @@ +--- dependencies: - extras-common diff --git a/roles/virthost-full-cleanup/tasks/main.yml b/roles/virthost-full-cleanup/tasks/main.yml index c7c654663..8af63609c 100644 --- a/roles/virthost-full-cleanup/tasks/main.yml +++ b/roles/virthost-full-cleanup/tasks/main.yml @@ -25,7 +25,7 @@ with_items: "{{ vms.list_vms }}" - name: destroy any remaining vms - virt : command=destroy name={{ item }} + virt: command=destroy name={{ item }} with_items: "{{ vms.list_vms }}" - name: remove images from /var/lib/libvirt/images @@ -51,11 +51,11 @@ command: virsh net-destroy default - name: destroy default pool - become: yes + become: true command: virsh pool-destroy default - name: destroy local libvirt storage, networks and config - become: yes + become: true shell: "rm -rf {{ working_dir }}/.config/libvirt" - name: get user_id for stack user @@ -118,7 +118,7 @@ - name: kill all the network managers processes shell: kill -9 $(ps aux | grep NetworkManager | awk '{print $2}') - ignore_errors: yes # When no NM running, killall exits with 1 + ignore_errors: true # When no NM running, killall exits with 1 - name: ensure the network service is enabled service: name=network enabled=yes @@ -130,32 +130,33 @@ - /usr/bin/instack-setup-host - name: remove any instack rpms from the host - yum: name={{item}} state=absent - ignore_errors: yes - with_items: - - instack-* - - rdo-release - - rhos-release - - libvirt - - libvirt-daemon - - openvswitch - - NetworkManager - - qemu-* - - openstack-* - - python-qpid-* - - pexpect - - python-pexpect - - python-tuskarclient* - - python-keystone* - - python-openstackclient - - python-oslo* - - python-qpid - - python-ironic* - - python-eventlet - - tripleo-* - - python-rdomanager-* - - jq - - python-tripleo* + yum: + name: + - instack-* + - rdo-release + - rhos-release + - libvirt + - libvirt-daemon + - openvswitch + - NetworkManager + - qemu-* + - openstack-* + - python-qpid-* + - pexpect + - python-pexpect + - python-tuskarclient* + - python-keystone* + - python-openstackclient + - python-oslo* + - python-qpid + - python-ironic* + - python-eventlet + - tripleo-* + - python-rdomanager-* + - jq + - python-tripleo* + state: absent + ignore_errors: true - name: find any remaining rpms from director repos shell: "yumdb search from_repo rhelosp-*-director* | egrep -v from_repo | grep -v '^$' | tail -n +2 " @@ -170,7 +171,7 @@ register: delorean_rpms # BUG: when this task encounters an rpm of the form "1:somerpm" it fails - #- name: debug + # - name: debug # debug: var={{ item }} # with_flattened: # - director_rpms.stdout_lines @@ -179,7 +180,7 @@ - name: remove any openstack rpms from the host yum: name={{item}} state=absent - ignore_errors: yes + ignore_errors: true with_flattened: - "{{ director_rpms.stdout_lines }}" - "{{ rhos_rpms.stdout_lines }}" diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index e0fdbddaf..0e441c133 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -1,3 +1,4 @@ +--- - project: templates: - tripleo-undercloud-jobs