Get rid of docker removing in post_upgrade tasks.

When upgrading from Rocky to Stein we moved also from using the docker
container engine into Podman. To ensure that every single docker container
was removed after the upgrade a post_upgrade task was added which made
use of the tripleo-docker-rm role that removed the container. In this cycle,
from Stein to Train both the Undercloud and Overcloud work with Podman, so
there is no need to remove any docker container anymore.

This patch removes all the tripleo-docker-rm post-upgrade task and in those
services which only included a single task, the post-upgrade-tasks section
is also erased.

Change-Id: I5c9ab55ec6ff332056a426a76e150ea3c9063c6e
(cherry picked from commit 4cbae84c75)

deployment/aodh/aodh-api-container-puppet.yaml

@@ -233,14 +233,6 @@ outputs:
         ignore_errors: true
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - aodh_api
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/aodh/aodh-evaluator-container-puppet.yaml

@@ -123,14 +123,6 @@ outputs:
               Log files from aodh containers can be found under
               /var/log/containers/aodh and /var/log/containers/httpd/aodh-api.
           ignore_errors: true
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - aodh_evaluator
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/aodh/aodh-listener-container-puppet.yaml

@@ -123,14 +123,6 @@ outputs:
               Log files from aodh containers can be found under
               /var/log/containers/aodh and /var/log/containers/httpd/aodh-api.
           ignore_errors: true
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - aodh_listener
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/aodh/aodh-notifier-container-puppet.yaml

@@ -123,14 +123,6 @@ outputs:
               Log files from aodh containers can be found under
               /var/log/containers/aodh and /var/log/containers/httpd/aodh-api.
           ignore_errors: true
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - aodh_notifier
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/barbican/barbican-api-container-puppet.yaml

@@ -717,15 +717,5 @@ outputs:
                 name: virt_sandbox_use_netlink
                 persistent: yes
                 state: yes
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - barbican_api
-              - barbican_keystone_listener
-              - barbican_worker
-            tripleo_container_cli: "docker"
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]

deployment/cavium/liquidio-compute-config-container-puppet.yaml

@@ -125,11 +125,3 @@ 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
-            tripleo_container_cli: "docker"

deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml

@@ -159,14 +159,6 @@ outputs:
               Log files from ceilometer containers can be found under
               /var/log/containers/ceilometer.
           ignore_errors: true
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - ceilometer_agent_central
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml

@@ -133,14 +133,6 @@ outputs:
             name: virt_sandbox_use_netlink
             persistent: yes
             state: yes
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - ceilometer_agent_compute
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml

@@ -146,14 +146,6 @@ outputs:
               Log files from ceilometer containers can be found under
               /var/log/containers/ceilometer.
           ignore_errors: true
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - ceilometer_agent_ipmi
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml

@@ -138,14 +138,6 @@ outputs:
             name: virt_sandbox_use_netlink
             persistent: yes
             state: yes
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - ceilometer_agent_notification
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/cinder/cinder-api-container-puppet.yaml

@@ -375,15 +375,6 @@ outputs:
                   - cinder_api
                   - cinder_api_cron
                 tripleo_delegate_to: "{{ groups['cinder_api'] | default([]) }}"
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - cinder_api
-              - cinder_api_cron
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/cinder/cinder-backup-container-puppet.yaml

@@ -208,11 +208,3 @@ outputs:
                 name: virt_sandbox_use_netlink
                 persistent: yes
                 state: yes
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - cinder_backup
-            tripleo_container_cli: "docker"

deployment/cinder/cinder-scheduler-container-puppet.yaml

@@ -149,14 +149,6 @@ outputs:
             name: virt_sandbox_use_netlink
             persistent: yes
             state: yes
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - cinder_scheduler
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/cinder/cinder-volume-container-puppet.yaml

@@ -333,14 +333,6 @@ outputs:
             volumes: {get_attr: [CinderCommon, cinder_volume_volumes]}
             environment: {get_attr: [CinderCommon, cinder_volume_environment]}
       host_prep_tasks: {get_attr: [CinderCommon, cinder_volume_host_prep_tasks]}
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - cinder_volume
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/database/mysql-container-puppet.yaml

@@ -315,13 +315,6 @@ outputs:
                     SCRIPT: "{{ mysql_clean_up_script }}"
               when: mysql_json.image is defined and mysql_json.image != post_upgrade_mysql_image
       post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - mysql
-            tripleo_container_cli: "docker"
         - name: Check and upgrade Mysql database after major version upgrade
           command: "{{ container_cli }} exec -u root mysql mysql_upgrade"
           when: step|int == 2

deployment/database/redis-container-puppet.yaml

@@ -267,17 +267,3 @@ outputs:
                             - - redis_tls_proxy
                             - null
                 tripleo_delegate_to: "{{ groups['redis'] | default([]) }}"
-      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
-            tripleo_container_cli: "docker"

deployment/etcd/etcd-container-puppet.yaml

@@ -167,11 +167,3 @@ outputs:
               network: {get_param: [ServiceNetMap, EtcdNetwork]}
               type: node
           - null
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - etcd
-            tripleo_container_cli: "docker"

deployment/experimental/designate/designate-api-container-puppet.yaml

@@ -169,11 +169,3 @@ 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
-            tripleo_container_cli: "docker"

deployment/experimental/designate/designate-central-container-puppet.yaml

@@ -203,11 +203,3 @@ 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
-            tripleo_container_cli: "docker"

deployment/experimental/designate/designate-mdns-container-puppet.yaml

@@ -169,11 +169,3 @@ 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
-            tripleo_container_cli: "docker"

deployment/experimental/designate/designate-producer-container-puppet.yaml

@@ -142,11 +142,3 @@ 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
-            tripleo_container_cli: "docker"

deployment/experimental/designate/designate-sink-container-puppet.yaml

@@ -134,11 +134,3 @@ 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
-            tripleo_container_cli: "docker"

deployment/experimental/designate/designate-worker-container-puppet.yaml

@@ -240,12 +240,3 @@ 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
-            tripleo_container_cli: "docker"

deployment/glance/glance-api-container-puppet.yaml

@@ -596,20 +596,6 @@ outputs:
               setype: svirt_sandbox_file_t
       metadata_settings:
         get_attr: [TLSProxyBase, 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
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/gnocchi/gnocchi-api-container-puppet.yaml

@@ -372,14 +372,6 @@ outputs:
       upgrade_tasks: []
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - gnocchi_api
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/gnocchi/gnocchi-metricd-container-puppet.yaml

@@ -178,14 +178,6 @@ outputs:
             path: /etc/ceph
             state: directory
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - gnocchi_metricd
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/gnocchi/gnocchi-statsd-container-puppet.yaml

@@ -172,14 +172,6 @@ outputs:
             path: /etc/ceph
             state: directory
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - gnocchi_statsd
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/haproxy/haproxy-container-puppet.yaml

@@ -341,14 +341,6 @@ outputs:
             setype: var_log_t
             recurse: yes
           when: step|int == 1
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - haproxy
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/heat/heat-api-cfn-container-puppet.yaml

@@ -214,14 +214,6 @@ outputs:
       upgrade_tasks: []
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - heat_api_cfn
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/heat/heat-api-container-puppet.yaml

@@ -261,15 +261,6 @@ outputs:
       upgrade_tasks: []
       metadata_settings:
         get_attr: [ApacheServiceBase, 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
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/heat/heat-engine-container-puppet.yaml

@@ -273,14 +273,6 @@ outputs:
                 persistent: yes
                 state: yes
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - heat_engine
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/horizon/horizon-container-puppet.yaml

@@ -331,14 +331,6 @@ outputs:
               /var/log/containers/horizon and /var/log/containers/httpd/horizon.
           ignore_errors: true
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - horizon
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/ironic/ironic-api-container-puppet.yaml

@@ -287,14 +287,6 @@ 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
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/ironic/ironic-conductor-container-puppet.yaml

@@ -592,14 +592,6 @@ outputs:
           with_items:
             - httpboot
             - tftpboot
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - ironic_conductor
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/ironic/ironic-inspector-container-puppet.yaml

@@ -477,12 +477,3 @@ outputs:
             path: /var/lib/ironic-inspector/dhcp-hostsdir
             state: directory
             setype: svirt_sandbox_file_t
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - ironic_inspector
-              - ironic_inspector_dnsmasq
-            tripleo_container_cli: "docker"

deployment/ironic/ironic-neutron-agent-container-puppet.yaml

@@ -119,11 +119,3 @@ outputs:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
       host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]}
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - ironic_neutron_agent
-            tripleo_container_cli: "docker"

deployment/ironic/ironic-pxe-container-puppet.yaml

@@ -164,12 +164,3 @@ 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
-            tripleo_container_cli: "docker"

deployment/iscsid/iscsid-container-puppet.yaml

@@ -121,11 +121,3 @@ outputs:
             - iscsi_service_enabled_result is changed
             - iscsi_service_enabled_result.rc == 0
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - iscsid
-            tripleo_container_cli: "docker"

deployment/keepalived/keepalived-container-puppet.yaml

@@ -158,11 +158,3 @@ outputs:
               Log files from keepalived containers can be found under
               /var/log/containers/keepalived.
           ignore_errors: true
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - keepalived
-            tripleo_container_cli: "docker"

deployment/keystone/keystone-container-puppet.yaml

@@ -688,15 +688,6 @@ outputs:
       host_prep_tasks: {get_attr: [KeystoneLogging, host_prep_tasks]}
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - keystone
-              - keystone_cron
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/logrotate/logrotate-crond-container-puppet.yaml

@@ -155,14 +155,6 @@ 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
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/manila/manila-api-container-puppet.yaml

@@ -252,14 +252,6 @@ outputs:
               /var/log/containers/manila and /var/log/containers/httpd/manila-api.
           ignore_errors: true
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - manila_api
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - name: Check if manila_api is deployed
           command: systemctl is-enabled --quiet openstack-manila-api

deployment/manila/manila-scheduler-container-puppet.yaml

@@ -124,14 +124,6 @@ outputs:
             persistent: yes
             state: yes
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - manila_scheduler
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - name: Check if manila_scheduler is deployed
           command: systemctl is-enabled --quiet openstack-manila-scheduler

deployment/manila/manila-share-container-puppet.yaml

@@ -179,14 +179,6 @@ outputs:
             path: /etc/ceph
             state: directory
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - manila_share
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - name: Check if manila_share is deployed
           command: systemctl is-enabled --quiet openstack-manila-share

deployment/memcached/memcached-container-puppet.yaml

@@ -185,14 +185,6 @@ outputs:
               Memcached container logs to stdout/stderr only.
           ignore_errors: true
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - memcached
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/messaging/rpc-qdrouterd-container-puppet.yaml

@@ -153,11 +153,3 @@ outputs:
           - { 'path': /var/log/containers/qdrouterd, 'setype': svirt_sandbox_file_t }
           - { 'path': /var/lib/qdrouterd, 'setype': svirt_sandbox_file_t }
       metadata_settings: {}
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - qdrouterd
-            tripleo_container_cli: "docker"

deployment/metrics/collectd-container-puppet.yaml

@@ -643,11 +643,3 @@ 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
-            tripleo_container_cli: "docker"

deployment/metrics/qdr-container-puppet.yaml

@@ -306,11 +306,3 @@ 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
-            tripleo_container_cli: "docker"

deployment/mistral/mistral-api-container-puppet.yaml

@@ -231,11 +231,3 @@ outputs:
               Log files from mistral containers can be found under
               /var/log/containers/mistral.
           ignore_errors: true
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - mistral_api
-            tripleo_container_cli: "docker"

deployment/mistral/mistral-engine-container-puppet.yaml

@@ -152,11 +152,3 @@ outputs:
             name: virt_sandbox_use_netlink
             persistent: yes
             state: yes
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - mistral_engine
-            tripleo_container_cli: "docker"

deployment/mistral/mistral-event-engine-container-puppet.yaml

@@ -127,11 +127,3 @@ outputs:
             name: virt_sandbox_use_netlink
             persistent: yes
             state: yes
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - mistral_event_engine
-            tripleo_container_cli: "docker"

deployment/mistral/mistral-executor-container-puppet.yaml

@@ -263,11 +263,3 @@ outputs:
             name: virt_sandbox_use_netlink
             persistent: yes
             state: yes
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - mistral_executor
-            tripleo_container_cli: "docker"

deployment/multipathd/multipathd-container.yaml

@@ -161,11 +161,3 @@ outputs:
             state: touch
             setype: svirt_sandbox_file_t
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - multipathd
-            tripleo_container_cli: "docker"

deployment/neutron/neutron-api-container-puppet.yaml

@@ -510,20 +510,6 @@ outputs:
               network: {get_param: [ServiceNetMap, NeutronApiNetwork]}
               type: node
           - null
-      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
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/neutron/neutron-dhcp-container-puppet.yaml

@@ -448,13 +448,6 @@ 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
-            tripleo_container_cli: "docker"
         - name: Check for neutron user
           getent:
             database: passwd

deployment/neutron/neutron-l3-container-puppet.yaml

@@ -410,13 +410,6 @@ 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
-            tripleo_container_cli: "docker"
         - name: Check for neutron user
           getent:
             database: passwd

deployment/neutron/neutron-metadata-container-puppet.yaml

@@ -210,14 +210,6 @@ outputs:
                 persistent: yes
                 state: yes
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - neutron_metadata_agent
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/neutron/neutron-ovs-agent-container-puppet.yaml

@@ -382,14 +382,6 @@ 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
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/neutron/neutron-sriov-agent-container-puppet.yaml

@@ -208,11 +208,3 @@ outputs:
       metadata_settings:
         get_attr: [NeutronBase, role_data, metadata_settings]
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - neutron_sriov_agent
-            tripleo_container_cli: "docker"

deployment/nova/nova-api-container-puppet.yaml

@@ -505,15 +505,6 @@ outputs:
                   - nova_api
                   - nova_api_cron
                 tripleo_delegate_to: "{{ groups['nova_api'] | default([]) }}"
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - nova_api
-              - nova_api_cron
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/nova/nova-compute-container-puppet.yaml

@@ -982,14 +982,6 @@ outputs:
             state: removed
           ignore_errors: True
           when: step|int == 2
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - nova_compute
-            tripleo_container_cli: "docker"
       scale_tasks:
         - when: step|int == 1
           tags: down

deployment/nova/nova-conductor-container-puppet.yaml

@@ -219,14 +219,6 @@ outputs:
                 name: virt_sandbox_use_netlink
                 persistent: yes
                 state: yes
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - nova_conductor
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/nova/nova-ironic-container-puppet.yaml

@@ -226,14 +226,6 @@ outputs:
             persistent: yes
             state: yes
       external_post_deploy_tasks: {get_attr: [NovaComputeCommon, nova_compute_common_deploy_steps_tasks]}
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - nova_compute
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/nova/nova-libvirt-container-puppet.yaml

@@ -909,12 +909,3 @@ outputs:
                 type: node
             - null
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - nova_virtlogd
-              - nova_libvirt
-            tripleo_container_cli: "docker"

deployment/nova/nova-metadata-container-puppet.yaml

@@ -285,11 +285,3 @@ outputs:
                 tripleo_containers_to_stop:
                   - nova_metadata
                 tripleo_delegate_to: "{{ groups['nova_metadata'] | default([]) }}"
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - nova_metadata
-            tripleo_container_cli: "docker"

deployment/nova/nova-migration-target-container-puppet.yaml

@@ -194,11 +194,3 @@ outputs:
               fail:
                 msg: nova-migration-target isn't working (healtcheck failed)
               when: nova_migration_target_healthcheck_state.status.ExecMainStatus != '0'
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - nova_migration_target
-            tripleo_container_cli: "docker"

deployment/nova/nova-scheduler-container-puppet.yaml

@@ -235,14 +235,6 @@ 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
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/nova/nova-vnc-proxy-container-puppet.yaml

@@ -324,14 +324,6 @@ 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
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/nova/novajoin-container-puppet.yaml

@@ -251,12 +251,3 @@ 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
-            tripleo_container_cli: "docker"

deployment/octavia/octavia-api-container-puppet.yaml

@@ -344,20 +344,3 @@ outputs:
             - step|int == 2
             - internal_tls_enabled|bool
           block: *remove_octavia_tls_proxy_tasks
-      post_upgrade_tasks:
-        - name: Set internal tls variable
-          set_fact:
-            internal_tls_enabled: {get_param: EnableInternalTLS}
-        - 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
-            tripleo_container_cli: "docker"

deployment/octavia/octavia-health-manager-container-puppet.yaml

@@ -164,13 +164,6 @@ outputs:
               /var/log/containers/octavia and /var/log/containers/httpd/octavia-api.
           ignore_errors: true
       post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - octavia_health_manager
-            tripleo_container_cli: "docker"
         - name: remove directory /etc/octavia/conf.d/common
           when: step|int == 5
           file:

deployment/octavia/octavia-housekeeping-container-puppet.yaml

@@ -164,13 +164,6 @@ outputs:
           ignore_errors: true
       upgrade_tasks: []
       post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - octavia_housekeeping
-            tripleo_container_cli: "docker"
         - name: remove directory /etc/octavia/conf.d/common
           when: step|int == 5
           file:

deployment/octavia/octavia-worker-container-puppet.yaml

@@ -164,13 +164,6 @@ outputs:
             state: yes
       upgrade_tasks: []
       post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - octavia_worker
-            tripleo_container_cli: "docker"
         - name: remove directory /etc/octavia/conf.d/common
           when: step|int == 5
           file:

deployment/ovn/ovn-controller-container-puppet.yaml

@@ -288,11 +288,3 @@ outputs:
             persistent: yes
             state: yes
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - ovn_controller
-            tripleo_container_cli: "docker"

deployment/ovn/ovn-dbs-container-puppet.yaml

@@ -218,13 +218,3 @@ outputs:
               /var/log/containers/openvswitch.
           ignore_errors: true
       upgrade_tasks: []
-      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
-            tripleo_container_cli: "docker"

deployment/ovn/ovn-metadata-container-puppet.yaml

@@ -364,11 +364,3 @@ outputs:
                 state: directory
                 setype: svirt_sandbox_file_t
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - ovn_metadata_agent
-            tripleo_container_cli: "docker"

deployment/pacemaker/clustercheck-container-puppet.yaml

@@ -97,14 +97,6 @@ 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
-            tripleo_container_cli: "docker"
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/placement/placement-api-container-puppet.yaml

@@ -302,11 +302,3 @@ outputs:
                     debug: {get_param: Debug}
       host_prep_tasks: {get_attr: [PlacementLogging, host_prep_tasks]}
       upgrade_tasks: []
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - nova_placement
-            tripleo_container_cli: "docker"

deployment/qdr/qdrouterd-container-puppet.yaml

@@ -150,11 +150,3 @@ outputs:
             /var/log/containers/qrouterd.
         ignore_errors: true
       metadata_settings: {}
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - qdrouterd
-            tripleo_container_cli: "docker"

deployment/rabbitmq/rabbitmq-container-puppet.yaml

@@ -366,11 +366,3 @@ 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
-            tripleo_container_cli: "docker"

deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml

@@ -310,11 +310,3 @@ 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
-            tripleo_container_cli: "docker"

deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml

@@ -310,11 +310,3 @@ 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
-            tripleo_container_cli: "docker"

deployment/sahara/sahara-api-container-puppet.yaml

@@ -208,14 +208,6 @@ outputs:
               Log files from sahara containers can be found under
               /var/log/containers/sahara.
           ignore_errors: true
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - sahara_api
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/sahara/sahara-engine-container-puppet.yaml

@@ -142,14 +142,6 @@ outputs:
             name: virt_sandbox_use_netlink
             persistent: yes
             state: yes
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - sahara_engine
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/swift/swift-proxy-container-puppet.yaml

@@ -474,19 +474,6 @@ outputs:
           when: swift_log_link.stat.islnk is defined and swift_log_link.stat.islnk
       metadata_settings:
         get_attr: [TLSProxyBase, 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
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/swift/swift-storage-container-puppet.yaml

@@ -663,27 +663,6 @@ outputs:
             path: /var/log/containers/swift
             state: absent
           when: swift_log_link.stat.islnk is defined and swift_log_link.stat.islnk
-      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
-            tripleo_container_cli: "docker"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/zaqar/zaqar-container-puppet.yaml

@@ -364,14 +364,5 @@ outputs:
               Log files from zaqar containers can be found under
               /var/log/containers/zaqar and /var/log/containers/httpd/zaqar.
           ignore_errors: true
-      post_upgrade_tasks:
-        - when: step|int == 1
-          import_role:
-            name: tripleo-docker-rm
-          vars:
-            containers_to_rm:
-              - zaqar
-              - zaqar_websocket
-            tripleo_container_cli: "docker"
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]