upgrade: remove Docker containers now managed by Podman

For all containers where restart=always is configured and that are not
managed by Pacemaker (this part will be handled later), we remove these
containers at step 1 of post_upgrade_tasks.

Change-Id: Id446dbf7b0a18bd1d4539856e6709d35c7cfa0f0

docker/services/aodh-api.yaml

@@ -211,6 +211,13 @@ outputs:
               when: remove_aodh_api_package|bool
       metadata_settings:
         get_attr: [AodhApiPuppetBase, role_data, metadata_settings]
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - aodh_api
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/aodh-evaluator.yaml

@@ -150,6 +150,13 @@ outputs:
               package: name=openstack-aodh-evaluator state=removed
               ignore_errors: True
               when: remove_aodh_evaluator_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - aodh_evaluator
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/aodh-listener.yaml

@@ -157,6 +157,13 @@ outputs:
               package: name=openstack-aodh-listener state=removed
               ignore_errors: True
               when: remove_aodh_listener_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - aodh_listener
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/aodh-notifier.yaml

@@ -157,6 +157,13 @@ outputs:
               package: name=openstack-aodh-notifier state=removed
               ignore_errors: True
               when: remove_aodh_notifier_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - aodh_notifier
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/barbican-api.yaml

@@ -270,5 +270,14 @@ outputs:
               package: name=openstack-barbican-api state=removed
               ignore_errors: True
               when: remove_barbican_api_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - barbican_api
+              - barbican_keystone_listener
+              - barbican_worker
       metadata_settings:
         get_attr: [BarbicanApiBase, role_data, metadata_settings]

docker/services/ceilometer-agent-central.yaml

@@ -178,6 +178,13 @@ outputs:
               package: name=openstack-ceilometer-central state=removed
               ignore_errors: True
               when: remove_ceilometer_central_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - ceilometer_agent_central
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/ceilometer-agent-compute.yaml

@@ -164,6 +164,13 @@ outputs:
               package: name=openstack-ceilometer-polling state=removed
               ignore_errors: True
               when: remove_ceilometer_compute_polling_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - ceilometer_agent_compute
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/ceilometer-agent-ipmi.yaml

@@ -157,6 +157,13 @@ outputs:
               package: name=openstack-ceilometer-ipmi state=removed
               ignore_errors: True
               when: remove_ceilometer_ipmi_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - ceilometer_agent_ipmi
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/ceilometer-agent-notification.yaml

@@ -174,6 +174,13 @@ outputs:
               package: name=openstack-ceilometer-notification state=removed
               ignore_errors: True
               when: remove_ceilometer_notification_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - ceilometer_agent_notification
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/cinder-api.yaml

@@ -302,6 +302,14 @@ outputs:
               tags:
                 - online_upgrade
                 - online_upgrade_cinder
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - cinder_api
+              - cinder_api_cron
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/cinder-backup.yaml

@@ -181,6 +181,13 @@ outputs:
           file:
             path: /etc/ceph
             state: directory
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - cinder_backup
       upgrade_tasks:
         - when: step|int == 0
           tags: common

docker/services/cinder-scheduler.yaml

@@ -177,6 +177,13 @@ outputs:
               package: name=openstack-cinder state=removed
               ignore_errors: True
               when: remove_cinder_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - cinder_scheduler
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/cinder-volume.yaml

@@ -198,6 +198,13 @@ outputs:
               package: name=openstack-cinder state=removed
               ignore_errors: True
               when: remove_cinder_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - cinder_volume
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/congress.yaml

@@ -146,6 +146,13 @@ outputs:
               Log files from congress containers can be found under
               /var/log/containers/congress.
           ignore_errors: true
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - congress_api
       upgrade_tasks:
         - when: step|int == 0
           tags: common

docker/services/database/mongodb.yaml

@@ -202,3 +202,10 @@ outputs:
             - release == 'ocata'
             - mongod_enabled|bool
           service: name=mongod state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - mongodb

docker/services/database/mysql.yaml

@@ -289,6 +289,12 @@ outputs:
               when: mariadb_enabled|bool
               service: name=mariadb state=stopped enabled=no
       post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - mysql
         - name: Check and upgrade Mysql database after major version upgrade
           command: "{{ container_cli }} exec -u root mysql mysql_upgrade"
           when: step|int == 2

docker/services/database/redis.yaml

@@ -185,3 +185,16 @@ outputs:
             - name: Stop and disable redis service
               when: redis_enabled|bool
               service: name=redis state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              with_items:
+                list_concat:
+                  - - redis
+                  - - if:
+                        - internal_tls_enabled
+                        - - redis_tls_proxy
+                        - null

docker/services/designate-api.yaml

@@ -151,3 +151,10 @@ outputs:
               Log files from designate containers can be found under
               /var/log/containers/designate.
           ignore_errors: true
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - designate_api

docker/services/designate-central.yaml

@@ -169,3 +169,10 @@ outputs:
               Log files from designate containers can be found under
               /var/log/containers/designate.
           ignore_errors: true
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - designate_central

docker/services/designate-mdns.yaml

@@ -131,3 +131,10 @@ outputs:
               Log files from designate containers can be found under
               /var/log/containers/designate.
           ignore_errors: true
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - designate_mdns

docker/services/designate-producer.yaml

@@ -132,3 +132,10 @@ outputs:
               Log files from designate containers can be found under
               /var/log/containers/designate.
           ignore_errors: true
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - designate_producer

docker/services/designate-sink.yaml

@@ -132,3 +132,10 @@ outputs:
               Log files from designate containers can be found under
               /var/log/containers/designate.
           ignore_errors: true
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - designate_sink

docker/services/designate-worker.yaml

@@ -178,3 +178,11 @@ outputs:
             path: /var/named-persistent
             state: directory
             setype: svirt_sandbox_file_t
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - designate_backend_bind9
+              - designate_worker

docker/services/ec2-api.yaml

@@ -249,5 +249,19 @@ outputs:
             - name: Stop and disable EC2-API-METADATA service
               when: ec2_api_metadata_enabled|bool
               service: name=openstack-ec2-api-metadata state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              with_items:
+                list_concat:
+                  - - ec2_api
+                  - - ec2_api_metadata
+                  - - if:
+                        - internal_tls_enabled
+                        - - ec2_api_tls_proxy
+                        - null
       metadata_settings:
         get_attr: [Ec2ApiPuppetBase, role_data, metadata_settings]

docker/services/etcd.yaml

@@ -134,3 +134,10 @@ outputs:
             - name: Stop and disable etcd service
               when: etcd_enabled|bool
               service: name=etcd state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - etcd

docker/services/fluentd.yaml

@@ -140,6 +140,13 @@ outputs:
             - name: Stop and disable fluentd service
               service: name=fluentd.service state=stopped enabled=no
               when: fluentd_enabled|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - fluentd
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/glance-api.yaml

@@ -265,6 +265,19 @@ outputs:
               when: remove_glance_package|bool
       metadata_settings:
         get_attr: [GlanceApiPuppetBase, role_data, metadata_settings]
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              with_items:
+                list_concat:
+                  - - glance_api
+                  - - if:
+                        - internal_tls_enabled
+                        - - glance_api_tls_proxy
+                        - null
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/gnocchi-api.yaml

@@ -297,6 +297,13 @@ outputs:
               service: name=httpd state=stopped enabled=no
       metadata_settings:
         get_attr: [GnocchiApiPuppetBase, role_data, metadata_settings]
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - gnocchi_api
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/gnocchi-metricd.yaml

@@ -178,6 +178,13 @@ outputs:
             - name: Stop and disable openstack-gnocchi-metricd service
               when: gnocchi_metricd_enabled|bool
               service: name=openstack-gnocchi-metricd.service state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - gnocchi_metricd
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/gnocchi-statsd.yaml

@@ -178,6 +178,13 @@ outputs:
             - name: Stop and disable openstack-gnocchi-statsd service
               when: gnocchi_statsd_enabled|bool
               service: name=openstack-gnocchi-statsd.service state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - gnocchi_statsd
       fast_forward_upgrade_tasks:
         - name: FFU check if openstack-gnocchi-statsd is deployed
           command: systemctl is-enabled --quiet openstack-gnocchi-statsd

docker/services/haproxy.yaml

@@ -289,6 +289,13 @@ outputs:
               package: name=haproxy state=removed
               ignore_errors: True
               when: remove_haproxy_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - haproxy
       host_prep_tasks:
         - {get_attr: [HAProxyBase, role_data, host_prep_tasks]}
         - name: create persistent directories

docker/services/heat-api-cfn.yaml

@@ -187,6 +187,13 @@ outputs:
                 - httpd_running|bool
       metadata_settings:
         get_attr: [HeatBase, role_data, metadata_settings]
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - heat_api_cfn
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/heat-api.yaml

@@ -229,6 +229,14 @@ outputs:
                 state: absent
       metadata_settings:
         get_attr: [HeatBase, role_data, metadata_settings]
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - heat_api
+              - heat_api_cron
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/heat-engine.yaml

@@ -182,6 +182,13 @@ outputs:
             - name: Stop and disable heat_engine service
               when: heat_engine_enabled|bool
               service: name=openstack-heat-engine state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - heat_engine
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/horizon.yaml

@@ -216,5 +216,12 @@ outputs:
             - step|int == 2
             - httpd_running|bool
           service: name=httpd state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - horizon
       metadata_settings:
         get_attr: [HorizonBase, role_data, metadata_settings]

docker/services/ironic-api.yaml

@@ -237,6 +237,13 @@ outputs:
               tags:
                 - online_upgrade
                 - online_upgrade_ironic
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - ironic_api
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/ironic-conductor.yaml

@@ -272,6 +272,13 @@ outputs:
               package: name=openstack-ironic-conductor state=removed
               ignore_errors: True
               when: remove_ironic_conductor_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - ironic_conductor
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/ironic-inspector.yaml

@@ -269,3 +269,11 @@ outputs:
               package: name=openstack-ironic-inspector state=removed
               ignore_errors: True
               when: remove_ironic_inspector_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - ironic_inspector
+              - ironic_inspector_dnsmasq

docker/services/ironic-neutron-agent.yaml

@@ -123,3 +123,10 @@ outputs:
             - name: Stop and disable ironic-neutron-agent service
               when: ironic_neutron_agent_enabled|bool
               service: name=ironic-neutron-agent state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - ironic_neutron_agent

docker/services/ironic-pxe.yaml

@@ -172,3 +172,11 @@ outputs:
               Log files from ironic containers can be found under
               /var/log/containers/ironic and /var/log/containers/httpd/ironic-*.
           ignore_errors: true
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - ironic_pxe_tftp
+              - ironic_pxe_http

docker/services/iscsid.yaml

@@ -148,3 +148,10 @@ outputs:
             - name: Stop and disable iscsid.socket service
               when: iscsid_socket_enabled|bool
               service: name=iscsid.socket state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - iscsid

docker/services/keepalived.yaml

@@ -151,3 +151,10 @@ outputs:
               package: name=keepalived state=removed
               ignore_errors: True
               when: remove_keepalived_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - keepalived

docker/services/keystone.yaml

@@ -298,6 +298,14 @@ outputs:
               when: remove_keystone_package|bool
       metadata_settings:
         get_attr: [KeystoneBase, role_data, metadata_settings]
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - keystone
+              - keystone_cron
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/liquidio-compute-config.yaml

@@ -100,3 +100,10 @@ outputs:
                   - /run:/run
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - liquidio_compute_service

docker/services/logrotate-crond.yaml

@@ -101,3 +101,10 @@ outputs:
                   - /var/log/containers:/var/log/containers:z
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - logrotate_crond

docker/services/manila-api.yaml

@@ -157,6 +157,13 @@ outputs:
             - name: Stop and disable manila_api service
               when: manila_api_enabled|bool
               service: name=openstack-manila-api state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - manila_api
       fast_forward_upgrade_tasks:
         - name: Check if manila_api is deployed
           command: systemctl is-enabled --quiet openstack-manila-api

docker/services/manila-scheduler.yaml

@@ -139,6 +139,13 @@ outputs:
             - name: Stop and disable manila_scheduler service
               when: manila_scheduler_enabled|bool
               service: name=openstack-manila-scheduler state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - manila_scheduler
       fast_forward_upgrade_tasks:
         - name: Check if manila_scheduler is deployed
           command: systemctl is-enabled --quiet openstack-manila-scheduler

docker/services/manila-share.yaml

@@ -159,6 +159,13 @@ outputs:
             - name: Stop and disable manila_share service
               when: manila_share_enabled|bool
               service: name=openstack-manila-share state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - manila_share
       fast_forward_upgrade_tasks:
         - name: Check if manila_share is deployed
           command: systemctl is-enabled --quiet openstack-manila-share

docker/services/memcached.yaml

@@ -113,6 +113,13 @@ outputs:
             - name: Stop and disable memcached service
               when: memcached_enabled|bool
               service: name=memcached state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - memcached
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/messaging/notify-rabbitmq.yaml

@@ -250,3 +250,10 @@ outputs:
         # this is under paunch control so the latest image should be
         # pulled in by the deploy steps.  Same question for other
         # usually managed by pacemaker container.
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - rabbitmq

docker/services/messaging/rpc-qdrouterd.yaml

@@ -125,3 +125,10 @@ outputs:
           - { 'path': /var/lib/qdrouterd, 'setype': svirt_sandbox_file_t }
       metadata_settings:
         get_attr: [QdrouterdBase, role_data, metadata_settings]
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - qdrouterd

docker/services/messaging/rpc-rabbitmq.yaml

@@ -250,3 +250,10 @@ outputs:
         # this is under paunch control so the latest image should be
         # pulled in by the deploy steps.  Same question for other
         # usually managed by pacemaker container.
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - rabbitmq

docker/services/metrics/collectd.yaml

@@ -173,3 +173,10 @@ outputs:
             - step|int == 1
             - release == 'ocata'
             - collectd_enabled|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - collectd

docker/services/metrics/qdr.yaml

@@ -219,3 +219,10 @@ outputs:
               Log files from metrics qrouterd containers can be found under
               /var/log/containers/metrics-qdr.
           ignore_errors: true
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - metrics_qdr

docker/services/mistral-api.yaml

@@ -219,3 +219,10 @@ outputs:
               package: name=openstack-mistral-api state=removed
               ignore_errors: True
               when: remove_mistral_api_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - mistral_api

docker/services/mistral-engine.yaml

@@ -162,3 +162,10 @@ outputs:
               package: name=openstack-mistral-engine state=removed
               ignore_errors: True
               when: remove_mistral_engine_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - mistral_engine

docker/services/mistral-event-engine.yaml

@@ -162,3 +162,10 @@ outputs:
               package: name=openstack-mistral-event-engine state=removed
               ignore_errors: True
               when: remove_mistral_event_engine_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - mistral_event_engine

docker/services/mistral-executor.yaml

@@ -192,3 +192,10 @@ outputs:
               package: name=openstack-mistral-executor state=removed
               ignore_errors: True
               when: remove_mistral_executor_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - mistral_executor

docker/services/multipathd.yaml

@@ -113,3 +113,10 @@ outputs:
             - name: Stop and disable multipathd service
               when: multipathd_enabled|bool
               service: name=multipathd state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - multipathd

docker/services/neutron-api.yaml

@@ -228,6 +228,19 @@ outputs:
               when: remove_neutron_package|bool
       metadata_settings:
         get_attr: [NeutronBase, role_data, metadata_settings]
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              with_items:
+                list_concat:
+                  - - neutron_api
+                  - - if:
+                        - internal_tls_enabled
+                        - - neutron_server_tls_proxy
+                        - null
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/neutron-dhcp.yaml

@@ -303,6 +303,12 @@ outputs:
             - release == 'ocata'
             - neutron_dhcp_agent_enabled|bool
       post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - neutron_dhcp
         - name: Check for neutron user
           getent:
             database: passwd

docker/services/neutron-l3.yaml

@@ -300,6 +300,12 @@ outputs:
             - release == 'ocata'
             - neutron_l3_agent_enabled|bool
       post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - neutron_l3_agent
         - name: Check for neutron user
           getent:
             database: passwd

docker/services/neutron-metadata.yaml

@@ -163,6 +163,13 @@ outputs:
             - name: Stop and disable neutron_metadata service
               when: neutron_metadata_agent_enabled|bool
               service: name=neutron-metadata-agent state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - neutron_metadata_agent
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/neutron-ovs-agent.yaml

@@ -259,6 +259,13 @@ outputs:
                       regexp=".*neutron-"
                       state=absent
           when: step|int == 5
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - neutron_ovs_agent
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/neutron-sriov-agent.yaml

@@ -141,3 +141,10 @@ outputs:
             - name: Stop and disable neutron_sriov_agent service
               when: neutron_sriov_nic_agent_enabled|bool
               service: name=neutron-sriov-nic-agent state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - neutron_sriov_agent

docker/services/nova-api.yaml

@@ -408,6 +408,14 @@ outputs:
               tags:
                 - online_upgrade
                 - online_upgrade_nova
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - nova_api
+              - nova_api_cron
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/nova-compute.yaml

@@ -315,6 +315,13 @@ outputs:
               package: name=openstack-nova-compute state=removed
               ignore_errors: True
               when: remove_nova_compute_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - nova_compute
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/nova-conductor.yaml

@@ -181,6 +181,13 @@ outputs:
               package: name=openstack-nova-conductor state=removed
               ignore_errors: True
               when: remove_nova_conductor_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - nova_conductor
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/nova-consoleauth.yaml

@@ -168,6 +168,13 @@ outputs:
               package: name=openstack-nova-console state=removed
               ignore_errors: True
               when: remove_nova_console_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - nova_consoleauth
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/nova-ironic.yaml

@@ -193,6 +193,13 @@ outputs:
               package: name=openstack-nova-compute state=removed
               ignore_errors: True
               when: remove_nova_compute_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - nova_compute
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/nova-libvirt.yaml

@@ -501,3 +501,11 @@ outputs:
             - name: Stop and disable libvirtd service
               when: nova_libvirt_enabled|bool
               service: name=libvirtd state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - nova_virtlogd
+              - nova_libvirt

docker/services/nova-metadata.yaml

@@ -162,3 +162,10 @@ outputs:
       metadata_settings:
         get_attr: [NovaMetadataBase, role_data, metadata_settings]
       host_prep_tasks: {get_attr: [NovaMetadataLogging, host_prep_tasks]}
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - nova_metadata

docker/services/nova-migration-target.yaml

@@ -151,3 +151,10 @@ outputs:
                   - /var/lib/nova:/var/lib/nova:shared
             environment:
              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - nova_migration_target

docker/services/nova-placement.yaml

@@ -195,3 +195,10 @@ outputs:
               package: name=httpd state=removed
               ignore_errors: True
               when: remove_httpd_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - nova_placement

docker/services/nova-scheduler.yaml

@@ -187,3 +187,10 @@ outputs:
             - step|int == 1
             - release == 'ocata'
             - nova_scheduler_enabled|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - nova_scheduler

docker/services/nova-vnc-proxy.yaml

@@ -245,3 +245,10 @@ outputs:
             - step|int == 1
             - release == 'ocata'
             - nova_vncproxy_enabled|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - nova_vnc_proxy

docker/services/novajoin.yaml

@@ -219,3 +219,11 @@ outputs:
           shell: "/usr/bin/kinit -kt /etc/krb5.keytab && ipa-getkeytab -s $(grep xmlrpc_uri /etc/ipa/default.conf  | cut -d/ -f3) -p nova/{{ ansible_nodename }} -k /etc/novajoin/krb5.keytab"
           args:
             creates: /etc/novajoin/krb5.keytab
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - novajoin_server
+              - novajoin_notifier

docker/services/octavia-api.yaml

@@ -271,3 +271,16 @@ outputs:
               service: name=httpd state=stopped
       metadata_settings:
         get_attr: [OctaviaApiPuppetBase, role_data, metadata_settings]
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              with_items:
+                list_concat:
+                  - - octavia_api
+                  - - if:
+                        - internal_tls_enabled
+                        - - octavia_api_tls_proxy
+                        - null

docker/services/octavia-health-manager.yaml

@@ -174,3 +174,10 @@ outputs:
               package: name=openstack-octavia-health-manager state=removed
               ignore_errors: True
               when: remove_octavia_health_manager_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - octavia_health_manager

docker/services/octavia-housekeeping.yaml

@@ -161,3 +161,10 @@ outputs:
             - name: Stop and disable octavia_housekeeping service
               when: octavia_housekeeping_enabled|bool
               service: name=openstack-octavia-housekeeping state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - octavia_housekeeping

docker/services/octavia-worker.yaml

@@ -180,3 +180,10 @@ outputs:
             - name: Stop and disable octavia_worker service
               when: octavia_worker_enabled|bool
               service: name=openstack-octavia-worker state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - octavia_worker

docker/services/opendaylight-api.yaml

@@ -251,6 +251,12 @@ outputs:
                 $ODL_PASSWORD: {get_attr: [OpenDaylightBase, role_data, config_settings, 'opendaylight::password']}
                 $ODL_URI: {get_param: [EndpointMap, OpenDaylightInternal, uri]}
           when: step|int == 0
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - opendaylight_api
       update_tasks:
         - name: Get ODL update level
           block: &get_odl_update_level

docker/services/ovn-controller.yaml

@@ -158,3 +158,10 @@ outputs:
             - name: Stop and disable ovn-controller service
               when: ovn_controller_enabled|bool
               service: name=ovn-controller state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - ovn_controller

docker/services/ovn-dbs.yaml

@@ -225,3 +225,12 @@ outputs:
             - name: Stop and disable ovn-northd service
               when: ovn_northd_enabled|bool
               service: name=ovn-northd state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - ovn_north_db_server
+              - ovn_south_db_server
+              - ovn_northd

docker/services/ovn-metadata.yaml

@@ -235,3 +235,10 @@ outputs:
             - name: Stop and disable networking_ovn_metadata service
               when: networking_ovn_metadata_agent_enabled|bool
               service: name=networking-ovn-metadata-agent state=stopped enabled=no
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - ovn_metadata_agent

docker/services/pacemaker/clustercheck.yaml

@@ -97,3 +97,10 @@ outputs:
       upgrade_tasks:
       update_tasks:
         # Nothing: It's not managed by pacemaker, so let paunch do it.
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - clustercheck

docker/services/panko-api.yaml

@@ -157,3 +157,10 @@ outputs:
       host_prep_tasks: {get_attr: [PankoApiLogging, host_prep_tasks]}
       metadata_settings:
         get_attr: [PankoApiPuppetBase, role_data, metadata_settings]
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - panko_api

docker/services/qdrouterd.yaml

@@ -124,3 +124,10 @@ outputs:
         ignore_errors: true
       metadata_settings:
         get_attr: [QdrouterdBase, role_data, metadata_settings]
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - qdrouterd

docker/services/rabbitmq.yaml

@@ -250,3 +250,10 @@ outputs:
         # this is under paunch control so the latest image should be
         # pulled in by the deploy steps.  Same question for other
         # usually managed by pacemaker container.
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - rabbitmq

docker/services/sahara-api.yaml

@@ -186,6 +186,13 @@ outputs:
               package: name=openstack-sahara-api state=removed
               ignore_errors: True
               when: remove_sahara_api_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - sahara_api
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/sahara-engine.yaml

@@ -175,6 +175,13 @@ outputs:
               package: name=openstack-sahara-engine state=removed
               ignore_errors: True
               when: remove_sahara_engine_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - sahara_engine
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/sensu-client.yaml

@@ -184,6 +184,13 @@ outputs:
               when: sensu_enabled|bool
               service: name=sensu-client state=stopped enabled=no
               #TODO: Removal of package
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - sensu_client
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/swift-proxy.yaml

@@ -309,6 +309,18 @@ outputs:
               when: remove_swift_proxy_package|bool
       metadata_settings:
         get_attr: [SwiftProxyBase, role_data, metadata_settings]
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              list_concat:
+                - - swift_proxy
+                - - if:
+                      - internal_tls_enabled
+                      - - swift_proxy_tls_proxy
+                      - null
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/swift-storage.yaml

@@ -604,6 +604,26 @@ outputs:
           file:
             path: /var/run/rsyncd.pid
             state: absent
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - swift_account_auditor
+              - swift_account_reaper
+              - swift_account_replicator
+              - swift_account_server
+              - swift_container_auditor
+              - swift_container_replicator
+              - swift_container_server
+              - swift_container_updater
+              - swift_object_auditor
+              - swift_object_expirer
+              - swift_object_replicator
+              - swift_object_server
+              - swift_object_updater
+              - swift_rsync
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

docker/services/tacker.yaml

@@ -163,3 +163,10 @@ outputs:
               when: tacker_enabled|bool
               service: name=openstack-tacker-server state=stopped enabled=no
               #TODO: Removal of package
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - tacker_api

docker/services/tripleo-ui.yaml

@@ -158,5 +158,12 @@ outputs:
               package: name=openstack-tripleo-ui state=removed
               ignore_errors: True
               when: {get_param: UpgradeRemoveUnusedPackages}
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - tripleo_ui
       metadata_settings:
         get_attr: [TripleoUIPuppetBase, role_data, metadata_settings]

docker/services/zaqar.yaml

@@ -250,5 +250,13 @@ outputs:
               package: name=openstack-zaqar state=removed
               ignore_errors: True
               when: remove_zaqar_package|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - zaqar
+              - zaqar_websocket
       metadata_settings:
         get_attr: [ZaqarBase, role_data, metadata_settings]