Browse Source

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)
changes/00/695200/1
Jose Luis Franco Arza 2 months ago
parent
commit
cc4b7f4634
87 changed files with 0 additions and 749 deletions
  1. +0
    -8
      deployment/aodh/aodh-api-container-puppet.yaml
  2. +0
    -8
      deployment/aodh/aodh-evaluator-container-puppet.yaml
  3. +0
    -8
      deployment/aodh/aodh-listener-container-puppet.yaml
  4. +0
    -8
      deployment/aodh/aodh-notifier-container-puppet.yaml
  5. +0
    -10
      deployment/barbican/barbican-api-container-puppet.yaml
  6. +0
    -8
      deployment/cavium/liquidio-compute-config-container-puppet.yaml
  7. +0
    -8
      deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
  8. +0
    -8
      deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
  9. +0
    -8
      deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
  10. +0
    -8
      deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
  11. +0
    -9
      deployment/cinder/cinder-api-container-puppet.yaml
  12. +0
    -8
      deployment/cinder/cinder-backup-container-puppet.yaml
  13. +0
    -8
      deployment/cinder/cinder-scheduler-container-puppet.yaml
  14. +0
    -8
      deployment/cinder/cinder-volume-container-puppet.yaml
  15. +0
    -7
      deployment/database/mysql-container-puppet.yaml
  16. +0
    -14
      deployment/database/redis-container-puppet.yaml
  17. +0
    -8
      deployment/etcd/etcd-container-puppet.yaml
  18. +0
    -8
      deployment/experimental/designate/designate-api-container-puppet.yaml
  19. +0
    -8
      deployment/experimental/designate/designate-central-container-puppet.yaml
  20. +0
    -8
      deployment/experimental/designate/designate-mdns-container-puppet.yaml
  21. +0
    -8
      deployment/experimental/designate/designate-producer-container-puppet.yaml
  22. +0
    -8
      deployment/experimental/designate/designate-sink-container-puppet.yaml
  23. +0
    -9
      deployment/experimental/designate/designate-worker-container-puppet.yaml
  24. +0
    -14
      deployment/glance/glance-api-container-puppet.yaml
  25. +0
    -8
      deployment/gnocchi/gnocchi-api-container-puppet.yaml
  26. +0
    -8
      deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
  27. +0
    -8
      deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
  28. +0
    -8
      deployment/haproxy/haproxy-container-puppet.yaml
  29. +0
    -8
      deployment/heat/heat-api-cfn-container-puppet.yaml
  30. +0
    -9
      deployment/heat/heat-api-container-puppet.yaml
  31. +0
    -8
      deployment/heat/heat-engine-container-puppet.yaml
  32. +0
    -8
      deployment/horizon/horizon-container-puppet.yaml
  33. +0
    -8
      deployment/ironic/ironic-api-container-puppet.yaml
  34. +0
    -8
      deployment/ironic/ironic-conductor-container-puppet.yaml
  35. +0
    -9
      deployment/ironic/ironic-inspector-container-puppet.yaml
  36. +0
    -8
      deployment/ironic/ironic-neutron-agent-container-puppet.yaml
  37. +0
    -9
      deployment/ironic/ironic-pxe-container-puppet.yaml
  38. +0
    -8
      deployment/iscsid/iscsid-container-puppet.yaml
  39. +0
    -8
      deployment/keepalived/keepalived-container-puppet.yaml
  40. +0
    -9
      deployment/keystone/keystone-container-puppet.yaml
  41. +0
    -8
      deployment/logrotate/logrotate-crond-container-puppet.yaml
  42. +0
    -8
      deployment/manila/manila-api-container-puppet.yaml
  43. +0
    -8
      deployment/manila/manila-scheduler-container-puppet.yaml
  44. +0
    -8
      deployment/manila/manila-share-container-puppet.yaml
  45. +0
    -8
      deployment/memcached/memcached-container-puppet.yaml
  46. +0
    -8
      deployment/messaging/rpc-qdrouterd-container-puppet.yaml
  47. +0
    -8
      deployment/metrics/collectd-container-puppet.yaml
  48. +0
    -8
      deployment/metrics/qdr-container-puppet.yaml
  49. +0
    -8
      deployment/mistral/mistral-api-container-puppet.yaml
  50. +0
    -8
      deployment/mistral/mistral-engine-container-puppet.yaml
  51. +0
    -8
      deployment/mistral/mistral-event-engine-container-puppet.yaml
  52. +0
    -8
      deployment/mistral/mistral-executor-container-puppet.yaml
  53. +0
    -8
      deployment/multipathd/multipathd-container.yaml
  54. +0
    -14
      deployment/neutron/neutron-api-container-puppet.yaml
  55. +0
    -7
      deployment/neutron/neutron-dhcp-container-puppet.yaml
  56. +0
    -7
      deployment/neutron/neutron-l3-container-puppet.yaml
  57. +0
    -8
      deployment/neutron/neutron-metadata-container-puppet.yaml
  58. +0
    -8
      deployment/neutron/neutron-ovs-agent-container-puppet.yaml
  59. +0
    -8
      deployment/neutron/neutron-sriov-agent-container-puppet.yaml
  60. +0
    -9
      deployment/nova/nova-api-container-puppet.yaml
  61. +0
    -8
      deployment/nova/nova-compute-container-puppet.yaml
  62. +0
    -8
      deployment/nova/nova-conductor-container-puppet.yaml
  63. +0
    -8
      deployment/nova/nova-ironic-container-puppet.yaml
  64. +0
    -9
      deployment/nova/nova-libvirt-container-puppet.yaml
  65. +0
    -8
      deployment/nova/nova-metadata-container-puppet.yaml
  66. +0
    -8
      deployment/nova/nova-migration-target-container-puppet.yaml
  67. +0
    -8
      deployment/nova/nova-scheduler-container-puppet.yaml
  68. +0
    -8
      deployment/nova/nova-vnc-proxy-container-puppet.yaml
  69. +0
    -9
      deployment/nova/novajoin-container-puppet.yaml
  70. +0
    -17
      deployment/octavia/octavia-api-container-puppet.yaml
  71. +0
    -7
      deployment/octavia/octavia-health-manager-container-puppet.yaml
  72. +0
    -7
      deployment/octavia/octavia-housekeeping-container-puppet.yaml
  73. +0
    -7
      deployment/octavia/octavia-worker-container-puppet.yaml
  74. +0
    -8
      deployment/ovn/ovn-controller-container-puppet.yaml
  75. +0
    -10
      deployment/ovn/ovn-dbs-container-puppet.yaml
  76. +0
    -8
      deployment/ovn/ovn-metadata-container-puppet.yaml
  77. +0
    -8
      deployment/pacemaker/clustercheck-container-puppet.yaml
  78. +0
    -8
      deployment/placement/placement-api-container-puppet.yaml
  79. +0
    -8
      deployment/qdr/qdrouterd-container-puppet.yaml
  80. +0
    -8
      deployment/rabbitmq/rabbitmq-container-puppet.yaml
  81. +0
    -8
      deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
  82. +0
    -8
      deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
  83. +0
    -8
      deployment/sahara/sahara-api-container-puppet.yaml
  84. +0
    -8
      deployment/sahara/sahara-engine-container-puppet.yaml
  85. +0
    -13
      deployment/swift/swift-proxy-container-puppet.yaml
  86. +0
    -21
      deployment/swift/swift-storage-container-puppet.yaml
  87. +0
    -9
      deployment/zaqar/zaqar-container-puppet.yaml

+ 0
- 8
deployment/aodh/aodh-api-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/aodh/aodh-evaluator-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/aodh/aodh-listener-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/aodh/aodh-notifier-container-puppet.yaml View File

@@ -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

+ 0
- 10
deployment/barbican/barbican-api-container-puppet.yaml View File

@@ -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]

+ 0
- 8
deployment/cavium/liquidio-compute-config-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml View File

@@ -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

+ 0
- 9
deployment/cinder/cinder-api-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/cinder/cinder-backup-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/cinder/cinder-scheduler-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/cinder/cinder-volume-container-puppet.yaml View File

@@ -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

+ 0
- 7
deployment/database/mysql-container-puppet.yaml View File

@@ -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

+ 0
- 14
deployment/database/redis-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/etcd/etcd-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/experimental/designate/designate-api-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/experimental/designate/designate-central-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/experimental/designate/designate-mdns-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/experimental/designate/designate-producer-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/experimental/designate/designate-sink-container-puppet.yaml View File

@@ -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"

+ 0
- 9
deployment/experimental/designate/designate-worker-container-puppet.yaml View File

@@ -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"

+ 0
- 14
deployment/glance/glance-api-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/gnocchi/gnocchi-api-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/gnocchi/gnocchi-metricd-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/gnocchi/gnocchi-statsd-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/haproxy/haproxy-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/heat/heat-api-cfn-container-puppet.yaml View File

@@ -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

+ 0
- 9
deployment/heat/heat-api-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/heat/heat-engine-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/horizon/horizon-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/ironic/ironic-api-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/ironic/ironic-conductor-container-puppet.yaml View File

@@ -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

+ 0
- 9
deployment/ironic/ironic-inspector-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/ironic/ironic-neutron-agent-container-puppet.yaml View File

@@ -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"

+ 0
- 9
deployment/ironic/ironic-pxe-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/iscsid/iscsid-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/keepalived/keepalived-container-puppet.yaml View File

@@ -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"

+ 0
- 9
deployment/keystone/keystone-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/logrotate/logrotate-crond-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/manila/manila-api-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/manila/manila-scheduler-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/manila/manila-share-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/memcached/memcached-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/messaging/rpc-qdrouterd-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/metrics/collectd-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/metrics/qdr-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/mistral/mistral-api-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/mistral/mistral-engine-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/mistral/mistral-event-engine-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/mistral/mistral-executor-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/multipathd/multipathd-container.yaml View File

@@ -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"

+ 0
- 14
deployment/neutron/neutron-api-container-puppet.yaml View File

@@ -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

+ 0
- 7
deployment/neutron/neutron-dhcp-container-puppet.yaml View File

@@ -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

+ 0
- 7
deployment/neutron/neutron-l3-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/neutron/neutron-metadata-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/neutron/neutron-ovs-agent-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/neutron/neutron-sriov-agent-container-puppet.yaml View File

@@ -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"

+ 0
- 9
deployment/nova/nova-api-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/nova/nova-compute-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/nova/nova-conductor-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/nova/nova-ironic-container-puppet.yaml View File

@@ -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

+ 0
- 9
deployment/nova/nova-libvirt-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/nova/nova-metadata-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/nova/nova-migration-target-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/nova/nova-scheduler-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/nova/nova-vnc-proxy-container-puppet.yaml View File

@@ -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

+ 0
- 9
deployment/nova/novajoin-container-puppet.yaml View File

@@ -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"

+ 0
- 17
deployment/octavia/octavia-api-container-puppet.yaml View File

@@ -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"

+ 0
- 7
deployment/octavia/octavia-health-manager-container-puppet.yaml View File

@@ -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:

+ 0
- 7
deployment/octavia/octavia-housekeeping-container-puppet.yaml View File

@@ -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:

+ 0
- 7
deployment/octavia/octavia-worker-container-puppet.yaml View File

@@ -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:

+ 0
- 8
deployment/ovn/ovn-controller-container-puppet.yaml View File

@@ -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"

+ 0
- 10
deployment/ovn/ovn-dbs-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/ovn/ovn-metadata-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/pacemaker/clustercheck-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/placement/placement-api-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/qdr/qdrouterd-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/rabbitmq/rabbitmq-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml View File

@@ -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"

+ 0
- 8
deployment/sahara/sahara-api-container-puppet.yaml View File

@@ -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

+ 0
- 8
deployment/sahara/sahara-engine-container-puppet.yaml View File

@@ -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

+ 0
- 13
deployment/swift/swift-proxy-container-puppet.yaml View File

@@ -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

+ 0
- 21
deployment/swift/swift-storage-container-puppet.yaml View File

@@ -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

+ 0
- 9
deployment/zaqar/zaqar-container-puppet.yaml View File

@@ -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]

Loading…
Cancel
Save