diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index 24a80c5d6a..6c0ce2079e 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/deployment/aodh/aodh-api-container-puppet.yaml @@ -225,14 +225,6 @@ outputs: - { 'path': /var/log/containers/httpd/aodh-api, setype: svirt_sandbox_file_t, 'mode': '0750' } 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 diff --git a/deployment/aodh/aodh-evaluator-container-puppet.yaml b/deployment/aodh/aodh-evaluator-container-puppet.yaml index f79431c496..988755b4c2 100644 --- a/deployment/aodh/aodh-evaluator-container-puppet.yaml +++ b/deployment/aodh/aodh-evaluator-container-puppet.yaml @@ -115,14 +115,6 @@ outputs: setype: "{{ item.setype }}" with_items: - { 'path': /var/log/containers/aodh, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - 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 diff --git a/deployment/aodh/aodh-listener-container-puppet.yaml b/deployment/aodh/aodh-listener-container-puppet.yaml index 1f17926c16..9b58c13d82 100644 --- a/deployment/aodh/aodh-listener-container-puppet.yaml +++ b/deployment/aodh/aodh-listener-container-puppet.yaml @@ -115,14 +115,6 @@ outputs: setype: "{{ item.setype }}" with_items: - { 'path': /var/log/containers/aodh, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - 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 diff --git a/deployment/aodh/aodh-notifier-container-puppet.yaml b/deployment/aodh/aodh-notifier-container-puppet.yaml index cfe0112e53..a33f90f3b3 100644 --- a/deployment/aodh/aodh-notifier-container-puppet.yaml +++ b/deployment/aodh/aodh-notifier-container-puppet.yaml @@ -116,14 +116,6 @@ outputs: with_items: - { 'path': /var/log/containers/aodh, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - { 'path': /var/log/aodh, 'setype': svirt_sandbox_file_t } - 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 diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml index ce4e59e288..0da6d48284 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/deployment/barbican/barbican-api-container-puppet.yaml @@ -733,15 +733,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] diff --git a/deployment/cavium/liquidio-compute-config-container-puppet.yaml b/deployment/cavium/liquidio-compute-config-container-puppet.yaml index 6d5b138139..0319abb4e9 100644 --- a/deployment/cavium/liquidio-compute-config-container-puppet.yaml +++ b/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" diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml index 52aa9111c0..aedeee2932 100644 --- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml @@ -151,14 +151,6 @@ outputs: setype: "{{ item.setype }}" with_items: - { 'path': /var/log/containers/ceilometer, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - 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 diff --git a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml index b2b1e6d5e4..383b2b6638 100644 --- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml @@ -125,14 +125,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 diff --git a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml index e3d28090ad..08c211b1a1 100644 --- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml @@ -138,14 +138,6 @@ outputs: setype: "{{ item.setype }}" with_items: - { 'path': /var/log/containers/ceilometer, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - 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 diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml index aaf35a6816..555c0fc5d0 100644 --- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml @@ -130,14 +130,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 diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 2bb00cf371..0f43ce962e 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -367,15 +367,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 diff --git a/deployment/cinder/cinder-backup-container-puppet.yaml b/deployment/cinder/cinder-backup-container-puppet.yaml index 7c3d153b76..5f3af2cd00 100644 --- a/deployment/cinder/cinder-backup-container-puppet.yaml +++ b/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" diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml index 343fada503..765f5d7424 100644 --- a/deployment/cinder/cinder-scheduler-container-puppet.yaml +++ b/deployment/cinder/cinder-scheduler-container-puppet.yaml @@ -141,14 +141,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 diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml index 179b03c1cd..0a05894923 100644 --- a/deployment/cinder/cinder-volume-container-puppet.yaml +++ b/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 diff --git a/deployment/database/mysql-container-puppet.yaml b/deployment/database/mysql-container-puppet.yaml index 61dfa79b96..0b1bf2ddef 100644 --- a/deployment/database/mysql-container-puppet.yaml +++ b/deployment/database/mysql-container-puppet.yaml @@ -307,13 +307,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 diff --git a/deployment/database/redis-container-puppet.yaml b/deployment/database/redis-container-puppet.yaml index c9a0fb24fb..479c172490 100644 --- a/deployment/database/redis-container-puppet.yaml +++ b/deployment/database/redis-container-puppet.yaml @@ -259,17 +259,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" diff --git a/deployment/etcd/etcd-container-puppet.yaml b/deployment/etcd/etcd-container-puppet.yaml index c8ecb1b381..8fb20bb0ee 100644 --- a/deployment/etcd/etcd-container-puppet.yaml +++ b/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" diff --git a/deployment/experimental/designate/designate-api-container-puppet.yaml b/deployment/experimental/designate/designate-api-container-puppet.yaml index 1d357cae94..7e2ce04a62 100644 --- a/deployment/experimental/designate/designate-api-container-puppet.yaml +++ b/deployment/experimental/designate/designate-api-container-puppet.yaml @@ -161,11 +161,3 @@ outputs: setype: "{{ item.setype }}" with_items: - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - post_upgrade_tasks: - - when: step|int == 1 - import_role: - name: tripleo-docker-rm - vars: - containers_to_rm: - - designate_api - tripleo_container_cli: "docker" diff --git a/deployment/experimental/designate/designate-central-container-puppet.yaml b/deployment/experimental/designate/designate-central-container-puppet.yaml index 54af2ce748..87f00a16e8 100644 --- a/deployment/experimental/designate/designate-central-container-puppet.yaml +++ b/deployment/experimental/designate/designate-central-container-puppet.yaml @@ -211,11 +211,3 @@ outputs: setype: "{{ item.setype }}" with_items: - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - post_upgrade_tasks: - - when: step|int == 1 - import_role: - name: tripleo-docker-rm - vars: - containers_to_rm: - - designate_central - tripleo_container_cli: "docker" diff --git a/deployment/experimental/designate/designate-mdns-container-puppet.yaml b/deployment/experimental/designate/designate-mdns-container-puppet.yaml index 0fde9197df..76c94c9672 100644 --- a/deployment/experimental/designate/designate-mdns-container-puppet.yaml +++ b/deployment/experimental/designate/designate-mdns-container-puppet.yaml @@ -178,11 +178,3 @@ outputs: with_items: - { 'path': /var/log/designate, 'setype': svirt_sandbox_file_t } - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - post_upgrade_tasks: - - when: step|int == 1 - import_role: - name: tripleo-docker-rm - vars: - containers_to_rm: - - designate_mdns - tripleo_container_cli: "docker" diff --git a/deployment/experimental/designate/designate-producer-container-puppet.yaml b/deployment/experimental/designate/designate-producer-container-puppet.yaml index 88eac4ca5e..3e32e4f61f 100644 --- a/deployment/experimental/designate/designate-producer-container-puppet.yaml +++ b/deployment/experimental/designate/designate-producer-container-puppet.yaml @@ -134,11 +134,3 @@ outputs: setype: "{{ item.setype }}" with_items: - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - post_upgrade_tasks: - - when: step|int == 1 - import_role: - name: tripleo-docker-rm - vars: - containers_to_rm: - - designate_producer - tripleo_container_cli: "docker" diff --git a/deployment/experimental/designate/designate-sink-container-puppet.yaml b/deployment/experimental/designate/designate-sink-container-puppet.yaml index 0a79880e80..7981909922 100644 --- a/deployment/experimental/designate/designate-sink-container-puppet.yaml +++ b/deployment/experimental/designate/designate-sink-container-puppet.yaml @@ -126,11 +126,3 @@ outputs: setype: "{{ item.setype }}" with_items: - { 'path': /var/log/containers/designate, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - post_upgrade_tasks: - - when: step|int == 1 - import_role: - name: tripleo-docker-rm - vars: - containers_to_rm: - - designate_sink - tripleo_container_cli: "docker" diff --git a/deployment/experimental/designate/designate-worker-container-puppet.yaml b/deployment/experimental/designate/designate-worker-container-puppet.yaml index 909fc63c73..4d1907a7d3 100644 --- a/deployment/experimental/designate/designate-worker-container-puppet.yaml +++ b/deployment/experimental/designate/designate-worker-container-puppet.yaml @@ -232,12 +232,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" diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 9e7085afa9..8627c9c70a 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -612,20 +612,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 diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index 9ac7074ca4..ee0c9a167d 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml @@ -364,14 +364,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 diff --git a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml index 15f3e6d2fd..e2ca033c3b 100644 --- a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml @@ -170,14 +170,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 diff --git a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml index 62cf69114f..db76870211 100644 --- a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml @@ -164,14 +164,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 diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml index 7efcf75329..8f77dbd77b 100644 --- a/deployment/haproxy/haproxy-container-puppet.yaml +++ b/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 diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index 0f8b379c72..44ed018ca4 100644 --- a/deployment/heat/heat-api-cfn-container-puppet.yaml +++ b/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 diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml index e4ea1305ab..97e87bcd63 100644 --- a/deployment/heat/heat-api-container-puppet.yaml +++ b/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 diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml index 91879053c0..df09f1c1db 100644 --- a/deployment/heat/heat-engine-container-puppet.yaml +++ b/deployment/heat/heat-engine-container-puppet.yaml @@ -289,14 +289,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 diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index c4f239c223..27c973a842 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/deployment/horizon/horizon-container-puppet.yaml @@ -323,14 +323,6 @@ outputs: - { 'path': /var/log/containers/httpd/horizon, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - { 'path': /var/www, 'setype': svirt_sandbox_file_t } 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 diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index 4608e2d11a..e06d1b5a86 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-api-container-puppet.yaml @@ -279,14 +279,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 diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml index fb23d3aa8f..d0db833df2 100644 --- a/deployment/ironic/ironic-conductor-container-puppet.yaml +++ b/deployment/ironic/ironic-conductor-container-puppet.yaml @@ -584,14 +584,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 diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml index 6a01408bac..77b749b995 100644 --- a/deployment/ironic/ironic-inspector-container-puppet.yaml +++ b/deployment/ironic/ironic-inspector-container-puppet.yaml @@ -485,12 +485,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" diff --git a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml index 8107a46ade..92af478269 100644 --- a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml +++ b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml @@ -120,11 +120,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" diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml index b531487d7f..850ab8bc48 100644 --- a/deployment/ironic/ironic-pxe-container-puppet.yaml +++ b/deployment/ironic/ironic-pxe-container-puppet.yaml @@ -156,12 +156,3 @@ outputs: - { 'path': /var/lib/ironic, 'setype': svirt_sandbox_file_t } - { 'path': /var/log/containers/ironic, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - { 'path': /var/log/containers/httpd/ironic-pxe, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - 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" diff --git a/deployment/iscsid/iscsid-container-puppet.yaml b/deployment/iscsid/iscsid-container-puppet.yaml index bff6b8b378..ac1b3f2b57 100644 --- a/deployment/iscsid/iscsid-container-puppet.yaml +++ b/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" diff --git a/deployment/keepalived/keepalived-container-puppet.yaml b/deployment/keepalived/keepalived-container-puppet.yaml index 4cbda3ceb1..ed1ce1feaa 100644 --- a/deployment/keepalived/keepalived-container-puppet.yaml +++ b/deployment/keepalived/keepalived-container-puppet.yaml @@ -150,11 +150,3 @@ outputs: setype: "{{ item.setype }}" with_items: - { 'path': /var/log/containers/keepalived, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - post_upgrade_tasks: - - when: step|int == 1 - import_role: - name: tripleo-docker-rm - vars: - containers_to_rm: - - keepalived - tripleo_container_cli: "docker" diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index 42cb8f4121..f5f137cb6f 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -720,15 +720,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 diff --git a/deployment/logrotate/logrotate-crond-container-puppet.yaml b/deployment/logrotate/logrotate-crond-container-puppet.yaml index f637ded3c2..8ca58967ac 100644 --- a/deployment/logrotate/logrotate-crond-container-puppet.yaml +++ b/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 diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index f3f9766eb6..49cce77488 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -244,14 +244,6 @@ outputs: - { 'path': /var/log/containers/manila, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - { 'path': /var/log/containers/httpd/manila-api, 'setype': svirt_sandbox_file_t, 'mode': '0750' } 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 diff --git a/deployment/manila/manila-scheduler-container-puppet.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml index 629c15a300..6eaff75f61 100644 --- a/deployment/manila/manila-scheduler-container-puppet.yaml +++ b/deployment/manila/manila-scheduler-container-puppet.yaml @@ -116,14 +116,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 diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml index 0916b69427..6920214eea 100644 --- a/deployment/manila/manila-share-container-puppet.yaml +++ b/deployment/manila/manila-share-container-puppet.yaml @@ -171,14 +171,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 diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml index 0dc0955c98..b5a5031c42 100644 --- a/deployment/memcached/memcached-container-puppet.yaml +++ b/deployment/memcached/memcached-container-puppet.yaml @@ -171,14 +171,6 @@ outputs: - /var/lib/config-data/memcached/etc/sysconfig/memcached:/etc/sysconfig/memcached:ro command: ['/bin/bash', '-c', 'source /etc/sysconfig/memcached; exec /usr/bin/memcached -p ${PORT} -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS'] 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 diff --git a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml index d0c6800455..1be9e7ff39 100644 --- a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml +++ b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml @@ -153,11 +153,3 @@ outputs: - { 'path': /var/log/containers/qdrouterd, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - { '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" diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml index 4019310140..9d0156898f 100644 --- a/deployment/metrics/collectd-container-puppet.yaml +++ b/deployment/metrics/collectd-container-puppet.yaml @@ -662,11 +662,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" diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml index a56dc81487..02cc8e3c05 100644 --- a/deployment/metrics/qdr-container-puppet.yaml +++ b/deployment/metrics/qdr-container-puppet.yaml @@ -299,11 +299,3 @@ outputs: with_items: - { 'path': /var/log/containers/metrics-qdr, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - { 'path': /var/lib/metrics-qdr, 'setype': svirt_sandbox_file_t } - post_upgrade_tasks: - - when: step|int == 1 - import_role: - name: tripleo-docker-rm - vars: - containers_to_rm: - - metrics_qdr - tripleo_container_cli: "docker" diff --git a/deployment/mistral/mistral-api-container-puppet.yaml b/deployment/mistral/mistral-api-container-puppet.yaml index 5eeba6115d..dee5fadc8a 100644 --- a/deployment/mistral/mistral-api-container-puppet.yaml +++ b/deployment/mistral/mistral-api-container-puppet.yaml @@ -223,11 +223,3 @@ outputs: setype: "{{ item.setype }}" with_items: - { 'path': /var/log/containers/mistral, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - post_upgrade_tasks: - - when: step|int == 1 - import_role: - name: tripleo-docker-rm - vars: - containers_to_rm: - - mistral_api - tripleo_container_cli: "docker" diff --git a/deployment/mistral/mistral-engine-container-puppet.yaml b/deployment/mistral/mistral-engine-container-puppet.yaml index f119d6f23a..21123299c1 100644 --- a/deployment/mistral/mistral-engine-container-puppet.yaml +++ b/deployment/mistral/mistral-engine-container-puppet.yaml @@ -144,11 +144,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" diff --git a/deployment/mistral/mistral-event-engine-container-puppet.yaml b/deployment/mistral/mistral-event-engine-container-puppet.yaml index 3e9ab7522d..21dfcd82ec 100644 --- a/deployment/mistral/mistral-event-engine-container-puppet.yaml +++ b/deployment/mistral/mistral-event-engine-container-puppet.yaml @@ -119,11 +119,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" diff --git a/deployment/mistral/mistral-executor-container-puppet.yaml b/deployment/mistral/mistral-executor-container-puppet.yaml index d73a31da75..1c54226ed4 100644 --- a/deployment/mistral/mistral-executor-container-puppet.yaml +++ b/deployment/mistral/mistral-executor-container-puppet.yaml @@ -255,11 +255,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" diff --git a/deployment/multipathd/multipathd-container.yaml b/deployment/multipathd/multipathd-container.yaml index 618da40310..c2d3b6af7d 100644 --- a/deployment/multipathd/multipathd-container.yaml +++ b/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" diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index ec8915fc47..7e808882c8 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/deployment/neutron/neutron-api-container-puppet.yaml @@ -520,20 +520,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 diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml index 9a8bda15b5..b4aa5e44ca 100644 --- a/deployment/neutron/neutron-dhcp-container-puppet.yaml +++ b/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 diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml index 5e80d793bb..a9ebfad756 100644 --- a/deployment/neutron/neutron-l3-container-puppet.yaml +++ b/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 diff --git a/deployment/neutron/neutron-metadata-container-puppet.yaml b/deployment/neutron/neutron-metadata-container-puppet.yaml index c3374a1eea..9370917a84 100644 --- a/deployment/neutron/neutron-metadata-container-puppet.yaml +++ b/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 diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml index 8dd483e2dd..1a06f3fa4e 100644 --- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml +++ b/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 diff --git a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml index 0ff924762d..b47104b24f 100644 --- a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml +++ b/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" diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index aa31c1af49..4acd9527b5 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/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 diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index 3510a386e2..6849286e39 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/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 diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml index 2c8a18948c..d0d4cf80cc 100644 --- a/deployment/nova/nova-conductor-container-puppet.yaml +++ b/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 diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml index 549186bf44..e50479d4db 100644 --- a/deployment/nova/nova-ironic-container-puppet.yaml +++ b/deployment/nova/nova-ironic-container-puppet.yaml @@ -229,14 +229,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 diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml index 38a52a227f..b9e77e04b0 100644 --- a/deployment/nova/nova-libvirt-container-puppet.yaml +++ b/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" diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index 2f73941d07..08188d052c 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/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" diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml index 94184922f8..0978dced40 100644 --- a/deployment/nova/nova-migration-target-container-puppet.yaml +++ b/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" diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml index 0172e90342..40562f817c 100644 --- a/deployment/nova/nova-scheduler-container-puppet.yaml +++ b/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 diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml index 7fe7294e64..aa5b3236f2 100644 --- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml +++ b/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 diff --git a/deployment/nova/novajoin-container-puppet.yaml b/deployment/nova/novajoin-container-puppet.yaml index fd1c8615fd..9766a53a2b 100644 --- a/deployment/nova/novajoin-container-puppet.yaml +++ b/deployment/nova/novajoin-container-puppet.yaml @@ -257,12 +257,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" diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml index 107f4b6b14..57124defd9 100644 --- a/deployment/octavia/octavia-api-container-puppet.yaml +++ b/deployment/octavia/octavia-api-container-puppet.yaml @@ -336,20 +336,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" diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml index 3045441e89..52ee4dcac1 100644 --- a/deployment/octavia/octavia-health-manager-container-puppet.yaml +++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml @@ -156,13 +156,6 @@ outputs: with_items: - { 'path': /var/log/containers/octavia, 'setype': svirt_sandbox_file_t, 'mode': '0750' } 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: diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml index 982a11d169..6411c8b5c0 100644 --- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml +++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml @@ -156,13 +156,6 @@ outputs: - { 'path': /var/log/containers/octavia, 'setype': svirt_sandbox_file_t, 'mode': '0750' } 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: diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml index 27a9a5628d..25e7182d42 100644 --- a/deployment/octavia/octavia-worker-container-puppet.yaml +++ b/deployment/octavia/octavia-worker-container-puppet.yaml @@ -156,13 +156,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: diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml index 2f87d8b219..c24b887c8b 100644 --- a/deployment/ovn/ovn-controller-container-puppet.yaml +++ b/deployment/ovn/ovn-controller-container-puppet.yaml @@ -280,11 +280,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" diff --git a/deployment/ovn/ovn-dbs-container-puppet.yaml b/deployment/ovn/ovn-dbs-container-puppet.yaml index 95fbc25c88..9ce61470d7 100644 --- a/deployment/ovn/ovn-dbs-container-puppet.yaml +++ b/deployment/ovn/ovn-dbs-container-puppet.yaml @@ -210,13 +210,3 @@ outputs: - { 'path': /var/log/containers/openvswitch, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - { 'path': /var/lib/openvswitch/ovn, '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_north_db_server - - ovn_south_db_server - - ovn_northd - tripleo_container_cli: "docker" diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml index 36e8770ad7..3b826057dd 100644 --- a/deployment/ovn/ovn-metadata-container-puppet.yaml +++ b/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" diff --git a/deployment/pacemaker/clustercheck-container-puppet.yaml b/deployment/pacemaker/clustercheck-container-puppet.yaml index 340728025d..489bc3522c 100644 --- a/deployment/pacemaker/clustercheck-container-puppet.yaml +++ b/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 diff --git a/deployment/placement/placement-api-container-puppet.yaml b/deployment/placement/placement-api-container-puppet.yaml index 739085ac89..e1e055f3cb 100644 --- a/deployment/placement/placement-api-container-puppet.yaml +++ b/deployment/placement/placement-api-container-puppet.yaml @@ -318,11 +318,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" diff --git a/deployment/qdr/qdrouterd-container-puppet.yaml b/deployment/qdr/qdrouterd-container-puppet.yaml index c5231c8e91..6735af2567 100644 --- a/deployment/qdr/qdrouterd-container-puppet.yaml +++ b/deployment/qdr/qdrouterd-container-puppet.yaml @@ -142,11 +142,3 @@ outputs: - { 'path': /var/log/containers/qdrouterd, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - { '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" diff --git a/deployment/rabbitmq/rabbitmq-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-container-puppet.yaml index fe940c0c51..e2ad70ffa4 100644 --- a/deployment/rabbitmq/rabbitmq-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-container-puppet.yaml @@ -358,11 +358,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" diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml index 0b713fcc26..20975f2d94 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml @@ -302,11 +302,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" diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml index 15de0952c8..041b3d4254 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml @@ -302,11 +302,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" diff --git a/deployment/sahara/sahara-api-container-puppet.yaml b/deployment/sahara/sahara-api-container-puppet.yaml index 6cd86cef0f..a4717408ff 100644 --- a/deployment/sahara/sahara-api-container-puppet.yaml +++ b/deployment/sahara/sahara-api-container-puppet.yaml @@ -200,14 +200,6 @@ outputs: with_items: - { 'path': /var/log/containers/sahara, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - { 'path': /var/lib/sahara, 'setype': svirt_sandbox_file_t } - 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 diff --git a/deployment/sahara/sahara-engine-container-puppet.yaml b/deployment/sahara/sahara-engine-container-puppet.yaml index 42e1dca87c..0194f5a20b 100644 --- a/deployment/sahara/sahara-engine-container-puppet.yaml +++ b/deployment/sahara/sahara-engine-container-puppet.yaml @@ -134,14 +134,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 diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml index 35396c4ff2..ce4a21ac08 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/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 diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml index f1ccae3ddb..1b1d54bdcf 100644 --- a/deployment/swift/swift-storage-container-puppet.yaml +++ b/deployment/swift/swift-storage-container-puppet.yaml @@ -654,27 +654,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 diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/zaqar/zaqar-container-puppet.yaml index deec3c623c..b9ddfd4198 100644 --- a/deployment/zaqar/zaqar-container-puppet.yaml +++ b/deployment/zaqar/zaqar-container-puppet.yaml @@ -372,14 +372,5 @@ outputs: with_items: - { 'path': /var/log/containers/zaqar, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - { 'path': /var/log/containers/httpd/zaqar, 'setype': svirt_sandbox_file_t, 'mode': '0750' } - 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]