From 10b5bed23fdc6e8ccff7f2f111d66bf7b9d06432 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 23 May 2018 10:09:42 -0700 Subject: [PATCH] nova-ironic: add support for post-upgrade cleanup It was missing but present in nova-compute service, we need this cleanup for the containerized undercloud upgrade use case. Change-Id: Iab33e75f26bb756c17c0dbcb330e59b855b3d049 --- docker/services/nova-ironic.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml index 8c6b5c4d50..005ee2856c 100644 --- a/docker/services/nova-ironic.yaml +++ b/docker/services/nova-ironic.yaml @@ -36,6 +36,10 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json + UpgradeRemoveUnusedPackages: + default: false + description: Remove package if the service is being disabled during upgrade + type: boolean resources: @@ -147,6 +151,16 @@ outputs: - step|int == 2 - nova_ironic_enabled.rc == 0 service: name=openstack-nova-compute state=stopped enabled=no + - name: Set fact for removal of openstack-nova-compute package + when: step|int == 3 + set_fact: + remove_nova_compute_package: {get_param: UpgradeRemoveUnusedPackages} + - name: Remove openstack-nova-compute package if operator requests it + yum: name=openstack-nova-compute state=removed + ignore_errors: True + when: + - step|int == 3 + - remove_nova_compute_package|bool fast_forward_upgrade_tasks: - name: Check if nova ironic is deployed command: systemctl is-enabled --quiet openstack-nova-compute