Migrate from with_X loop.
With the release of Ansible 2.5, the recommended way to perform
loops is the use the new loop keyword instead of with_X style loops.
This review addresses aforementioned change for common tasks
within tripleo-upgrade role.
Change-Id: I70d387b381b6ce297507cbfe669ea7be902df605
(cherry picked from commit b25817a233
)
This commit is contained in:
parent
f1768392df
commit
876c3334a7
|
@ -4,7 +4,7 @@
|
||||||
path: "{{ roles_data }}"
|
path: "{{ roles_data }}"
|
||||||
regexp: '(\s+)(- OS::TripleO::Services::RabbitMQ$)'
|
regexp: '(\s+)(- OS::TripleO::Services::RabbitMQ$)'
|
||||||
replace: '\1\2\1- {{ item }}'
|
replace: '\1\2\1- {{ item }}'
|
||||||
with_items:
|
loop:
|
||||||
- "OS::TripleO::Services::OsloMessagingRpc"
|
- "OS::TripleO::Services::OsloMessagingRpc"
|
||||||
- "OS::TripleO::Services::OsloMessagingNotify"
|
- "OS::TripleO::Services::OsloMessagingNotify"
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@
|
||||||
dest: "{{ roles_data }}"
|
dest: "{{ roles_data }}"
|
||||||
regexp: '(\s+)(- OS::TripleO::Services::{{ item }}$)'
|
regexp: '(\s+)(- OS::TripleO::Services::{{ item }}$)'
|
||||||
replace: ''
|
replace: ''
|
||||||
with_items:
|
loop:
|
||||||
- CeilometerApi
|
- CeilometerApi
|
||||||
- CeilometerCollector
|
- CeilometerCollector
|
||||||
- CeilometerExpirer
|
- CeilometerExpirer
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
src: "check_service_{{ item }}.sh.j2"
|
src: "check_service_{{ item }}.sh.j2"
|
||||||
dest: "{{ working_dir }}/{{ node_name | splitext | first }}_post/{{ item }}.sh"
|
dest: "{{ working_dir }}/{{ node_name | splitext | first }}_post/{{ item }}.sh"
|
||||||
mode: 0775
|
mode: 0775
|
||||||
with_items:
|
loop:
|
||||||
- 'haproxy'
|
- 'haproxy'
|
||||||
- 'haproxy_backend'
|
- 'haproxy_backend'
|
||||||
- 'rabbitmq'
|
- 'rabbitmq'
|
||||||
|
|
|
@ -8,4 +8,4 @@
|
||||||
- include_tasks: controller_post_script.yml
|
- include_tasks: controller_post_script.yml
|
||||||
loop_control:
|
loop_control:
|
||||||
loop_var: node_name
|
loop_var: node_name
|
||||||
with_items: "{{ controllers.stdout_lines }}"
|
loop: "{{ controllers.stdout_lines }}"
|
||||||
|
|
|
@ -20,15 +20,13 @@
|
||||||
grep 'ceph::profile::params::osds' {{ item }}
|
grep 'ceph::profile::params::osds' {{ item }}
|
||||||
ignore_errors: true
|
ignore_errors: true
|
||||||
register: osd_env
|
register: osd_env
|
||||||
with_items:
|
loop: "{{ envs.stdout_lines }}"
|
||||||
- "{{ envs.stdout_lines }}"
|
|
||||||
|
|
||||||
- name: set ceph_env fact
|
- name: set ceph_env fact
|
||||||
set_fact:
|
set_fact:
|
||||||
ceph_env: "{{ item.item }}"
|
ceph_env: "{{ item.item }}"
|
||||||
when: item.stdout|length > 0
|
when: item.stdout|length > 0
|
||||||
with_items:
|
loop: "{{ osd_env.results }}"
|
||||||
- "{{ osd_env.results }}"
|
|
||||||
|
|
||||||
- block:
|
- block:
|
||||||
- name: make a copy of the initial environment file
|
- name: make a copy of the initial environment file
|
||||||
|
@ -74,7 +72,7 @@
|
||||||
path: "{{ ceph_env }}"
|
path: "{{ ceph_env }}"
|
||||||
regexp: "{{ item }}"
|
regexp: "{{ item }}"
|
||||||
state: absent
|
state: absent
|
||||||
with_items:
|
loop:
|
||||||
- "ceph::profile::params::osd_pool_default_pg_num"
|
- "ceph::profile::params::osd_pool_default_pg_num"
|
||||||
- "ceph::profile::params::osd_pool_default_pgp_num"
|
- "ceph::profile::params::osd_pool_default_pgp_num"
|
||||||
- "ceph::profile::params::osds"
|
- "ceph::profile::params::osds"
|
||||||
|
@ -90,7 +88,7 @@
|
||||||
path: "{{ ceph_env }}"
|
path: "{{ ceph_env }}"
|
||||||
regexp: "{{ item }}"
|
regexp: "{{ item }}"
|
||||||
state: absent
|
state: absent
|
||||||
with_items: "{{ ceph_osds }}"
|
loop: "{{ ceph_osds }}"
|
||||||
|
|
||||||
- name: register new environment file
|
- name: register new environment file
|
||||||
command: "cat {{ ceph_env }}"
|
command: "cat {{ ceph_env }}"
|
||||||
|
|
|
@ -4,15 +4,13 @@
|
||||||
grep "OS::TripleO::.*::Net::SoftwareConfig" {{ item }}
|
grep "OS::TripleO::.*::Net::SoftwareConfig" {{ item }}
|
||||||
ignore_errors: true
|
ignore_errors: true
|
||||||
register: nic_config_envs
|
register: nic_config_envs
|
||||||
with_items:
|
loop: "{{ initial_env_file.stdout_lines }}"
|
||||||
- "{{ initial_env_file.stdout_lines }}"
|
|
||||||
|
|
||||||
- name: set nic_config_env fact
|
- name: set nic_config_env fact
|
||||||
set_fact:
|
set_fact:
|
||||||
nic_config_env: "{{ item.item }}"
|
nic_config_env: "{{ item.item }}"
|
||||||
when: item.stdout|length > 0
|
when: item.stdout|length > 0
|
||||||
with_items:
|
loop: "{{ nic_config_envs.results }}"
|
||||||
- "{{ nic_config_envs.results }}"
|
|
||||||
|
|
||||||
- block:
|
- block:
|
||||||
- name: register nic templates files defined in the environment file
|
- name: register nic templates files defined in the environment file
|
||||||
|
@ -29,8 +27,7 @@
|
||||||
when:
|
when:
|
||||||
- "item[0] == '/'"
|
- "item[0] == '/'"
|
||||||
- "tht_directory not in item"
|
- "tht_directory not in item"
|
||||||
with_items:
|
loop: "{{ nic_template_files.stdout_lines }}"
|
||||||
- "{{ nic_template_files.stdout_lines }}"
|
|
||||||
|
|
||||||
- name: adjust nic templates in relative paths location
|
- name: adjust nic templates in relative paths location
|
||||||
shell: |
|
shell: |
|
||||||
|
@ -41,6 +38,5 @@
|
||||||
when:
|
when:
|
||||||
- "item[0] != '/'"
|
- "item[0] != '/'"
|
||||||
- "tht_directory not in '/'.join(nic_config_env.split('/')[0:-1])"
|
- "tht_directory not in '/'.join(nic_config_env.split('/')[0:-1])"
|
||||||
with_items:
|
loop: "{{ nic_template_files.stdout_lines }}"
|
||||||
- "{{ nic_template_files.stdout_lines }}"
|
|
||||||
when: nic_config_env is defined
|
when: nic_config_env is defined
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: "^(- name: Controller( # the 'primary' role goes first)?$)"
|
regexp: "^(- name: Controller( # the 'primary' role goes first)?$)"
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n deprecated_param_image: "controllerImage"'
|
- '\1\n deprecated_param_image: "controllerImage"'
|
||||||
- '\1\n deprecated_param_flavor: "OvercloudControlFlavor"'
|
- '\1\n deprecated_param_flavor: "OvercloudControlFlavor"'
|
||||||
- '\1\n deprecated_param_extraconfig: "controllerExtraConfig"'
|
- '\1\n deprecated_param_extraconfig: "controllerExtraConfig"'
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: Controller.*)'
|
regexp: '^(- name: Controller.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - External\n - InternalApi\n - Storage\n - StorageMgmt\n - Tenant'
|
- '\1\n networks:\n - External\n - InternalApi\n - Storage\n - StorageMgmt\n - Tenant'
|
||||||
- '\1\n tags:\n - primary\n - controller'
|
- '\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.'
|
- '\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 }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: Compute$)'
|
regexp: '^(- name: Compute$)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n deprecated_server_resource_name: "NovaCompute"'
|
- '\1\n deprecated_server_resource_name: "NovaCompute"'
|
||||||
- '\1\n deprecated_param_ips: "NovaComputeIPs"'
|
- '\1\n deprecated_param_ips: "NovaComputeIPs"'
|
||||||
- '\1\n deprecated_param_scheduler_hints: "NovaComputeSchedulerHints"'
|
- '\1\n deprecated_param_scheduler_hints: "NovaComputeSchedulerHints"'
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: Compute.*)'
|
regexp: '^(- name: Compute.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - InternalApi\n - Storage\n - Tenant'
|
- '\1\n networks:\n - InternalApi\n - Storage\n - Tenant'
|
||||||
- '\1\n description: |\n Basic Compute Node role'
|
- '\1\n description: |\n Basic Compute Node role'
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: AltCompute.*)'
|
regexp: '^(- name: AltCompute.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - InternalApi\n - Storage\n - Tenant'
|
- '\1\n networks:\n - InternalApi\n - Storage\n - Tenant'
|
||||||
- '\1\n description: |\n Basic Compute Node role'
|
- '\1\n description: |\n Basic Compute Node role'
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: BlockStorage.*)'
|
regexp: '^(- name: BlockStorage.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - InternalApi\n - Storage\n - StorageMgmt'
|
- '\1\n networks:\n - InternalApi\n - Storage\n - StorageMgmt'
|
||||||
- '\1\n description: |\n Cinder Block Storage node role'
|
- '\1\n description: |\n Cinder Block Storage node role'
|
||||||
|
|
||||||
|
@ -83,7 +83,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: ObjectStorage$)'
|
regexp: '^(- name: ObjectStorage$)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n deprecated_param_flavor: "OvercloudSwiftStorageFlavor"'
|
- '\1\n deprecated_param_flavor: "OvercloudSwiftStorageFlavor"'
|
||||||
- '\1\n deprecated_param_image: "SwiftStorageImage"'
|
- '\1\n deprecated_param_image: "SwiftStorageImage"'
|
||||||
- '\1\n deprecated_param_ips: "SwiftStorageIPs"'
|
- '\1\n deprecated_param_ips: "SwiftStorageIPs"'
|
||||||
|
@ -95,7 +95,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: ObjectStorage.*)'
|
regexp: '^(- name: ObjectStorage.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - InternalApi\n - Storage\n - StorageMgmt'
|
- '\1\n networks:\n - InternalApi\n - Storage\n - StorageMgmt'
|
||||||
- '\1\n description: |\n Swift Object Storage node role'
|
- '\1\n description: |\n Swift Object Storage node role'
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: CephStorage.*)'
|
regexp: '^(- name: CephStorage.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - Storage\n - StorageMgmt'
|
- '\1\n networks:\n - Storage\n - StorageMgmt'
|
||||||
- '\1\n description: |\n Ceph OSD Storage node role'
|
- '\1\n description: |\n Ceph OSD Storage node role'
|
||||||
|
|
||||||
|
@ -113,7 +113,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: Database.*)'
|
regexp: '^(- name: Database.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - InternalApi'
|
- '\1\n networks:\n - InternalApi'
|
||||||
- '\1\n description: |\n Standalone database role with the database being managed via Pacemaker'
|
- '\1\n description: |\n Standalone database role with the database being managed via Pacemaker'
|
||||||
|
|
||||||
|
@ -122,7 +122,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: Galera.*)'
|
regexp: '^(- name: Galera.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - InternalApi'
|
- '\1\n networks:\n - InternalApi'
|
||||||
- '\1\n description: |\n Standalone database role with the database being managed via Pacemaker'
|
- '\1\n description: |\n Standalone database role with the database being managed via Pacemaker'
|
||||||
|
|
||||||
|
@ -131,7 +131,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: Networker.*)'
|
regexp: '^(- name: Networker.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - InternalApi\n - Tenant'
|
- '\1\n networks:\n - InternalApi\n - Tenant'
|
||||||
- '\1\n description: |\n Standalone networking role to run Neutron agents'
|
- '\1\n description: |\n Standalone networking role to run Neutron agents'
|
||||||
|
|
||||||
|
@ -140,7 +140,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: Messaging.*)'
|
regexp: '^(- name: Messaging.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - InternalApi'
|
- '\1\n networks:\n - InternalApi'
|
||||||
- '\1\n description: |\n Standalone messaging role with RabbitMQ being managed via Pacemaker'
|
- '\1\n description: |\n Standalone messaging role with RabbitMQ being managed via Pacemaker'
|
||||||
|
|
||||||
|
@ -149,7 +149,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: Monitor.*)'
|
regexp: '^(- name: Monitor.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - Storage'
|
- '\1\n networks:\n - Storage'
|
||||||
- '\1\n description: |\n Ceph Monitor role'
|
- '\1\n description: |\n Ceph Monitor role'
|
||||||
|
|
||||||
|
@ -158,7 +158,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '(- OS::TripleO::Services::Timezone)'
|
regexp: '(- OS::TripleO::Services::Timezone)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n - OS::TripleO::Services::CertmongerUser'
|
- '\1\n - OS::TripleO::Services::CertmongerUser'
|
||||||
- '\1\n - OS::TripleO::Services::Docker'
|
- '\1\n - OS::TripleO::Services::Docker'
|
||||||
- '\1\n - OS::TripleO::Services::Securetty'
|
- '\1\n - OS::TripleO::Services::Securetty'
|
||||||
|
@ -170,7 +170,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '(- .*CinderVolume)'
|
regexp: '(- .*CinderVolume)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n - OS::TripleO::Services::CinderBackendVRTSHyperScale'
|
- '\1\n - OS::TripleO::Services::CinderBackendVRTSHyperScale'
|
||||||
- '\1\n - OS::TripleO::Services::CinderBackendDellEMCUnity'
|
- '\1\n - OS::TripleO::Services::CinderBackendDellEMCUnity'
|
||||||
- '\1\n - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI'
|
- '\1\n - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI'
|
||||||
|
@ -192,7 +192,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: "{{ item }}"
|
regexp: "{{ item }}"
|
||||||
replace: '\1\n - OS::TripleO::Services::Iscsid'
|
replace: '\1\n - OS::TripleO::Services::Iscsid'
|
||||||
with_items:
|
loop:
|
||||||
- '(- .*CinderVolume)'
|
- '(- .*CinderVolume)'
|
||||||
- '(- OS::TripleO::Services::NovaCompute)'
|
- '(- OS::TripleO::Services::NovaCompute)'
|
||||||
|
|
||||||
|
@ -201,7 +201,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '(- OS::TripleO::Services::NeutronApi)'
|
regexp: '(- OS::TripleO::Services::NeutronApi)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n - OS::TripleO::Services::NeutronBgpVpnApi'
|
- '\1\n - OS::TripleO::Services::NeutronBgpVpnApi'
|
||||||
- '\1\n - OS::TripleO::Services::NeutronL2gwApi'
|
- '\1\n - OS::TripleO::Services::NeutronL2gwApi'
|
||||||
|
|
||||||
|
@ -210,7 +210,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '(- OS::TripleO::Services::NeutronL3Agent)'
|
regexp: '(- OS::TripleO::Services::NeutronL3Agent)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n - OS::TripleO::Services::NeutronL2gwAgent'
|
- '\1\n - OS::TripleO::Services::NeutronL2gwAgent'
|
||||||
- '\1\n - OS::TripleO::Services::NeutronLbaasv2Agent'
|
- '\1\n - OS::TripleO::Services::NeutronLbaasv2Agent'
|
||||||
|
|
||||||
|
@ -219,7 +219,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '(- .*NeutronOvsAgent)'
|
regexp: '(- .*NeutronOvsAgent)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n - OS::TripleO::Services::NeutronVppAgent'
|
- '\1\n - OS::TripleO::Services::NeutronVppAgent'
|
||||||
- '\1\n - OS::TripleO::Services::NeutronLinuxbridgeAgent'
|
- '\1\n - OS::TripleO::Services::NeutronLinuxbridgeAgent'
|
||||||
- '\1\n - OS::TripleO::Services::Vpp'
|
- '\1\n - OS::TripleO::Services::Vpp'
|
||||||
|
@ -241,7 +241,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '(- OS::TripleO::Services::ManilaShare)'
|
regexp: '(- OS::TripleO::Services::ManilaShare)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n - OS::TripleO::Services::ManilaBackendIsilon'
|
- '\1\n - OS::TripleO::Services::ManilaBackendIsilon'
|
||||||
- '\1\n - OS::TripleO::Services::ManilaBackendUnity'
|
- '\1\n - OS::TripleO::Services::ManilaBackendUnity'
|
||||||
- '\1\n - OS::TripleO::Services::ManilaBackendVMAX'
|
- '\1\n - OS::TripleO::Services::ManilaBackendVMAX'
|
||||||
|
|
|
@ -4,6 +4,6 @@
|
||||||
src: "{{ item }}"
|
src: "{{ item }}"
|
||||||
dest: "{{ working_dir }}/{{ item.split('.') | first }}.sh"
|
dest: "{{ working_dir }}/{{ item.split('.') | first }}.sh"
|
||||||
mode: 0775
|
mode: 0775
|
||||||
with_items:
|
loop:
|
||||||
- 'fip_http_check_start.sh.j2'
|
- 'fip_http_check_start.sh.j2'
|
||||||
- 'fip_http_check_stop.sh.j2'
|
- 'fip_http_check_stop.sh.j2'
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
set_fact:
|
set_fact:
|
||||||
controller_role_name: "{{ item|regex_search('[A-Za-z0-9]*[Cc]ontroller[A-Za-z0-9]*') }}"
|
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]*')
|
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)
|
- name: store sorted roles with controller first(default)
|
||||||
set_fact:
|
set_fact:
|
||||||
|
|
|
@ -4,15 +4,13 @@
|
||||||
grep "OS::TripleO::.*::Net::SoftwareConfig" {{ item }}
|
grep "OS::TripleO::.*::Net::SoftwareConfig" {{ item }}
|
||||||
ignore_errors: true
|
ignore_errors: true
|
||||||
register: nic_config_envs
|
register: nic_config_envs
|
||||||
with_items:
|
loop: "{{ initial_env_file.stdout_lines }}"
|
||||||
- "{{ initial_env_file.stdout_lines }}"
|
|
||||||
|
|
||||||
- name: set nic_config_env fact
|
- name: set nic_config_env fact
|
||||||
set_fact:
|
set_fact:
|
||||||
nic_config_env: "{{ item.item }}"
|
nic_config_env: "{{ item.item }}"
|
||||||
when: item.stdout|length > 0
|
when: item.stdout|length > 0
|
||||||
with_items:
|
loop: "{{ nic_config_envs.results }}"
|
||||||
- "{{ nic_config_envs.results }}"
|
|
||||||
|
|
||||||
- block:
|
- block:
|
||||||
- name: register nic templates files defined in the environment file
|
- name: register nic templates files defined in the environment file
|
||||||
|
@ -37,7 +35,6 @@
|
||||||
when:
|
when:
|
||||||
- "(item[0] == '/' and tht_directory not in item) or \
|
- "(item[0] == '/' and tht_directory not in item) or \
|
||||||
(item[0] != '/' and tht_directory not in '/'.join(nic_config_env.split('/')[0:-1]))"
|
(item[0] != '/' and tht_directory not in '/'.join(nic_config_env.split('/')[0:-1]))"
|
||||||
with_items:
|
loop: "{{ nic_template_files.stdout_lines }}"
|
||||||
- "{{ nic_template_files.stdout_lines }}"
|
|
||||||
|
|
||||||
when: nic_config_env is defined
|
when: nic_config_env is defined
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: "{{ item }}"
|
regexp: "{{ item }}"
|
||||||
state: absent
|
state: absent
|
||||||
with_items:
|
loop:
|
||||||
- 'OS::TripleO::Services::Core'
|
- 'OS::TripleO::Services::Core'
|
||||||
- 'OS::TripleO::Services::VipHosts'
|
- 'OS::TripleO::Services::VipHosts'
|
||||||
- 'OS::TripleO::Services::FluentdClient'
|
- 'OS::TripleO::Services::FluentdClient'
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: "^(- name: Controller( # the 'primary' role goes first)?$)"
|
regexp: "^(- name: Controller( # the 'primary' role goes first)?$)"
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n deprecated_param_image: "controllerImage"'
|
- '\1\n deprecated_param_image: "controllerImage"'
|
||||||
- '\1\n deprecated_param_flavor: "OvercloudControlFlavor"'
|
- '\1\n deprecated_param_flavor: "OvercloudControlFlavor"'
|
||||||
- '\1\n deprecated_param_extraconfig: "controllerExtraConfig"'
|
- '\1\n deprecated_param_extraconfig: "controllerExtraConfig"'
|
||||||
|
@ -47,7 +47,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: Controller.*)'
|
regexp: '^(- name: Controller.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - External\n - InternalApi\n - Storage\n - StorageMgmt\n - Tenant'
|
- '\1\n networks:\n - External\n - InternalApi\n - Storage\n - StorageMgmt\n - Tenant'
|
||||||
- '\1\n tags:\n - primary\n - controller'
|
- '\1\n tags:\n - primary\n - controller'
|
||||||
- '\1\n {{ ctr_desc }}'
|
- '\1\n {{ ctr_desc }}'
|
||||||
|
@ -57,7 +57,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: Compute$)'
|
regexp: '^(- name: Compute$)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n deprecated_server_resource_name: "NovaCompute"'
|
- '\1\n deprecated_server_resource_name: "NovaCompute"'
|
||||||
- '\1\n deprecated_param_ips: "NovaComputeIPs"'
|
- '\1\n deprecated_param_ips: "NovaComputeIPs"'
|
||||||
- '\1\n deprecated_param_scheduler_hints: "NovaComputeSchedulerHints"'
|
- '\1\n deprecated_param_scheduler_hints: "NovaComputeSchedulerHints"'
|
||||||
|
@ -71,7 +71,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: Compute.*)'
|
regexp: '^(- name: Compute.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - InternalApi\n - Storage\n - Tenant'
|
- '\1\n networks:\n - InternalApi\n - Storage\n - Tenant'
|
||||||
- '\1\n description: |\n Basic Compute Node role'
|
- '\1\n description: |\n Basic Compute Node role'
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: CephStorage.*)'
|
regexp: '^(- name: CephStorage.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - Storage\n - StorageMgmt'
|
- '\1\n networks:\n - Storage\n - StorageMgmt'
|
||||||
- '\1\n description: |\n Ceph OSD Storage node role'
|
- '\1\n description: |\n Ceph OSD Storage node role'
|
||||||
|
|
||||||
|
@ -95,7 +95,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '^(- name: Networker.*)'
|
regexp: '^(- name: Networker.*)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n networks:\n - InternalApi\n - Tenant'
|
- '\1\n networks:\n - InternalApi\n - Tenant'
|
||||||
- '\1\n description: |\n Standalone networking role to run Neutron agents'
|
- '\1\n description: |\n Standalone networking role to run Neutron agents'
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '(- OS::TripleO::Services::Timezone)'
|
regexp: '(- OS::TripleO::Services::Timezone)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n - OS::TripleO::Services::AuditD'
|
- '\1\n - OS::TripleO::Services::AuditD'
|
||||||
- '\1\n - OS::TripleO::Services::Collectd'
|
- '\1\n - OS::TripleO::Services::Collectd'
|
||||||
- '\1\n - OS::TripleO::Services::MySQLClient'
|
- '\1\n - OS::TripleO::Services::MySQLClient'
|
||||||
|
@ -121,7 +121,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '(- OS::TripleO::Services::NovaApi$)'
|
regexp: '(- OS::TripleO::Services::NovaApi$)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n - OS::TripleO::Services::NovaPlacement'
|
- '\1\n - OS::TripleO::Services::NovaPlacement'
|
||||||
- '\1\n - OS::TripleO::Services::Ec2Api'
|
- '\1\n - OS::TripleO::Services::Ec2Api'
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '(- OS::TripleO::Services::CephMon$)'
|
regexp: '(- OS::TripleO::Services::CephMon$)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n - OS::TripleO::Services::CephMgr'
|
- '\1\n - OS::TripleO::Services::CephMgr'
|
||||||
- '\1\n - OS::TripleO::Services::CephMds'
|
- '\1\n - OS::TripleO::Services::CephMds'
|
||||||
- '\1\n - OS::TripleO::Services::CephRbdMirror'
|
- '\1\n - OS::TripleO::Services::CephRbdMirror'
|
||||||
|
@ -140,7 +140,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: '(- OS::TripleO::Services::CeilometerApi$)'
|
regexp: '(- OS::TripleO::Services::CeilometerApi$)'
|
||||||
replace: "{{ item }}"
|
replace: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '\1\n - OS::TripleO::Services::PankoApi'
|
- '\1\n - OS::TripleO::Services::PankoApi'
|
||||||
|
|
||||||
- name: Add Clustercheck service introduced in Pike
|
- name: Add Clustercheck service introduced in Pike
|
||||||
|
@ -154,7 +154,7 @@
|
||||||
dest: '{{ custom_roles_file.stdout }}'
|
dest: '{{ custom_roles_file.stdout }}'
|
||||||
regexp: "{{ item }}"
|
regexp: "{{ item }}"
|
||||||
replace: '\1\n - OS::TripleO::Services::Iscsid'
|
replace: '\1\n - OS::TripleO::Services::Iscsid'
|
||||||
with_items:
|
loop:
|
||||||
- '(- .*CinderVolume)'
|
- '(- .*CinderVolume)'
|
||||||
- '(- OS::TripleO::Services::NovaCompute)'
|
- '(- OS::TripleO::Services::NovaCompute)'
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
src: fast-forward-upgrade/workarounds.sh.j2
|
src: fast-forward-upgrade/workarounds.sh.j2
|
||||||
dest: "{{ working_dir }}/{{ item }}.sh"
|
dest: "{{ working_dir }}/{{ item }}.sh"
|
||||||
mode: 0775
|
mode: 0775
|
||||||
with_items:
|
loop:
|
||||||
- 'pre_ffu_undercloud_upgrade_workarounds'
|
- 'pre_ffu_undercloud_upgrade_workarounds'
|
||||||
- 'post_ffu_undercloud_upgrade_workarounds'
|
- 'post_ffu_undercloud_upgrade_workarounds'
|
||||||
- 'pre_ffu_overcloud_prepare_workarounds'
|
- 'pre_ffu_overcloud_prepare_workarounds'
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
tags: create_ffu_scripts
|
tags: create_ffu_scripts
|
||||||
loop_control:
|
loop_control:
|
||||||
loop_var: current_release
|
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
|
when: ffu_noop|bool or ffu_undercloud_upgrade|bool or ffu_overcloud_upgrade|bool
|
||||||
|
|
||||||
- block:
|
- block:
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
include_tasks: undercloud-upgrade.yml
|
include_tasks: undercloud-upgrade.yml
|
||||||
loop_control:
|
loop_control:
|
||||||
loop_var: current_release
|
loop_var: current_release
|
||||||
with_items: "{{ ffu_undercloud_releases }}"
|
loop: "{{ ffu_undercloud_releases }}"
|
||||||
|
|
||||||
- name: apply post ffu undercloud upgrade workarounds
|
- name: apply post ffu undercloud upgrade workarounds
|
||||||
command: "{{ working_dir }}/post_ffu_undercloud_upgrade_workarounds.sh"
|
command: "{{ working_dir }}/post_ffu_undercloud_upgrade_workarounds.sh"
|
||||||
|
@ -45,7 +45,7 @@
|
||||||
args:
|
args:
|
||||||
apply:
|
apply:
|
||||||
tags: ffu_overcloud_prepare
|
tags: ffu_overcloud_prepare
|
||||||
with_items:
|
loop:
|
||||||
- '../common/l3_agent_connectivity_check_start_script.yml'
|
- '../common/l3_agent_connectivity_check_start_script.yml'
|
||||||
- '../common/l3_agent_failover_check_pre_script.yml'
|
- '../common/l3_agent_failover_check_pre_script.yml'
|
||||||
tags: ffu_overcloud_prepare
|
tags: ffu_overcloud_prepare
|
||||||
|
@ -78,7 +78,7 @@
|
||||||
args:
|
args:
|
||||||
apply:
|
apply:
|
||||||
tags: ffu_overcloud_prepare
|
tags: ffu_overcloud_prepare
|
||||||
with_items:
|
loop:
|
||||||
- '../common/l3_agent_connectivity_check_stop_script.yml'
|
- '../common/l3_agent_connectivity_check_stop_script.yml'
|
||||||
- '../common/l3_agent_failover_check_post_script.yml'
|
- '../common/l3_agent_failover_check_post_script.yml'
|
||||||
tags: ffu_overcloud_prepare
|
tags: ffu_overcloud_prepare
|
||||||
|
@ -141,7 +141,7 @@
|
||||||
args:
|
args:
|
||||||
apply:
|
apply:
|
||||||
tags: ffu_overcloud_ceph
|
tags: ffu_overcloud_ceph
|
||||||
with_items:
|
loop:
|
||||||
- '../common/l3_agent_connectivity_check_stop_script.yml'
|
- '../common/l3_agent_connectivity_check_stop_script.yml'
|
||||||
- '../common/l3_agent_failover_check_post_script.yml'
|
- '../common/l3_agent_failover_check_post_script.yml'
|
||||||
tags: ffu_overcloud_ceph
|
tags: ffu_overcloud_ceph
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
dest: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh"
|
dest: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh"
|
||||||
mode: 0775
|
mode: 0775
|
||||||
tags: ffu_overcloud_upgrade
|
tags: ffu_overcloud_upgrade
|
||||||
with_items:
|
loop:
|
||||||
- "all"
|
- "all"
|
||||||
|
|
||||||
- name: apply pre overcloud upgrade run workarounds
|
- name: apply pre overcloud upgrade run workarounds
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
args:
|
args:
|
||||||
apply:
|
apply:
|
||||||
tags: ffu_overcloud_upgrade
|
tags: ffu_overcloud_upgrade
|
||||||
with_items:
|
loop:
|
||||||
- '../common/l3_agent_connectivity_check_stop_script.yml'
|
- '../common/l3_agent_connectivity_check_stop_script.yml'
|
||||||
- '../common/l3_agent_failover_check_post_script.yml'
|
- '../common/l3_agent_failover_check_post_script.yml'
|
||||||
tags: ffu_overcloud_upgrade
|
tags: ffu_overcloud_upgrade
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
dest: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh"
|
dest: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh"
|
||||||
mode: 0775
|
mode: 0775
|
||||||
tags: ffu_overcloud_upgrade_controller
|
tags: ffu_overcloud_upgrade_controller
|
||||||
with_items: "{{ oc_roles|default([]) }}"
|
loop: "{{ oc_roles|default([]) }}"
|
||||||
|
|
||||||
- name: start L3 connectivity check
|
- name: start L3 connectivity check
|
||||||
import_tasks: ../common/l3_agent_connectivity_check_start_script.yml
|
import_tasks: ../common/l3_agent_connectivity_check_start_script.yml
|
||||||
|
@ -22,12 +22,11 @@
|
||||||
- name: run FFU control plane ugrade scripts
|
- name: run FFU control plane ugrade scripts
|
||||||
command: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh"
|
command: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh"
|
||||||
tags: ffu_overcloud_upgrade_controller
|
tags: ffu_overcloud_upgrade_controller
|
||||||
with_items:
|
loop: "{{ oc_roles|difference(['Compute','ComputeAlt','CephStorage']) }}"
|
||||||
- "{{ oc_roles|difference(['Compute','ComputeAlt','CephStorage']) }}"
|
|
||||||
|
|
||||||
- name: run L3 validation
|
- name: run L3 validation
|
||||||
include_tasks: "{{ item }}"
|
include_tasks: "{{ item }}"
|
||||||
with_items:
|
loop:
|
||||||
- '../common/l3_agent_connectivity_check_stop_script.yml'
|
- '../common/l3_agent_connectivity_check_stop_script.yml'
|
||||||
- '../common/l3_agent_failover_check_post_script.yml'
|
- '../common/l3_agent_failover_check_post_script.yml'
|
||||||
tags: ffu_overcloud_upgrade_controller
|
tags: ffu_overcloud_upgrade_controller
|
||||||
|
@ -39,8 +38,7 @@
|
||||||
- name: run FFU compute ugrade scripts
|
- name: run FFU compute ugrade scripts
|
||||||
command: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh"
|
command: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh"
|
||||||
tags: ffu_overcloud_upgrade_compute
|
tags: ffu_overcloud_upgrade_compute
|
||||||
with_items:
|
loop: "{{ oc_roles|intersect(['Compute','ComputeAlt']) }}"
|
||||||
- "{{ oc_roles|intersect(['Compute','ComputeAlt']) }}"
|
|
||||||
when:
|
when:
|
||||||
- not ffu_computes_rolling|bool
|
- not ffu_computes_rolling|bool
|
||||||
|
|
||||||
|
@ -61,8 +59,7 @@
|
||||||
dest: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh"
|
dest: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh"
|
||||||
mode: 0775
|
mode: 0775
|
||||||
tags: ffu_overcloud_upgrade_compute
|
tags: ffu_overcloud_upgrade_compute
|
||||||
with_items:
|
loop: '{{ tripleo_compute_nodes.stdout_lines }}'
|
||||||
- '{{ tripleo_compute_nodes.stdout_lines }}'
|
|
||||||
|
|
||||||
- name: start L3 connectivity check
|
- name: start L3 connectivity check
|
||||||
import_tasks: ../common/l3_agent_connectivity_check_start_script.yml
|
import_tasks: ../common/l3_agent_connectivity_check_start_script.yml
|
||||||
|
@ -71,8 +68,7 @@
|
||||||
- name: Rolling upgrade compute nodes
|
- name: Rolling upgrade compute nodes
|
||||||
command: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh"
|
command: "{{ working_dir }}/overcloud_upgrade_{{ item }}.sh"
|
||||||
tags: ffu_overcloud_upgrade_compute
|
tags: ffu_overcloud_upgrade_compute
|
||||||
with_items:
|
loop: '{{ tripleo_compute_nodes.stdout_lines }}'
|
||||||
- '{{ tripleo_compute_nodes.stdout_lines }}'
|
|
||||||
|
|
||||||
- name: validate L3 connectivity result
|
- name: validate L3 connectivity result
|
||||||
import_tasks: ../common/l3_agent_connectivity_check_stop_script.yml
|
import_tasks: ../common/l3_agent_connectivity_check_stop_script.yml
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
dest: "{{ working_dir }}/{{ item.script }}"
|
dest: "{{ working_dir }}/{{ item.script }}"
|
||||||
mode: 0755
|
mode: 0755
|
||||||
force: true
|
force: true
|
||||||
with_items:
|
loop:
|
||||||
- '{{ pre_overcloud_update_prepare_workarounds|default([]) }}'
|
- '{{ pre_overcloud_update_prepare_workarounds|default([]) }}'
|
||||||
- '{{ post_overcloud_update_prepare_workarounds|default([]) }}'
|
- '{{ post_overcloud_update_prepare_workarounds|default([]) }}'
|
||||||
- '{{ pre_overcloud_update_run_workarounds|default([]) }}'
|
- '{{ pre_overcloud_update_run_workarounds|default([]) }}'
|
||||||
|
@ -55,8 +55,7 @@
|
||||||
dest: "{{ overcloud_update_run_script_base }}-{{ item }}.sh"
|
dest: "{{ overcloud_update_run_script_base }}-{{ item }}.sh"
|
||||||
mode: 0775
|
mode: 0775
|
||||||
force: true
|
force: true
|
||||||
with_items:
|
loop: "{{ oc_roles|default(['all']) }}"
|
||||||
- "{{ oc_roles|default('all') }}"
|
|
||||||
|
|
||||||
- name: create online data migration script
|
- name: create online data migration script
|
||||||
template:
|
template:
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
dest: "{{ working_dir }}/{{ item.script }}"
|
dest: "{{ working_dir }}/{{ item.script }}"
|
||||||
mode: 0755
|
mode: 0755
|
||||||
force: true
|
force: true
|
||||||
with_items:
|
loop: '{{ pre_undercloud_update_workarounds|default([])
|
||||||
- '{{ pre_undercloud_update_workarounds|default([]) }}'
|
+ post_undercloud_update_workarounds|default([]) }}'
|
||||||
- '{{ post_undercloud_update_workarounds|default([]) }}'
|
|
||||||
when: updates_workarounds|bool
|
when: updates_workarounds|bool
|
||||||
|
|
|
@ -7,14 +7,13 @@
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
bash {{ overcloud_update_run_script_base }}-{{ item }}.sh 2>&1 {{ timestamper_cmd }} > \
|
bash {{ overcloud_update_run_script_base }}-{{ item }}.sh 2>&1 {{ timestamper_cmd }} > \
|
||||||
{{ working_dir }}/overcloud_update_run_{{ item }}.log
|
{{ working_dir }}/overcloud_update_run_{{ item }}.log
|
||||||
with_items:
|
loop: "{{ oc_roles|default(['all']) }}"
|
||||||
- "{{ oc_roles|default('all') }}"
|
|
||||||
register: overcloud_update_nodes
|
register: overcloud_update_nodes
|
||||||
ignore_errors: true
|
ignore_errors: true
|
||||||
|
|
||||||
- name: was the overcloud minor update successful.
|
- name: was the overcloud minor update successful.
|
||||||
fail: msg="Overcloud minor update execution step failed..."
|
fail: msg="Overcloud minor update execution step failed..."
|
||||||
with_items: "{{ overcloud_update_nodes.results }}"
|
loop: "{{ overcloud_update_nodes.results }}"
|
||||||
when: item.rc != 0
|
when: item.rc != 0
|
||||||
|
|
||||||
- name: import tasks from l3_agent_connectivity_check_stop_script
|
- name: import tasks from l3_agent_connectivity_check_stop_script
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
- name: Running post upgrade scripts for {{ node_name | splitext | first }}
|
- name: Running post upgrade scripts for {{ node_name | splitext | first }}
|
||||||
shell: "set -o pipefail && {{ working_dir }}/{{ node_name | splitext | first }}_post/{{ item }}.sh"
|
shell: "set -o pipefail && {{ working_dir }}/{{ node_name | splitext | first }}_post/{{ item }}.sh"
|
||||||
with_items:
|
loop:
|
||||||
- 'haproxy'
|
- 'haproxy'
|
||||||
- 'haproxy_backend'
|
- 'haproxy_backend'
|
||||||
- 'rabbitmq'
|
- 'rabbitmq'
|
||||||
|
|
|
@ -6,6 +6,6 @@
|
||||||
register: controllers
|
register: controllers
|
||||||
|
|
||||||
- include_tasks: controller_node_upgrade.yml
|
- include_tasks: controller_node_upgrade.yml
|
||||||
with_items: "{{ controllers.stdout_lines }}"
|
loop: "{{ controllers.stdout_lines }}"
|
||||||
loop_control:
|
loop_control:
|
||||||
loop_var: node_name
|
loop_var: node_name
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
src: workarounds.sh.j2
|
src: workarounds.sh.j2
|
||||||
dest: "{{ working_dir }}/{{ item }}.sh"
|
dest: "{{ working_dir }}/{{ item }}.sh"
|
||||||
mode: 0775
|
mode: 0775
|
||||||
with_items:
|
loop:
|
||||||
- 'pre_overcloud_upgrade_prepare_workarounds'
|
- 'pre_overcloud_upgrade_prepare_workarounds'
|
||||||
- 'post_overcloud_upgrade_prepare_workarounds'
|
- 'post_overcloud_upgrade_prepare_workarounds'
|
||||||
- 'pre_overcloud_upgrade_workarounds'
|
- 'pre_overcloud_upgrade_workarounds'
|
||||||
|
@ -73,8 +73,7 @@
|
||||||
dest: "{{ overcloud_upgrade_run_script_base }}-{{ item }}.sh"
|
dest: "{{ overcloud_upgrade_run_script_base }}-{{ item }}.sh"
|
||||||
mode: 0775
|
mode: 0775
|
||||||
force: true
|
force: true
|
||||||
with_items:
|
loop: "{{ oc_roles|default(['all']) }}"
|
||||||
- "{{ oc_roles|default('all') }}"
|
|
||||||
|
|
||||||
- name: create online data migration script
|
- name: create online data migration script
|
||||||
template:
|
template:
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
src: workarounds.sh.j2
|
src: workarounds.sh.j2
|
||||||
dest: "{{ working_dir }}/{{ item }}.sh"
|
dest: "{{ working_dir }}/{{ item }}.sh"
|
||||||
mode: 0775
|
mode: 0775
|
||||||
with_items:
|
loop:
|
||||||
- 'pre_undercloud_upgrade_workarounds'
|
- 'pre_undercloud_upgrade_workarounds'
|
||||||
- 'post_undercloud_upgrade_workarounds'
|
- 'post_undercloud_upgrade_workarounds'
|
||||||
when: upgrade_workarounds
|
when: upgrade_workarounds
|
||||||
|
|
|
@ -4,12 +4,11 @@
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
bash {{ overcloud_upgrade_run_script_base }}-{{ item }}.sh 2>&1 {{ timestamper_cmd }} > \
|
bash {{ overcloud_upgrade_run_script_base }}-{{ item }}.sh 2>&1 {{ timestamper_cmd }} > \
|
||||||
{{ working_dir }}/overcloud_upgrade_run_{{ item }}.log
|
{{ working_dir }}/overcloud_upgrade_run_{{ item }}.log
|
||||||
with_items:
|
loop: "{{ oc_roles|default(['all']) }}"
|
||||||
- "{{ oc_roles|default('all') }}"
|
|
||||||
register: overcloud_upgrade_nodes
|
register: overcloud_upgrade_nodes
|
||||||
ignore_errors: true
|
ignore_errors: true
|
||||||
|
|
||||||
- name: was the overcloud upgrade composable step successful.
|
- name: was the overcloud upgrade composable step successful.
|
||||||
fail: msg="Overcloud upgrade composable step failed... :("
|
fail: msg="Overcloud upgrade composable step failed... :("
|
||||||
with_items: "{{ overcloud_upgrade_nodes.results }}"
|
loop: "{{ overcloud_upgrade_nodes.results }}"
|
||||||
when: item.rc != 0
|
when: item.rc != 0
|
||||||
|
|
|
@ -96,6 +96,5 @@
|
||||||
shell: |
|
shell: |
|
||||||
scp -q -o StrictHostKeyChecking=no {{ working_dir }}/undercloud.pem {{ oc_user }}@{{ item }}:
|
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'
|
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:
|
loop: "{{ node_ip.stdout_lines }}"
|
||||||
- "{{ node_ip.stdout_lines }}"
|
|
||||||
when: uc_keystone_conn|failed
|
when: uc_keystone_conn|failed
|
||||||
|
|
|
@ -8,8 +8,7 @@
|
||||||
name: "{{ item }}"
|
name: "{{ item }}"
|
||||||
group: compute
|
group: compute
|
||||||
ansible_fqdn: "{{ item }}"
|
ansible_fqdn: "{{ item }}"
|
||||||
with_items:
|
loop: "{{ compute.stdout_lines|default([]) }}"
|
||||||
- "{{ compute.stdout_lines|default([]) }}"
|
|
||||||
|
|
||||||
- name: create transformation script
|
- name: create transformation script
|
||||||
template:
|
template:
|
||||||
|
|
Loading…
Reference in New Issue