From 42a5f7f1be7266ff7f9cd033620434ca43d61466 Mon Sep 17 00:00:00 2001 From: Lukas Bezdicka Date: Mon, 17 May 2021 11:52:45 +0200 Subject: [PATCH] [ffwd] Add legacy cinderv3 volume cleanup to postupgrade The postupgrade tasks are now taking care of making the keystone endpoints but they will fail on legacy cinder. We add the removal of legacy cinderv3 volume entries to keystone postupgrade. Resolves: rhbz#1960579 Change-Id: Idb3a11d6904c6c36eca9d415734ce27af49553f9 --- deployment/keystone/keystone-container-puppet.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index 5a4fa831a8..2dcc78aacc 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -855,6 +855,16 @@ outputs: - keystone_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower delegate_to: undercloud block: *keystone_generate_clouds + - name: Clean up legacy Cinder keystone catalog entries + delegate_to: undercloud + os_keystone_service: + cloud: {get_param: RootStackName} + name: cinderv3 + service_type: volume + state: absent + when: + - step|int == 1 + - keystone_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower - name: Run the keystone endpoint creation when: - step|int == 1