From d18209799c7c3d66242e326528eeacae1e668b87 Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Mon, 19 Oct 2020 19:27:21 +0200 Subject: [PATCH] Run online migration tasks from external_update_tasks too. The minor update procedure has been suggesting the execution of the online db migrations step for few releases already, by the execution of the openstack overcloud external-update run --tags online_upgrade. However, this command has never executed any task at all as the online_upgrade tasks belong to the external_upgrade_tasks section. Instead of changing the interface in all releases by modifying the docs let's just fix this in the code. Change-Id: I4453e7c755cccc52bb135a14be1b04fdea53de6b Closes-Bug: #1900467 --- deployment/cinder/cinder-api-container-puppet.yaml | 5 ++++- deployment/ironic/ironic-api-container-puppet.yaml | 5 ++++- deployment/nova/nova-conductor-container-puppet.yaml | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 1dde966d65..99fe1c8027 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -389,7 +389,7 @@ outputs: - { 'path': /var/log/containers/httpd/cinder-api, 'setype': container_file_t, 'mode': '0750' } external_upgrade_tasks: - when: step|int == 1 - block: + block: &cinder_online_db_migration - name: Online data migration for Cinder command: "{{ container_cli }} exec cinder_api cinder-manage db online_data_migrations" delegate_to: "{{ groups['cinder_api'][0] }}" @@ -411,6 +411,9 @@ outputs: - cinder_api - cinder_api_cron tripleo_delegate_to: "{{ groups['cinder_api'] | default([]) }}" + external_update_tasks: + - when: step|int == 1 + block: *cinder_online_db_migration external_deploy_tasks: - name: Clean up legacy Cinder keystone catalog entries become: true diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index 2bf2cbc575..35fd1573fb 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-api-container-puppet.yaml @@ -292,7 +292,7 @@ outputs: - { 'path': /var/log/containers/httpd/ironic-api, 'setype': container_file_t, 'mode': '0750' } external_upgrade_tasks: - when: step|int == 1 - block: + block: &ironic_online_db_migration - name: Online data migration for Ironic command: "{{ container_cli }} exec ironic_api ironic-dbsync --config-file /etc/ironic/ironic.conf online_data_migrations" delegate_to: "{{ groups['ironic_api'][0] }}" @@ -300,3 +300,6 @@ outputs: tags: - online_upgrade - online_upgrade_ironic + external_update_tasks: + - when: step|int == 1 + block: *ironic_online_db_migration diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml index 7ed17e2be4..401c007e8f 100644 --- a/deployment/nova/nova-conductor-container-puppet.yaml +++ b/deployment/nova/nova-conductor-container-puppet.yaml @@ -204,7 +204,7 @@ outputs: state: yes external_upgrade_tasks: - when: step|int == 1 - block: + block: &nova_online_db_migration - name: Online data migration for Nova command: "{{ container_cli }} exec nova_conductor nova-manage db online_data_migrations" delegate_to: "{{ groups['nova_conductor'][0] }}" @@ -226,3 +226,6 @@ outputs: tripleo_containers_to_stop: - nova_conductor tripleo_delegate_to: "{{ groups['nova_conductor'] | default([]) }}" + external_update_tasks: + - when: step|int == 1 + block: *nova_online_db_migration