diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml index 1e084b4346..8717ef9cb2 100644 --- a/docker/services/aodh-api.yaml +++ b/docker/services/aodh-api.yaml @@ -201,6 +201,8 @@ outputs: - aodh_httpd_enabled|bool - httpd_running|bool service: name=httpd state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-aodh-api package set_fact: remove_aodh_api_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml index 6762df2bcb..b5d32e3805 100644 --- a/docker/services/aodh-evaluator.yaml +++ b/docker/services/aodh-evaluator.yaml @@ -142,6 +142,8 @@ outputs: - name: Stop and disable openstack-aodh-evaluator service when: aodh_evaluator_enabled|bool service: name=openstack-aodh-evaluator.service state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-aodh-evaluator package set_fact: remove_aodh_evaluator_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml index ed617eea1f..37f4126377 100644 --- a/docker/services/aodh-listener.yaml +++ b/docker/services/aodh-listener.yaml @@ -142,6 +142,8 @@ outputs: - name: Stop and disable openstack-aodh-listener service when: aodh_listener_enabled|bool service: name=openstack-aodh-listener.service state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-aodh-listener package set_fact: remove_aodh_listener_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml index 0c139b44c7..689f7bc785 100644 --- a/docker/services/aodh-notifier.yaml +++ b/docker/services/aodh-notifier.yaml @@ -142,6 +142,8 @@ outputs: - name: Stop and disable openstack-aodh-notifier service when: aodh_notifier_enabled|bool service: name=openstack-aodh-notifier.service state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-aodh-notifier package set_fact: remove_aodh_notifier_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/barbican-api.yaml b/docker/services/barbican-api.yaml index 4f47320814..92fc7dc8ad 100644 --- a/docker/services/barbican-api.yaml +++ b/docker/services/barbican-api.yaml @@ -248,6 +248,8 @@ outputs: - name: Stop and disable barbican_api service when: barbican_enabled|bool service: name=openstack-barbican-api state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-barbican-api package set_fact: remove_barbican_api_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml index 00cdbdab53..83844bdd1e 100644 --- a/docker/services/ceilometer-agent-central.yaml +++ b/docker/services/ceilometer-agent-central.yaml @@ -170,6 +170,8 @@ outputs: - name: Stop and disable ceilometer agent central service service: name=openstack-ceilometer-central state=stopped enabled=no when: ceilometer_agent_central_enabled|bool + - when: step|int == 3 + block: - name: Set fact for removal of openstack-ceilometer-central package set_fact: remove_ceilometer_central_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml index 1309e729ba..08ed39e703 100644 --- a/docker/services/ceilometer-agent-compute.yaml +++ b/docker/services/ceilometer-agent-compute.yaml @@ -143,6 +143,8 @@ outputs: - name: Stop and disable ceilometer polling agent service: name=openstack-ceilometer-polling state=stopped enabled=no when: openstack_ceilometer_polling_enabled|bool + - when: step|int == 3 + block: - name: Set fact for removal of openstack-ceilometer-compute and polling package set_fact: remove_ceilometer_compute_polling_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/ceilometer-agent-ipmi.yaml b/docker/services/ceilometer-agent-ipmi.yaml index 919cc49bff..851f8df5e2 100644 --- a/docker/services/ceilometer-agent-ipmi.yaml +++ b/docker/services/ceilometer-agent-ipmi.yaml @@ -149,6 +149,8 @@ outputs: - name: Stop and disable ceilometer agent ipmi service service: name=openstack-ceilometer-agent-ipmi state=stopped enabled=no when: ceilometer_ipmi_enabled|bool + - when: step|int == 3 + block: - name: Set fact for removal of openstack-ceilometer-ipmi package set_fact: remove_ceilometer_ipmi_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml index fa75776616..6301b2bed7 100644 --- a/docker/services/ceilometer-agent-notification.yaml +++ b/docker/services/ceilometer-agent-notification.yaml @@ -159,6 +159,8 @@ outputs: - name: Stop and disable ceilometer agent notification service service: name=openstack-ceilometer-notification state=stopped enabled=no when: ceilometer_agent_notification_enabled|bool + - when: step|int == 3 + block: - name: Set fact for removal of openstack-ceilometer-notification package set_fact: remove_ceilometer_notification_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml index 7c3ce8e663..5d4dde5529 100644 --- a/docker/services/cinder-api.yaml +++ b/docker/services/cinder-api.yaml @@ -241,6 +241,8 @@ outputs: - name: Stop and disable cinder_api service service: name=httpd state=stopped enabled=no when: cinder_api_apache.rc == 0 + - when: step|int == 3 + block: - name: remove old cinder cron jobs file: path: /var/spool/cron/cinder diff --git a/docker/services/cinder-backup.yaml b/docker/services/cinder-backup.yaml index 680cb7faf0..f9ca3adb31 100644 --- a/docker/services/cinder-backup.yaml +++ b/docker/services/cinder-backup.yaml @@ -183,6 +183,8 @@ outputs: - name: Stop and disable cinder_backup service when: cinder_backup_enabled|bool service: name=openstack-cinder-backup state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-cinder package set_fact: remove_cinder_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml index 0ab24a51c9..ba935ae05f 100644 --- a/docker/services/cinder-scheduler.yaml +++ b/docker/services/cinder-scheduler.yaml @@ -162,6 +162,8 @@ outputs: - name: Stop and disable cinder_scheduler service when: cinder_scheduler_enabled|bool service: name=openstack-cinder-scheduler state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-cinder package set_fact: remove_cinder_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index 4d8b4eaeb5..c06d9df11c 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -242,6 +242,8 @@ outputs: - name: Stop and disable cinder_volume service when: cinder_volume_enabled|bool service: name=openstack-cinder-volume state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-cinder package set_fact: remove_cinder_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml index 1b31ed9dc3..c843f32e30 100644 --- a/docker/services/collectd.yaml +++ b/docker/services/collectd.yaml @@ -143,6 +143,8 @@ outputs: - name: Stop and disable collectd service when: collectd_enabled|bool service: name=collectd.service state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of collectd package set_fact: remove_collectd_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/congress.yaml b/docker/services/congress.yaml index dddbf893e6..30eaba00ce 100644 --- a/docker/services/congress.yaml +++ b/docker/services/congress.yaml @@ -167,6 +167,8 @@ outputs: - name: Stop and disable congress_api service when: congress_enabled|bool service: name=openstack-congress-server state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-congress package set_fact: remove_congress_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml index b59f992dd5..ea30a6495c 100644 --- a/docker/services/glance-api.yaml +++ b/docker/services/glance-api.yaml @@ -287,6 +287,8 @@ outputs: - name: Stop and disable glance_api service when: glance_api_enabled|bool service: name=openstack-glance-api state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-glance package set_fact: remove_glance_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml index 52a760ee38..879195a1b2 100644 --- a/docker/services/neutron-api.yaml +++ b/docker/services/neutron-api.yaml @@ -220,6 +220,8 @@ outputs: - name: Stop and disable neutron_api service when: neutron_server_enabled|bool service: name=neutron-server state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-neutron package set_fact: remove_neutron_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index e39df91f49..0dfba6f160 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -204,6 +204,8 @@ outputs: - name: Stop and disable neutron_ovs_agent service when: neutron_ovs_agent_enabled|bool service: name=neutron-openvswitch-agent state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-neutron-openvswitch package set_fact: remove_neutron_openvswitch_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml index 19243f7049..691d1cda8c 100644 --- a/docker/services/nova-api.yaml +++ b/docker/services/nova-api.yaml @@ -372,6 +372,8 @@ outputs: - nova_api_httpd_enabled|bool - httpd_running|bool service: name=httpd state=stopped + - when: step|int == 3 + block: - name: Set fact for removal of openstack-nova-api package set_fact: remove_nova_api_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml index 11ce9c9438..18fcb1bd86 100644 --- a/docker/services/nova-conductor.yaml +++ b/docker/services/nova-conductor.yaml @@ -167,6 +167,8 @@ outputs: - name: Stop and disable nova_conductor service when: nova_conductor_enabled|bool service: name=openstack-nova-conductor state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-nova-conductor package set_fact: remove_nova_conductor_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/nova-consoleauth.yaml b/docker/services/nova-consoleauth.yaml index 124368d004..13a0f2d08f 100644 --- a/docker/services/nova-consoleauth.yaml +++ b/docker/services/nova-consoleauth.yaml @@ -154,6 +154,8 @@ outputs: - name: Stop and disable nova_consoleauth service when: nova_consoleauth_enabled|bool service: name=openstack-nova-consoleauth state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-nova-console package set_fact: remove_nova_console_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml index d9d352d2fa..3fdebefab4 100644 --- a/docker/services/nova-placement.yaml +++ b/docker/services/nova-placement.yaml @@ -182,6 +182,8 @@ outputs: - nova_placement_httpd_enabled|bool - httpd_running|bool service: name=httpd state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of httpd package set_fact: remove_httpd_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml index 4880bccc0a..0d8b04823a 100644 --- a/docker/services/nova-scheduler.yaml +++ b/docker/services/nova-scheduler.yaml @@ -155,6 +155,8 @@ outputs: - name: Stop and disable nova_scheduler service when: nova_scheduler_enabled|bool service: name=openstack-nova-scheduler state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-nova-scheduler package set_fact: remove_nova_scheduler_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/nova-vnc-proxy.yaml b/docker/services/nova-vnc-proxy.yaml index 4cee79780b..bc4935701f 100644 --- a/docker/services/nova-vnc-proxy.yaml +++ b/docker/services/nova-vnc-proxy.yaml @@ -211,6 +211,8 @@ outputs: - name: Stop and disable nova_vnc_proxy service when: nova_vncproxy_enabled|bool service: name=openstack-nova-novncproxy state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-nova-novncproxy package set_fact: remove_nova_novncproxy_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml index ee6ff2e4f7..54246f9572 100644 --- a/docker/services/octavia-health-manager.yaml +++ b/docker/services/octavia-health-manager.yaml @@ -156,6 +156,8 @@ outputs: - name: Stop and disable octavia_health_manager service when: octavia_health_enabled|bool service: name=openstack-octavia-health-manager state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-octavia-health-manager package set_fact: remove_octavia_health_manager_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/sahara-api.yaml b/docker/services/sahara-api.yaml index 4722f3298c..7533daf4af 100644 --- a/docker/services/sahara-api.yaml +++ b/docker/services/sahara-api.yaml @@ -176,6 +176,8 @@ outputs: - name: Stop and disable sahara_api service when: sahara_api_enabled|bool service: name=openstack-sahara-api state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-sahara-api package set_fact: remove_sahara_api_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/sahara-engine.yaml b/docker/services/sahara-engine.yaml index 656fa78e8c..db20194b5f 100644 --- a/docker/services/sahara-engine.yaml +++ b/docker/services/sahara-engine.yaml @@ -161,6 +161,8 @@ outputs: - name: Stop and disable sahara_engine service when: sahara_engine_enabled|bool service: name=openstack-sahara-engine state=stopped enabled=no + - when: step|int == 3 + block: - name: Set fact for removal of openstack-sahara-engine package set_fact: remove_sahara_engine_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml index ed332c245b..d2e9b10f44 100644 --- a/docker/services/swift-proxy.yaml +++ b/docker/services/swift-proxy.yaml @@ -278,6 +278,8 @@ outputs: when: item.rc == 0 service: name={{ item.item }} state=stopped enabled=no with_items: "{{ swift_proxy_services_enabled.results }}" + - when: step|int == 3 + block: - name: Set fact for removal of openstack-swift-proxy package set_fact: remove_swift_proxy_package: {get_param: UpgradeRemoveUnusedPackages} diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml index 0bc8ce061f..97528ba9a8 100644 --- a/docker/services/swift-storage.yaml +++ b/docker/services/swift-storage.yaml @@ -516,6 +516,8 @@ outputs: service: name={{ item.item }} state=stopped enabled=no with_items: "{{ swift_services_enabled.results }}" when: item.rc == 0 + - when: step|int == 3 + block: - name: Set fact for removal of openstack-swift-container,object,account package set_fact: remove_swift_package: {get_param: UpgradeRemoveUnusedPackages}