Merge "Get rid of docker removing in post_upgrade tasks."

This commit is contained in:
Zuul 2019-11-13 11:40:53 +00:00 committed by Gerrit Code Review
commit f195713779
87 changed files with 0 additions and 749 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

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"

View File

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

View File

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

View File

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

View File

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

View File

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

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"

View File

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

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

View File

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

View File

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

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"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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

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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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"

View File

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

View File

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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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"

View File

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

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

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

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

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

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"

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

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

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

View File

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

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"

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"

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"

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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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"

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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

View File

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

View File

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