diff --git a/tasks/common/adjust-roles-data.yaml b/tasks/common/adjust-roles-data.yaml index 7e5110c6..42b982e4 100644 --- a/tasks/common/adjust-roles-data.yaml +++ b/tasks/common/adjust-roles-data.yaml @@ -4,7 +4,7 @@ path: "{{ roles_data }}" regexp: '(\s+)(- OS::TripleO::Services::RabbitMQ$)' replace: '\1\2\1- {{ item }}' - with_items: + loop: - "OS::TripleO::Services::OsloMessagingRpc" - "OS::TripleO::Services::OsloMessagingNotify" @@ -25,7 +25,7 @@ dest: "{{ roles_data }}" regexp: '(\s+)(- OS::TripleO::Services::{{ item }}$)' replace: '' - with_items: + loop: - CeilometerApi - CeilometerCollector - CeilometerExpirer diff --git a/tasks/common/controller_post_script.yml b/tasks/common/controller_post_script.yml index de0b2f13..1f243761 100644 --- a/tasks/common/controller_post_script.yml +++ b/tasks/common/controller_post_script.yml @@ -9,7 +9,7 @@ src: "check_service_{{ item }}.sh.j2" dest: "{{ working_dir }}/{{ node_name | splitext | first }}_post/{{ item }}.sh" mode: 0775 - with_items: + loop: - 'haproxy' - 'haproxy_backend' - 'rabbitmq' diff --git a/tasks/common/controller_post_scripts.yml b/tasks/common/controller_post_scripts.yml index ddb3d92f..91b86225 100644 --- a/tasks/common/controller_post_scripts.yml +++ b/tasks/common/controller_post_scripts.yml @@ -8,4 +8,4 @@ - include_tasks: controller_post_script.yml loop_control: loop_var: node_name - with_items: "{{ controllers.stdout_lines }}" + loop: "{{ controllers.stdout_lines }}" diff --git a/tasks/common/convert_ceph_params.yaml b/tasks/common/convert_ceph_params.yaml index c9cff2ed..b9bb7884 100644 --- a/tasks/common/convert_ceph_params.yaml +++ b/tasks/common/convert_ceph_params.yaml @@ -20,15 +20,13 @@ grep 'ceph::profile::params::osds' {{ item }} ignore_errors: true register: osd_env - with_items: - - "{{ envs.stdout_lines }}" + loop: "{{ envs.stdout_lines }}" - name: set ceph_env fact set_fact: ceph_env: "{{ item.item }}" when: item.stdout|length > 0 - with_items: - - "{{ osd_env.results }}" + loop: "{{ osd_env.results }}" - block: - name: make a copy of the initial environment file @@ -74,7 +72,7 @@ path: "{{ ceph_env }}" regexp: "{{ item }}" state: absent - with_items: + loop: - "ceph::profile::params::osd_pool_default_pg_num" - "ceph::profile::params::osd_pool_default_pgp_num" - "ceph::profile::params::osds" @@ -90,7 +88,7 @@ path: "{{ ceph_env }}" regexp: "{{ item }}" state: absent - with_items: "{{ ceph_osds }}" + loop: "{{ ceph_osds }}" - name: register new environment file command: "cat {{ ceph_env }}" diff --git a/tasks/common/convert_nic_templates.yaml b/tasks/common/convert_nic_templates.yaml index ec9f7d9d..acccb291 100644 --- a/tasks/common/convert_nic_templates.yaml +++ b/tasks/common/convert_nic_templates.yaml @@ -4,15 +4,13 @@ grep "OS::TripleO::.*::Net::SoftwareConfig" {{ item }} ignore_errors: true register: nic_config_envs - with_items: - - "{{ initial_env_file.stdout_lines }}" + loop: "{{ initial_env_file.stdout_lines }}" - name: set nic_config_env fact set_fact: nic_config_env: "{{ item.item }}" when: item.stdout|length > 0 - with_items: - - "{{ nic_config_envs.results }}" + loop: "{{ nic_config_envs.results }}" - block: - name: register nic templates files defined in the environment file @@ -29,8 +27,7 @@ when: - "item[0] == '/'" - "tht_directory not in item" - with_items: - - "{{ nic_template_files.stdout_lines }}" + loop: "{{ nic_template_files.stdout_lines }}" - name: adjust nic templates in relative paths location shell: | @@ -41,6 +38,5 @@ when: - "item[0] != '/'" - "tht_directory not in '/'.join(nic_config_env.split('/')[0:-1])" - with_items: - - "{{ nic_template_files.stdout_lines }}" + loop: "{{ nic_template_files.stdout_lines }}" when: nic_config_env is defined diff --git a/tasks/common/convert_roles_data.yaml b/tasks/common/convert_roles_data.yaml index 255a087d..fca2b847 100644 --- a/tasks/common/convert_roles_data.yaml +++ b/tasks/common/convert_roles_data.yaml @@ -21,7 +21,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: "^(- name: Controller( # the 'primary' role goes first)?$)" replace: "{{ item }}" - with_items: + loop: - '\1\n deprecated_param_image: "controllerImage"' - '\1\n deprecated_param_flavor: "OvercloudControlFlavor"' - '\1\n deprecated_param_extraconfig: "controllerExtraConfig"' @@ -32,7 +32,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: Controller.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - External\n - InternalApi\n - Storage\n - StorageMgmt\n - Tenant' - '\1\n tags:\n - primary\n - controller' - '\1\n description: |\n Controller role that has all the controler services loaded and handles\n Database, Messaging and Network functions.' @@ -42,7 +42,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: Compute$)' replace: "{{ item }}" - with_items: + loop: - '\1\n deprecated_server_resource_name: "NovaCompute"' - '\1\n deprecated_param_ips: "NovaComputeIPs"' - '\1\n deprecated_param_scheduler_hints: "NovaComputeSchedulerHints"' @@ -56,7 +56,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: Compute.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - InternalApi\n - Storage\n - Tenant' - '\1\n description: |\n Basic Compute Node role' @@ -65,7 +65,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: AltCompute.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - InternalApi\n - Storage\n - Tenant' - '\1\n description: |\n Basic Compute Node role' @@ -74,7 +74,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: BlockStorage.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - InternalApi\n - Storage\n - StorageMgmt' - '\1\n description: |\n Cinder Block Storage node role' @@ -83,7 +83,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: ObjectStorage$)' replace: "{{ item }}" - with_items: + loop: - '\1\n deprecated_param_flavor: "OvercloudSwiftStorageFlavor"' - '\1\n deprecated_param_image: "SwiftStorageImage"' - '\1\n deprecated_param_ips: "SwiftStorageIPs"' @@ -95,7 +95,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: ObjectStorage.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - InternalApi\n - Storage\n - StorageMgmt' - '\1\n description: |\n Swift Object Storage node role' @@ -104,7 +104,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: CephStorage.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - Storage\n - StorageMgmt' - '\1\n description: |\n Ceph OSD Storage node role' @@ -113,7 +113,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: Database.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - InternalApi' - '\1\n description: |\n Standalone database role with the database being managed via Pacemaker' @@ -122,7 +122,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: Galera.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - InternalApi' - '\1\n description: |\n Standalone database role with the database being managed via Pacemaker' @@ -131,7 +131,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: Networker.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - InternalApi\n - Tenant' - '\1\n description: |\n Standalone networking role to run Neutron agents' @@ -140,7 +140,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: Messaging.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - InternalApi' - '\1\n description: |\n Standalone messaging role with RabbitMQ being managed via Pacemaker' @@ -149,7 +149,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: Monitor.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - Storage' - '\1\n description: |\n Ceph Monitor role' @@ -158,7 +158,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '(- OS::TripleO::Services::Timezone)' replace: "{{ item }}" - with_items: + loop: - '\1\n - OS::TripleO::Services::CertmongerUser' - '\1\n - OS::TripleO::Services::Docker' - '\1\n - OS::TripleO::Services::Securetty' @@ -170,7 +170,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '(- .*CinderVolume)' replace: "{{ item }}" - with_items: + loop: - '\1\n - OS::TripleO::Services::CinderBackendVRTSHyperScale' - '\1\n - OS::TripleO::Services::CinderBackendDellEMCUnity' - '\1\n - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI' @@ -192,7 +192,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: "{{ item }}" replace: '\1\n - OS::TripleO::Services::Iscsid' - with_items: + loop: - '(- .*CinderVolume)' - '(- OS::TripleO::Services::NovaCompute)' @@ -201,7 +201,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '(- OS::TripleO::Services::NeutronApi)' replace: "{{ item }}" - with_items: + loop: - '\1\n - OS::TripleO::Services::NeutronBgpVpnApi' - '\1\n - OS::TripleO::Services::NeutronL2gwApi' @@ -210,7 +210,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '(- OS::TripleO::Services::NeutronL3Agent)' replace: "{{ item }}" - with_items: + loop: - '\1\n - OS::TripleO::Services::NeutronL2gwAgent' - '\1\n - OS::TripleO::Services::NeutronLbaasv2Agent' @@ -219,7 +219,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '(- .*NeutronOvsAgent)' replace: "{{ item }}" - with_items: + loop: - '\1\n - OS::TripleO::Services::NeutronVppAgent' - '\1\n - OS::TripleO::Services::NeutronLinuxbridgeAgent' - '\1\n - OS::TripleO::Services::Vpp' @@ -241,7 +241,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '(- OS::TripleO::Services::ManilaShare)' replace: "{{ item }}" - with_items: + loop: - '\1\n - OS::TripleO::Services::ManilaBackendIsilon' - '\1\n - OS::TripleO::Services::ManilaBackendUnity' - '\1\n - OS::TripleO::Services::ManilaBackendVMAX' diff --git a/tasks/common/create_http_test_scripts.yml b/tasks/common/create_http_test_scripts.yml index d04b565a..3a5572a4 100644 --- a/tasks/common/create_http_test_scripts.yml +++ b/tasks/common/create_http_test_scripts.yml @@ -4,6 +4,6 @@ src: "{{ item }}" dest: "{{ working_dir }}/{{ item.split('.') | first }}.sh" mode: 0775 - with_items: + loop: - 'fip_http_check_start.sh.j2' - 'fip_http_check_stop.sh.j2' diff --git a/tasks/common/load_roles_from_inventory.yaml b/tasks/common/load_roles_from_inventory.yaml index 4276eeb5..0b383810 100644 --- a/tasks/common/load_roles_from_inventory.yaml +++ b/tasks/common/load_roles_from_inventory.yaml @@ -19,7 +19,7 @@ set_fact: controller_role_name: "{{ item|regex_search('[A-Za-z0-9]*[Cc]ontroller[A-Za-z0-9]*') }}" when: item|regex_search('[A-Za-z0-9]*[Cc]ontroller[A-Za-z0-9]*') - with_items: "{{ oc_roles }}" + loop: "{{ oc_roles }}" - name: store sorted roles with controller first(default) set_fact: diff --git a/tasks/common/queens_to_rocky_adjust_nic_templates.yaml b/tasks/common/queens_to_rocky_adjust_nic_templates.yaml index ba9f8eac..3a46448b 100644 --- a/tasks/common/queens_to_rocky_adjust_nic_templates.yaml +++ b/tasks/common/queens_to_rocky_adjust_nic_templates.yaml @@ -4,15 +4,13 @@ grep "OS::TripleO::.*::Net::SoftwareConfig" {{ item }} ignore_errors: true register: nic_config_envs - with_items: - - "{{ initial_env_file.stdout_lines }}" + loop: "{{ initial_env_file.stdout_lines }}" - name: set nic_config_env fact set_fact: nic_config_env: "{{ item.item }}" when: item.stdout|length > 0 - with_items: - - "{{ nic_config_envs.results }}" + loop: "{{ nic_config_envs.results }}" - block: - name: register nic templates files defined in the environment file @@ -37,7 +35,6 @@ when: - "(item[0] == '/' and tht_directory not in item) or \ (item[0] != '/' and tht_directory not in '/'.join(nic_config_env.split('/')[0:-1]))" - with_items: - - "{{ nic_template_files.stdout_lines }}" + loop: "{{ nic_template_files.stdout_lines }}" when: nic_config_env is defined diff --git a/tasks/fast-forward-upgrade/convert_roles_data.yaml b/tasks/fast-forward-upgrade/convert_roles_data.yaml index 59228762..cb80d8ac 100644 --- a/tasks/fast-forward-upgrade/convert_roles_data.yaml +++ b/tasks/fast-forward-upgrade/convert_roles_data.yaml @@ -21,7 +21,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: "{{ item }}" state: absent - with_items: + loop: - 'OS::TripleO::Services::Core' - 'OS::TripleO::Services::VipHosts' - 'OS::TripleO::Services::FluentdClient' @@ -32,7 +32,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: "^(- name: Controller( # the 'primary' role goes first)?$)" replace: "{{ item }}" - with_items: + loop: - '\1\n deprecated_param_image: "controllerImage"' - '\1\n deprecated_param_flavor: "OvercloudControlFlavor"' - '\1\n deprecated_param_extraconfig: "controllerExtraConfig"' @@ -47,7 +47,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: Controller.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - External\n - InternalApi\n - Storage\n - StorageMgmt\n - Tenant' - '\1\n tags:\n - primary\n - controller' - '\1\n {{ ctr_desc }}' @@ -57,7 +57,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: Compute$)' replace: "{{ item }}" - with_items: + loop: - '\1\n deprecated_server_resource_name: "NovaCompute"' - '\1\n deprecated_param_ips: "NovaComputeIPs"' - '\1\n deprecated_param_scheduler_hints: "NovaComputeSchedulerHints"' @@ -71,7 +71,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: Compute.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - InternalApi\n - Storage\n - Tenant' - '\1\n description: |\n Basic Compute Node role' @@ -86,7 +86,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: CephStorage.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - Storage\n - StorageMgmt' - '\1\n description: |\n Ceph OSD Storage node role' @@ -95,7 +95,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '^(- name: Networker.*)' replace: "{{ item }}" - with_items: + loop: - '\1\n networks:\n - InternalApi\n - Tenant' - '\1\n description: |\n Standalone networking role to run Neutron agents' @@ -104,7 +104,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '(- OS::TripleO::Services::Timezone)' replace: "{{ item }}" - with_items: + loop: - '\1\n - OS::TripleO::Services::AuditD' - '\1\n - OS::TripleO::Services::Collectd' - '\1\n - OS::TripleO::Services::MySQLClient' @@ -121,7 +121,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '(- OS::TripleO::Services::NovaApi$)' replace: "{{ item }}" - with_items: + loop: - '\1\n - OS::TripleO::Services::NovaPlacement' - '\1\n - OS::TripleO::Services::Ec2Api' @@ -130,7 +130,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '(- OS::TripleO::Services::CephMon$)' replace: "{{ item }}" - with_items: + loop: - '\1\n - OS::TripleO::Services::CephMgr' - '\1\n - OS::TripleO::Services::CephMds' - '\1\n - OS::TripleO::Services::CephRbdMirror' @@ -140,7 +140,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: '(- OS::TripleO::Services::CeilometerApi$)' replace: "{{ item }}" - with_items: + loop: - '\1\n - OS::TripleO::Services::PankoApi' - name: Add Clustercheck service introduced in Pike @@ -154,7 +154,7 @@ dest: '{{ custom_roles_file.stdout }}' regexp: "{{ item }}" replace: '\1\n - OS::TripleO::Services::Iscsid' - with_items: + loop: - '(- .*CinderVolume)' - '(- OS::TripleO::Services::NovaCompute)' diff --git a/tasks/fast-forward-upgrade/create-prepare-scripts.yaml b/tasks/fast-forward-upgrade/create-prepare-scripts.yaml index 5c5d6231..c2f51103 100644 --- a/tasks/fast-forward-upgrade/create-prepare-scripts.yaml +++ b/tasks/fast-forward-upgrade/create-prepare-scripts.yaml @@ -40,7 +40,7 @@ src: fast-forward-upgrade/workarounds.sh.j2 dest: "{{ working_dir }}/{{ item }}.sh" mode: 0775 - with_items: + loop: - 'pre_ffu_undercloud_upgrade_workarounds' - 'post_ffu_undercloud_upgrade_workarounds' - 'pre_ffu_overcloud_prepare_workarounds' diff --git a/tasks/fast-forward-upgrade/main.yml b/tasks/fast-forward-upgrade/main.yml index 7f7b18e0..bdfb8544 100644 --- a/tasks/fast-forward-upgrade/main.yml +++ b/tasks/fast-forward-upgrade/main.yml @@ -16,7 +16,7 @@ tags: create_ffu_scripts loop_control: loop_var: current_release - with_items: "{{ ffu_undercloud_releases }}" + loop: "{{ ffu_undercloud_releases }}" when: ffu_noop|bool or ffu_undercloud_upgrade|bool or ffu_overcloud_upgrade|bool - block: @@ -24,7 +24,7 @@ include_tasks: undercloud-upgrade.yml loop_control: loop_var: current_release - with_items: "{{ ffu_undercloud_releases }}" + loop: "{{ ffu_undercloud_releases }}" - name: apply post ffu undercloud upgrade workarounds command: "{{ working_dir }}/post_ffu_undercloud_upgrade_workarounds.sh" @@ -45,7 +45,7 @@ args: apply: tags: ffu_overcloud_prepare - with_items: + loop: - '../common/l3_agent_connectivity_check_start_script.yml' - '../common/l3_agent_failover_check_pre_script.yml' tags: ffu_overcloud_prepare @@ -78,7 +78,7 @@ args: apply: tags: ffu_overcloud_prepare - with_items: + loop: - '../common/l3_agent_connectivity_check_stop_script.yml' - '../common/l3_agent_failover_check_post_script.yml' tags: ffu_overcloud_prepare @@ -141,7 +141,7 @@ args: apply: tags: ffu_overcloud_ceph - with_items: + loop: - '../common/l3_agent_connectivity_check_stop_script.yml' - '../common/l3_agent_failover_check_post_script.yml' tags: ffu_overcloud_ceph diff --git a/tasks/fast-forward-upgrade/overcloud_bulk.yaml b/tasks/fast-forward-upgrade/overcloud_bulk.yaml index f48f6883..c2262dac 100644 --- a/tasks/fast-forward-upgrade/overcloud_bulk.yaml +++ b/tasks/fast-forward-upgrade/overcloud_bulk.yaml @@ -5,7 +5,7 @@ dest: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh" mode: 0775 tags: ffu_overcloud_upgrade - with_items: + loop: - "all" - name: apply pre overcloud upgrade run workarounds @@ -26,7 +26,7 @@ args: apply: tags: ffu_overcloud_upgrade - with_items: + loop: - '../common/l3_agent_connectivity_check_stop_script.yml' - '../common/l3_agent_failover_check_post_script.yml' tags: ffu_overcloud_upgrade diff --git a/tasks/fast-forward-upgrade/overcloud_role.yaml b/tasks/fast-forward-upgrade/overcloud_role.yaml index 2c158eba..d46e8dc7 100644 --- a/tasks/fast-forward-upgrade/overcloud_role.yaml +++ b/tasks/fast-forward-upgrade/overcloud_role.yaml @@ -8,7 +8,7 @@ dest: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh" mode: 0775 tags: ffu_overcloud_upgrade_controller - with_items: "{{ oc_roles|default([]) }}" + loop: "{{ oc_roles|default([]) }}" - name: start L3 connectivity check import_tasks: ../common/l3_agent_connectivity_check_start_script.yml @@ -22,12 +22,11 @@ - name: run FFU control plane ugrade scripts command: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh" tags: ffu_overcloud_upgrade_controller - with_items: - - "{{ oc_roles|difference(['Compute','ComputeAlt','CephStorage']) }}" + loop: "{{ oc_roles|difference(['Compute','ComputeAlt','CephStorage']) }}" - name: run L3 validation include_tasks: "{{ item }}" - with_items: + loop: - '../common/l3_agent_connectivity_check_stop_script.yml' - '../common/l3_agent_failover_check_post_script.yml' tags: ffu_overcloud_upgrade_controller @@ -39,8 +38,7 @@ - name: run FFU compute ugrade scripts command: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh" tags: ffu_overcloud_upgrade_compute - with_items: - - "{{ oc_roles|intersect(['Compute','ComputeAlt']) }}" + loop: "{{ oc_roles|intersect(['Compute','ComputeAlt']) }}" when: - not ffu_computes_rolling|bool @@ -61,8 +59,7 @@ dest: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh" mode: 0775 tags: ffu_overcloud_upgrade_compute - with_items: - - '{{ tripleo_compute_nodes.stdout_lines }}' + loop: '{{ tripleo_compute_nodes.stdout_lines }}' - name: start L3 connectivity check import_tasks: ../common/l3_agent_connectivity_check_start_script.yml @@ -71,8 +68,7 @@ - name: Rolling upgrade compute nodes command: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh" tags: ffu_overcloud_upgrade_compute - with_items: - - '{{ tripleo_compute_nodes.stdout_lines }}' + loop: '{{ tripleo_compute_nodes.stdout_lines }}' - name: validate L3 connectivity result import_tasks: ../common/l3_agent_connectivity_check_stop_script.yml diff --git a/tasks/update/create-overcloud-update-scripts.yaml b/tasks/update/create-overcloud-update-scripts.yaml index 685a52a7..e7f27a04 100644 --- a/tasks/update/create-overcloud-update-scripts.yaml +++ b/tasks/update/create-overcloud-update-scripts.yaml @@ -20,7 +20,7 @@ dest: "{{ working_dir }}/{{ item.script }}" mode: 0755 force: true - with_items: + loop: - '{{ pre_overcloud_update_prepare_workarounds|default([]) }}' - '{{ post_overcloud_update_prepare_workarounds|default([]) }}' - '{{ pre_overcloud_update_run_workarounds|default([]) }}' @@ -55,8 +55,7 @@ dest: "{{ overcloud_update_run_script_base }}-{{ item }}.sh" mode: 0775 force: true - with_items: - - "{{ oc_roles|default('all') }}" + loop: "{{ oc_roles|default(['all']) }}" - name: create online data migration script template: diff --git a/tasks/update/create-undercloud-update-scripts.yaml b/tasks/update/create-undercloud-update-scripts.yaml index 53f4e581..f9e45dc6 100644 --- a/tasks/update/create-undercloud-update-scripts.yaml +++ b/tasks/update/create-undercloud-update-scripts.yaml @@ -12,7 +12,6 @@ dest: "{{ working_dir }}/{{ item.script }}" mode: 0755 force: true - with_items: - - '{{ pre_undercloud_update_workarounds|default([]) }}' - - '{{ post_undercloud_update_workarounds|default([]) }}' + loop: '{{ pre_undercloud_update_workarounds|default([]) + + post_undercloud_update_workarounds|default([]) }}' when: updates_workarounds|bool diff --git a/tasks/update/overcloud_update_run.yml b/tasks/update/overcloud_update_run.yml index 3494f51b..06f7404d 100644 --- a/tasks/update/overcloud_update_run.yml +++ b/tasks/update/overcloud_update_run.yml @@ -7,14 +7,13 @@ set -o pipefail bash {{ overcloud_update_run_script_base }}-{{ item }}.sh 2>&1 {{ timestamper_cmd }} > \ {{ working_dir }}/overcloud_update_run_{{ item }}.log - with_items: - - "{{ oc_roles|default('all') }}" + loop: "{{ oc_roles|default(['all']) }}" register: overcloud_update_nodes ignore_errors: true - name: was the overcloud minor update successful. fail: msg="Overcloud minor update execution step failed..." - with_items: "{{ overcloud_update_nodes.results }}" + loop: "{{ overcloud_update_nodes.results }}" when: item.rc != 0 - name: import tasks from l3_agent_connectivity_check_stop_script diff --git a/tasks/upgrade/controller_node_upgrade.yml b/tasks/upgrade/controller_node_upgrade.yml index 683c6809..b0acad54 100644 --- a/tasks/upgrade/controller_node_upgrade.yml +++ b/tasks/upgrade/controller_node_upgrade.yml @@ -1,7 +1,7 @@ --- - name: Running post upgrade scripts for {{ node_name | splitext | first }} shell: "set -o pipefail && {{ working_dir }}/{{ node_name | splitext | first }}_post/{{ item }}.sh" - with_items: + loop: - 'haproxy' - 'haproxy_backend' - 'rabbitmq' diff --git a/tasks/upgrade/controller_post_upgrade.yml b/tasks/upgrade/controller_post_upgrade.yml index a18fef37..3bcfc36d 100644 --- a/tasks/upgrade/controller_post_upgrade.yml +++ b/tasks/upgrade/controller_post_upgrade.yml @@ -6,6 +6,6 @@ register: controllers - include_tasks: controller_node_upgrade.yml - with_items: "{{ controllers.stdout_lines }}" + loop: "{{ controllers.stdout_lines }}" loop_control: loop_var: node_name diff --git a/tasks/upgrade/create-overcloud-upgrade-scripts.yaml b/tasks/upgrade/create-overcloud-upgrade-scripts.yaml index 81e9be81..78c0289f 100644 --- a/tasks/upgrade/create-overcloud-upgrade-scripts.yaml +++ b/tasks/upgrade/create-overcloud-upgrade-scripts.yaml @@ -39,7 +39,7 @@ src: workarounds.sh.j2 dest: "{{ working_dir }}/{{ item }}.sh" mode: 0775 - with_items: + loop: - 'pre_overcloud_upgrade_prepare_workarounds' - 'post_overcloud_upgrade_prepare_workarounds' - 'pre_overcloud_upgrade_workarounds' @@ -73,8 +73,7 @@ dest: "{{ overcloud_upgrade_run_script_base }}-{{ item }}.sh" mode: 0775 force: true - with_items: - - "{{ oc_roles|default('all') }}" + loop: "{{ oc_roles|default(['all']) }}" - name: create online data migration script template: diff --git a/tasks/upgrade/create-undercloud-upgrade-scripts.yaml b/tasks/upgrade/create-undercloud-upgrade-scripts.yaml index 5313c758..63f7838f 100644 --- a/tasks/upgrade/create-undercloud-upgrade-scripts.yaml +++ b/tasks/upgrade/create-undercloud-upgrade-scripts.yaml @@ -11,7 +11,7 @@ src: workarounds.sh.j2 dest: "{{ working_dir }}/{{ item }}.sh" mode: 0775 - with_items: + loop: - 'pre_undercloud_upgrade_workarounds' - 'post_undercloud_upgrade_workarounds' when: upgrade_workarounds diff --git a/tasks/upgrade/overcloud_upgrade_run.yml b/tasks/upgrade/overcloud_upgrade_run.yml index dd508ccc..f9caf1db 100644 --- a/tasks/upgrade/overcloud_upgrade_run.yml +++ b/tasks/upgrade/overcloud_upgrade_run.yml @@ -4,12 +4,11 @@ set -o pipefail bash {{ overcloud_upgrade_run_script_base }}-{{ item }}.sh 2>&1 {{ timestamper_cmd }} > \ {{ working_dir }}/overcloud_upgrade_run_{{ item }}.log - with_items: - - "{{ oc_roles|default('all') }}" + loop: "{{ oc_roles|default(['all']) }}" register: overcloud_upgrade_nodes ignore_errors: true - name: was the overcloud upgrade composable step successful. fail: msg="Overcloud upgrade composable step failed... :(" - with_items: "{{ overcloud_upgrade_nodes.results }}" + loop: "{{ overcloud_upgrade_nodes.results }}" when: item.rc != 0 diff --git a/tasks/upgrade/undercloud_ssl_camap.yaml b/tasks/upgrade/undercloud_ssl_camap.yaml index d54f171b..77b79d33 100644 --- a/tasks/upgrade/undercloud_ssl_camap.yaml +++ b/tasks/upgrade/undercloud_ssl_camap.yaml @@ -96,6 +96,5 @@ shell: | scp -q -o StrictHostKeyChecking=no {{ working_dir }}/undercloud.pem {{ oc_user }}@{{ item }}: ssh -q -o StrictHostKeyChecking=no {{ oc_user }}@{{ item }} 'sudo cp undercloud.pem /etc/pki/ca-trust/source/anchors/; sudo update-ca-trust extract' - with_items: - - "{{ node_ip.stdout_lines }}" + loop: "{{ node_ip.stdout_lines }}" when: uc_keystone_conn|failed diff --git a/tasks/upgrade/use_oooq.yaml b/tasks/upgrade/use_oooq.yaml index 97ca452f..7a04becc 100644 --- a/tasks/upgrade/use_oooq.yaml +++ b/tasks/upgrade/use_oooq.yaml @@ -8,8 +8,7 @@ name: "{{ item }}" group: compute ansible_fqdn: "{{ item }}" - with_items: - - "{{ compute.stdout_lines|default([]) }}" + loop: "{{ compute.stdout_lines|default([]) }}" - name: create transformation script template: