openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Force removal of docker container in tripleo-docker-rm. 

The tripleo-docker-rm role has been replaced by tripleo-container-rm [0].
This role will identify the docker engine via the container_cli variable
and perform a deletion of that container. However, these tasks inside the
post_upgrade_tasks section were thought to remove the old docker containers
after upgrading from rocky to stein, in which podman starts to be the
container engine by default.

For that reason, we need to ensure that the container engine in which the
containers are removed is docker, as otherwise we will be removing the
podman container and the deployment steps will fail.

Closes-Bug: #1836531
[0] - 2135446a35

Depends-On: https://review.opendev.org/#/c/671698/
Change-Id: Ib139a1d77f71fc32a49c9878d1b4a6d07564e9dc
This commit is contained in:
Jose Luis Franco Arza 2019-07-15 11:01:39 +02:00 committed by Jose Luis Franco
parent 55367ac0f5
commit d1035703b7
94 changed files with 94 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/aodh/aodh-api-container-puppet.yaml
View File

@ -240,6 +240,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- aodh_api - aodh_api
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/aodh/aodh-evaluator-container-puppet.yaml
View File

@ -130,6 +130,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- aodh_evaluator - aodh_evaluator
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/aodh/aodh-listener-container-puppet.yaml
View File

@ -130,6 +130,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- aodh_listener - aodh_listener
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/aodh/aodh-notifier-container-puppet.yaml
View File

@ -130,6 +130,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- aodh_notifier - aodh_notifier
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/barbican/barbican-api-container-puppet.yaml
View File

@ -741,5 +741,6 @@ outputs:
- barbican_api - barbican_api
- barbican_keystone_listener - barbican_keystone_listener
- barbican_worker - barbican_worker
tripleo_container_cli: "docker"
metadata_settings: metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings] get_attr: [ApacheServiceBase, role_data, metadata_settings]

1
deployment/cavium/liquidio-compute-config-container-puppet.yaml
View File

@ -132,3 +132,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- liquidio_compute_service - liquidio_compute_service
tripleo_container_cli: "docker"

1
deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
View File

@ -168,6 +168,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- ceilometer_agent_central - ceilometer_agent_central
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
View File

@ -140,6 +140,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- ceilometer_agent_compute - ceilometer_agent_compute
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
View File

@ -155,6 +155,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- ceilometer_agent_ipmi - ceilometer_agent_ipmi
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
View File

@ -166,6 +166,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- ceilometer_agent_notification - ceilometer_agent_notification
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/cinder/cinder-api-container-puppet.yaml
View File

@ -390,6 +390,7 @@ outputs:
containers_to_rm: containers_to_rm:
- cinder_api - cinder_api
- cinder_api_cron - cinder_api_cron
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/cinder/cinder-backup-container-puppet.yaml
View File

@ -217,3 +217,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- cinder_backup - cinder_backup
tripleo_container_cli: "docker"

1
deployment/cinder/cinder-scheduler-container-puppet.yaml
View File

@ -158,6 +158,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- cinder_scheduler - cinder_scheduler
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/cinder/cinder-volume-container-puppet.yaml
View File

@ -334,6 +334,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- cinder_volume - cinder_volume
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/database/mysql-container-puppet.yaml
View File

@ -324,6 +324,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- mysql - mysql
tripleo_container_cli: "docker"
- name: Check and upgrade Mysql database after major version upgrade - name: Check and upgrade Mysql database after major version upgrade
command: "{{ container_cli }} exec -u root mysql mysql_upgrade" command: "{{ container_cli }} exec -u root mysql mysql_upgrade"
when: step|int == 2 when: step|int == 2

1
deployment/database/redis-container-puppet.yaml
View File

@ -259,3 +259,4 @@ outputs:
- internal_tls_enabled - internal_tls_enabled
- - redis_tls_proxy - - redis_tls_proxy
- null - null
tripleo_container_cli: "docker"

1
deployment/deprecated/logging/fluentd-container-puppet.yaml
View File

@ -184,6 +184,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- fluentd - fluentd
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
View File

@ -240,6 +240,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- sensu_client - sensu_client
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/deprecated/nova/nova-consoleauth-container-puppet.yaml
View File

@ -145,6 +145,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- nova_consoleauth - nova_consoleauth
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/deprecated/opendaylight/opendaylight-api-container-puppet.yaml
View File

@ -343,6 +343,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- opendaylight_api - opendaylight_api
tripleo_container_cli: "docker"
update_tasks: update_tasks:
- name: Get ODL update level - name: Get ODL update level
block: &get_odl_update_level block: &get_odl_update_level

1
deployment/deprecated/panko/panko-api-container-puppet.yaml
View File

@ -338,3 +338,4 @@ outputs:
containers_to_rm: containers_to_rm:
- panko_api - panko_api
- panko_api_cron - panko_api_cron
tripleo_container_cli: "docker"

1
deployment/ec2/ec2-api-container-puppet.yaml
View File

@ -374,5 +374,6 @@ outputs:
- internal_tls_enabled - internal_tls_enabled
- - ec2_api_tls_proxy - - ec2_api_tls_proxy
- null - null
tripleo_container_cli: "docker"
metadata_settings: metadata_settings:
get_attr: [TLSProxyBase, role_data, metadata_settings] get_attr: [TLSProxyBase, role_data, metadata_settings]

1
deployment/etcd/etcd-container-puppet.yaml
View File

@ -174,3 +174,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- etcd - etcd
tripleo_container_cli: "docker"

1
deployment/experimental/designate/designate-api-container-puppet.yaml
View File

@ -176,3 +176,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- designate_api - designate_api
tripleo_container_cli: "docker"

1
deployment/experimental/designate/designate-central-container-puppet.yaml
View File

@ -210,3 +210,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- designate_central - designate_central
tripleo_container_cli: "docker"

1
deployment/experimental/designate/designate-mdns-container-puppet.yaml
View File

@ -176,3 +176,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- designate_mdns - designate_mdns
tripleo_container_cli: "docker"

1
deployment/experimental/designate/designate-producer-container-puppet.yaml
View File

@ -151,3 +151,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- designate_producer - designate_producer
tripleo_container_cli: "docker"

1
deployment/experimental/designate/designate-sink-container-puppet.yaml
View File

@ -141,3 +141,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- designate_sink - designate_sink
tripleo_container_cli: "docker"

1
deployment/experimental/designate/designate-worker-container-puppet.yaml
View File

@ -250,3 +250,4 @@ outputs:
containers_to_rm: containers_to_rm:
- designate_backend_bind9 - designate_backend_bind9
- designate_worker - designate_worker
tripleo_container_cli: "docker"

1
deployment/glance/glance-api-container-puppet.yaml
View File

@ -611,6 +611,7 @@ outputs:
- internal_tls_enabled - internal_tls_enabled
- - glance_api_tls_proxy - - glance_api_tls_proxy
- null - null
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/gnocchi/gnocchi-api-container-puppet.yaml
View File

@ -381,6 +381,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- gnocchi_api - gnocchi_api
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
View File

@ -185,6 +185,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- gnocchi_metricd - gnocchi_metricd
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
View File

@ -179,6 +179,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- gnocchi_statsd - gnocchi_statsd
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- name: FFU check if openstack-gnocchi-statsd is deployed - name: FFU check if openstack-gnocchi-statsd is deployed
command: systemctl is-enabled --quiet openstack-gnocchi-statsd command: systemctl is-enabled --quiet openstack-gnocchi-statsd

1
deployment/haproxy/haproxy-container-puppet.yaml
View File

@ -322,6 +322,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- haproxy - haproxy
tripleo_container_cli: "docker"
host_prep_tasks: host_prep_tasks:
- {get_attr: [HAProxyPublicTLS, role_data, host_prep_tasks]} - {get_attr: [HAProxyPublicTLS, role_data, host_prep_tasks]}
- name: Check if rsyslog exists - name: Check if rsyslog exists

1
deployment/heat/heat-api-cfn-container-puppet.yaml
View File

@ -223,6 +223,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- heat_api_cfn - heat_api_cfn
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/heat/heat-api-container-puppet.yaml
View File

@ -272,6 +272,7 @@ outputs:
containers_to_rm: containers_to_rm:
- heat_api - heat_api
- heat_api_cron - heat_api_cron
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/heat/heat-engine-container-puppet.yaml
View File

@ -284,6 +284,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- heat_engine - heat_engine
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/horizon/horizon-container-puppet.yaml
View File

@ -336,3 +336,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- horizon - horizon
tripleo_container_cli: "docker"

1
deployment/ironic/ironic-api-container-puppet.yaml
View File

@ -311,6 +311,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- ironic_api - ironic_api
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/ironic/ironic-conductor-container-puppet.yaml
View File

@ -593,6 +593,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- ironic_conductor - ironic_conductor
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/ironic/ironic-inspector-container-puppet.yaml
View File

@ -467,3 +467,4 @@ outputs:
containers_to_rm: containers_to_rm:
- ironic_inspector - ironic_inspector
- ironic_inspector_dnsmasq - ironic_inspector_dnsmasq
tripleo_container_cli: "docker"

1
deployment/ironic/ironic-neutron-agent-container-puppet.yaml
View File

@ -126,3 +126,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- ironic_neutron_agent - ironic_neutron_agent
tripleo_container_cli: "docker"

1
deployment/ironic/ironic-pxe-container-puppet.yaml
View File

@ -172,3 +172,4 @@ outputs:
containers_to_rm: containers_to_rm:
- ironic_pxe_tftp - ironic_pxe_tftp
- ironic_pxe_http - ironic_pxe_http
tripleo_container_cli: "docker"

1
deployment/iscsid/iscsid-container-puppet.yaml
View File

@ -128,3 +128,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- iscsid - iscsid
tripleo_container_cli: "docker"

1
deployment/keepalived/keepalived-container-puppet.yaml
View File

@ -165,3 +165,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- keepalived - keepalived
tripleo_container_cli: "docker"

1
deployment/keystone/keystone-container-puppet.yaml
View File

@ -782,6 +782,7 @@ outputs:
containers_to_rm: containers_to_rm:
- keystone - keystone
- keystone_cron - keystone_cron
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/logrotate/logrotate-crond-container-puppet.yaml
View File

@ -135,3 +135,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- logrotate_crond - logrotate_crond
tripleo_container_cli: "docker"

1
deployment/manila/manila-api-container-puppet.yaml
View File

@ -259,6 +259,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- manila_api - manila_api
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- name: Check if manila_api is deployed - name: Check if manila_api is deployed
command: systemctl is-enabled --quiet openstack-manila-api command: systemctl is-enabled --quiet openstack-manila-api

1
deployment/manila/manila-scheduler-container-puppet.yaml
View File

@ -131,6 +131,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- manila_scheduler - manila_scheduler
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- name: Check if manila_scheduler is deployed - name: Check if manila_scheduler is deployed
command: systemctl is-enabled --quiet openstack-manila-scheduler command: systemctl is-enabled --quiet openstack-manila-scheduler

1
deployment/manila/manila-share-container-puppet.yaml
View File

@ -181,6 +181,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- manila_share - manila_share
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- name: Check if manila_share is deployed - name: Check if manila_share is deployed
command: systemctl is-enabled --quiet openstack-manila-share command: systemctl is-enabled --quiet openstack-manila-share

1
deployment/memcached/memcached-container-puppet.yaml
View File

@ -192,6 +192,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- memcached - memcached
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/messaging/rpc-qdrouterd-container-puppet.yaml
View File

@ -160,3 +160,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- qdrouterd - qdrouterd
tripleo_container_cli: "docker"

1
deployment/metrics/collectd-container-puppet.yaml
View File

@ -528,3 +528,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- collectd - collectd
tripleo_container_cli: "docker"

1
deployment/metrics/qdr-container-puppet.yaml
View File

@ -315,3 +315,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- metrics_qdr - metrics_qdr
tripleo_container_cli: "docker"

1
deployment/mistral/mistral-api-container-puppet.yaml
View File

@ -238,3 +238,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- mistral_api - mistral_api
tripleo_container_cli: "docker"

1
deployment/mistral/mistral-engine-container-puppet.yaml
View File

@ -159,3 +159,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- mistral_engine - mistral_engine
tripleo_container_cli: "docker"

1
deployment/mistral/mistral-event-engine-container-puppet.yaml
View File

@ -134,3 +134,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- mistral_event_engine - mistral_event_engine
tripleo_container_cli: "docker"

1
deployment/mistral/mistral-executor-container-puppet.yaml
View File

@ -235,3 +235,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- mistral_executor - mistral_executor
tripleo_container_cli: "docker"

1
deployment/multipathd/multipathd-container.yaml
View File

@ -161,3 +161,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- multipathd - multipathd
tripleo_container_cli: "docker"

1
deployment/neutron/neutron-api-container-puppet.yaml
View File

@ -467,6 +467,7 @@ outputs:
- internal_tls_enabled - internal_tls_enabled
- - neutron_server_tls_proxy - - neutron_server_tls_proxy
- null - null
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/neutron/neutron-dhcp-container-puppet.yaml
View File

@ -445,6 +445,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- neutron_dhcp - neutron_dhcp
tripleo_container_cli: "docker"
- name: Check for neutron user - name: Check for neutron user
getent: getent:
database: passwd database: passwd

1
deployment/neutron/neutron-l3-container-puppet.yaml
View File

@ -410,6 +410,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- neutron_l3_agent - neutron_l3_agent
tripleo_container_cli: "docker"
- name: Check for neutron user - name: Check for neutron user
getent: getent:
database: passwd database: passwd

1
deployment/neutron/neutron-metadata-container-puppet.yaml
View File

@ -219,6 +219,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- neutron_metadata_agent - neutron_metadata_agent
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/neutron/neutron-ovs-agent-container-puppet.yaml
View File

@ -373,6 +373,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- neutron_ovs_agent - neutron_ovs_agent
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/neutron/neutron-sriov-agent-container-puppet.yaml
View File

@ -193,3 +193,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- neutron_sriov_agent - neutron_sriov_agent
tripleo_container_cli: "docker"

1
deployment/nova/nova-api-container-puppet.yaml
View File

@ -465,6 +465,7 @@ outputs:
containers_to_rm: containers_to_rm:
- nova_api - nova_api
- nova_api_cron - nova_api_cron
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/nova/nova-compute-container-puppet.yaml
View File

@ -951,6 +951,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- nova_compute - nova_compute
tripleo_container_cli: "docker"
scale_tasks: scale_tasks:
- when: step|int == 1 - when: step|int == 1
tags: down tags: down

1
deployment/nova/nova-conductor-container-puppet.yaml
View File

@ -206,6 +206,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- nova_conductor - nova_conductor
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/nova/nova-ironic-container-puppet.yaml
View File

@ -232,6 +232,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- nova_compute - nova_compute
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/nova/nova-libvirt-container-puppet.yaml
View File

@ -879,3 +879,4 @@ outputs:
containers_to_rm: containers_to_rm:
- nova_virtlogd - nova_virtlogd
- nova_libvirt - nova_libvirt
tripleo_container_cli: "docker"

1
deployment/nova/nova-metadata-container-puppet.yaml
View File

@ -242,3 +242,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- nova_metadata - nova_metadata
tripleo_container_cli: "docker"

1
deployment/nova/nova-migration-target-container-puppet.yaml
View File

@ -178,3 +178,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- nova_migration_target - nova_migration_target
tripleo_container_cli: "docker"

1
deployment/nova/nova-scheduler-container-puppet.yaml
View File

@ -221,3 +221,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- nova_scheduler - nova_scheduler
tripleo_container_cli: "docker"

1
deployment/nova/nova-vnc-proxy-container-puppet.yaml
View File

@ -310,3 +310,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- nova_vnc_proxy - nova_vnc_proxy
tripleo_container_cli: "docker"

1
deployment/nova/novajoin-container-puppet.yaml
View File

@ -256,3 +256,4 @@ outputs:
containers_to_rm: containers_to_rm:
- novajoin_server - novajoin_server
- novajoin_notifier - novajoin_notifier
tripleo_container_cli: "docker"

1
deployment/octavia/octavia-api-container-puppet.yaml
View File

@ -347,3 +347,4 @@ outputs:
- internal_tls_enabled - internal_tls_enabled
- - octavia_api_tls_proxy - - octavia_api_tls_proxy
- null - null
tripleo_container_cli: "docker"

1
deployment/octavia/octavia-health-manager-container-puppet.yaml
View File

@ -172,3 +172,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- octavia_health_manager - octavia_health_manager
tripleo_container_cli: "docker"

1
deployment/octavia/octavia-housekeeping-container-puppet.yaml
View File

@ -172,3 +172,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- octavia_housekeeping - octavia_housekeeping
tripleo_container_cli: "docker"

1
deployment/octavia/octavia-worker-container-puppet.yaml
View File

@ -172,3 +172,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- octavia_worker - octavia_worker
tripleo_container_cli: "docker"

1
deployment/ovn/ovn-controller-container-puppet.yaml
View File

@ -226,3 +226,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- ovn_controller - ovn_controller
tripleo_container_cli: "docker"

1
deployment/ovn/ovn-dbs-container-puppet.yaml
View File

@ -227,3 +227,4 @@ outputs:
- ovn_north_db_server - ovn_north_db_server
- ovn_south_db_server - ovn_south_db_server
- ovn_northd - ovn_northd
tripleo_container_cli: "docker"

1
deployment/ovn/ovn-metadata-container-puppet.yaml
View File

@ -331,3 +331,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- ovn_metadata_agent - ovn_metadata_agent
tripleo_container_cli: "docker"

1
deployment/pacemaker/clustercheck-container-puppet.yaml
View File

@ -104,3 +104,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- clustercheck - clustercheck
tripleo_container_cli: "docker"

1
deployment/placement/placement-api-container-puppet.yaml
View File

@ -291,3 +291,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- nova_placement - nova_placement
tripleo_container_cli: "docker"

1
deployment/qdr/qdrouterd-container-puppet.yaml
View File

@ -157,3 +157,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- qdrouterd - qdrouterd
tripleo_container_cli: "docker"

1
deployment/rabbitmq/rabbitmq-container-puppet.yaml
View File

@ -375,3 +375,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- rabbitmq - rabbitmq
tripleo_container_cli: "docker"

1
deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
View File

@ -319,3 +319,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- rabbitmq - rabbitmq
tripleo_container_cli: "docker"

1
deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
View File

@ -319,3 +319,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- rabbitmq - rabbitmq
tripleo_container_cli: "docker"

1
deployment/sahara/sahara-api-container-puppet.yaml
View File

@ -217,6 +217,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- sahara_api - sahara_api
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/sahara/sahara-engine-container-puppet.yaml
View File

@ -151,6 +151,7 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- sahara_engine - sahara_engine
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/swift/swift-proxy-container-puppet.yaml
View File

@ -485,6 +485,7 @@ outputs:
- internal_tls_enabled - internal_tls_enabled
- - swift_proxy_tls_proxy - - swift_proxy_tls_proxy
- null - null
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/swift/swift-storage-container-puppet.yaml
View File

@ -679,6 +679,7 @@ outputs:
- swift_object_server - swift_object_server
- swift_object_updater - swift_object_updater
- swift_rsync - swift_rsync
tripleo_container_cli: "docker"
fast_forward_upgrade_tasks: fast_forward_upgrade_tasks:
- when: - when:
- step|int == 0 - step|int == 0

1
deployment/tacker/tacker-container-puppet.yaml
View File

@ -226,3 +226,4 @@ outputs:
vars: vars:
containers_to_rm: containers_to_rm:
- tacker_api - tacker_api
tripleo_container_cli: "docker"

1
deployment/zaqar/zaqar-container-puppet.yaml
View File

@ -372,5 +372,6 @@ outputs:
containers_to_rm: containers_to_rm:
- zaqar - zaqar
- zaqar_websocket - zaqar_websocket
tripleo_container_cli: "docker"
metadata_settings: metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings] get_attr: [ApacheServiceBase, role_data, metadata_settings]