openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Switch from 'podman rm' to tripleo-container-rm role" into stable/train

This commit is contained in:
Zuul 2020-02-04 18:12:45 +00:00 committed by Gerrit Code Review
parent 3e2bfb7a16 97c2d4b99a
commit 39d7afce3d
10 changed files with 70 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deployment/cinder/cinder-backup-pacemaker-puppet.yaml
View File

@ -370,11 +370,13 @@ outputs:
cinder_backup_node_names_upgraded is not defined or cinder_backup_node_names_upgraded is not defined or
cinder_backup_node_names_upgraded | length == 0 cinder_backup_node_names_upgraded | length == 0
- name: remove cinder_backup init container on upgrade-scaleup to force re-init - name: remove cinder_backup init container on upgrade-scaleup to force re-init
shell: | include_role:
if podman inspect cinder_backup_init_bundle &> /dev/null; then name: tripleo-container-rm
podman rm cinder_backup_init_bundle vars:
fi tripleo_containers_to_rm:
when: cinder_backup_short_node_names_upgraded | length > 1 - cinder_backup_init_bundle
when:
- cinder_backup_short_node_names_upgraded | length > 1
- name: add the cinder_backup short name to hiera data for the upgrade. - name: add the cinder_backup short name to hiera data for the upgrade.
include_role: include_role:
name: tripleo-upgrade-hiera name: tripleo-upgrade-hiera

12
deployment/cinder/cinder-volume-pacemaker-puppet.yaml
View File

@ -356,11 +356,13 @@ outputs:
cinder_volume_node_names_upgraded is not defined or cinder_volume_node_names_upgraded is not defined or
cinder_volume_node_names_upgraded | length == 0 cinder_volume_node_names_upgraded | length == 0
- name: remove cinder_volume init container on upgrade-scaleup to force re-init - name: remove cinder_volume init container on upgrade-scaleup to force re-init
shell: | include_role:
if podman inspect cinder_volume_init_bundle &> /dev/null; then name: tripleo-container-rm
podman rm cinder_volume_init_bundle vars:
fi tripleo_containers_to_rm:
when: cinder_volume_short_node_names_upgraded | length > 1 - cinder_volume_init_bundle
when:
- cinder_volume_short_node_names_upgraded | length > 1
- name: add the cinder_volume short name to hiera data for the upgrade. - name: add the cinder_volume short name to hiera data for the upgrade.
include_role: include_role:
name: tripleo-upgrade-hiera name: tripleo-upgrade-hiera

12
deployment/database/mysql-pacemaker-puppet.yaml
View File

@ -517,11 +517,13 @@ outputs:
mysql_node_names_upgraded | length == 0 mysql_node_names_upgraded | length == 0
- name: remove mysql init container on upgrade-scaleup to force re-init - name: remove mysql init container on upgrade-scaleup to force re-init
shell: | include_role:
if podman inspect mysql_init_bundle &> /dev/null; then name: tripleo-container-rm
podman rm mysql_init_bundle vars:
fi tripleo_containers_to_rm:
when: mysql_short_node_names_upgraded | length > 1 - mysql_init_bundle
when:
- mysql_short_node_names_upgraded | length > 1
- name: add the mysql short name to hiera data for the upgrade. - name: add the mysql short name to hiera data for the upgrade.
include_role: include_role:
name: tripleo-upgrade-hiera name: tripleo-upgrade-hiera

12
deployment/database/redis-pacemaker-puppet.yaml
View File

@ -449,11 +449,13 @@ outputs:
redis_short_node_names_upgraded | length == 0 redis_short_node_names_upgraded | length == 0
- name: remove redis init container on upgrade-scaleup to force re-init - name: remove redis init container on upgrade-scaleup to force re-init
shell: | include_role:
if podman inspect redis_init_bundle &> /dev/null; then name: tripleo-container-rm
podman rm redis_init_bundle vars:
fi tripleo_containers_to_rm:
when: redis_short_node_names_upgraded | length > 1 - redis_init_bundle
when:
- redis_short_node_names_upgraded | length > 1
- name: add the redis short name to hiera data for the upgrade. - name: add the redis short name to hiera data for the upgrade.
include_role: include_role:
name: tripleo-upgrade-hiera name: tripleo-upgrade-hiera

12
deployment/haproxy/haproxy-pacemaker-puppet.yaml
View File

@ -568,11 +568,13 @@ outputs:
haproxy_short_node_names_upgraded | length == 0 haproxy_short_node_names_upgraded | length == 0
- name: remove haproxy init container on upgrade-scaleup to force re-init - name: remove haproxy init container on upgrade-scaleup to force re-init
shell: | include_role:
if podman inspect haproxy_init_bundle &> /dev/null; then name: tripleo-container-rm
podman rm haproxy_init_bundle vars:
fi tripleo_containers_to_rm:
when: haproxy_short_node_names_upgraded | length > 1 - haproxy_init_bundle
when:
- haproxy_short_node_names_upgraded | length > 1
- name: add the haproxy short name to hiera data for the upgrade. - name: add the haproxy short name to hiera data for the upgrade.
include_role: include_role:
name: tripleo-upgrade-hiera name: tripleo-upgrade-hiera

12
deployment/manila/manila-share-pacemaker-puppet.yaml
View File

@ -358,11 +358,13 @@ outputs:
manila_share_node_names_upgraded is not defined or manila_share_node_names_upgraded is not defined or
manila_share_node_names_upgraded | length == 0 manila_share_node_names_upgraded | length == 0
- name: remove manila_share init container on upgrade-scaleup to force re-init - name: remove manila_share init container on upgrade-scaleup to force re-init
shell: | include_role:
if podman inspect manila_share_init_bundle &> /dev/null; then name: tripleo-container-rm
podman rm manila_share_init_bundle vars:
fi tripleo_containers_to_rm:
when: manila_share_short_node_names_upgraded | length > 1 - manila_share_init_bundle
when:
- manila_share_short_node_names_upgraded | length > 1
- name: add the manila_share short name to hiera data for the upgrade. - name: add the manila_share short name to hiera data for the upgrade.
include_role: include_role:
name: tripleo-upgrade-hiera name: tripleo-upgrade-hiera

12
deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
View File

@ -452,11 +452,13 @@ outputs:
ovn_dbs_short_node_names_upgraded | length == 0 ovn_dbs_short_node_names_upgraded | length == 0
- name: remove ovn_dbs init container on upgrade-scaleup to force re-init - name: remove ovn_dbs init container on upgrade-scaleup to force re-init
shell: | include_role:
if podman inspect ovn_dbs_init_bundle &> /dev/null; then name: tripleo-container-rm
podman rm ovn_dbs_init_bundle vars:
fi tripleo_containers_to_rm:
when: ovn_dbs_short_node_names_upgraded | length > 1 - ovn_dbs_init_bundle
when:
- ovn_dbs_short_node_names_upgraded | length > 1
- name: add the ovn_dbs short name to hiera data for the upgrade. - name: add the ovn_dbs short name to hiera data for the upgrade.
include_role: include_role:
name: tripleo-upgrade-hiera name: tripleo-upgrade-hiera

12
deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
View File

@ -413,11 +413,13 @@ outputs:
oslo_messaging_notify_node_names_upgraded | length == 0 oslo_messaging_notify_node_names_upgraded | length == 0
- name: remove rabbitmq init container on upgrade-scaleup to force re-init - name: remove rabbitmq init container on upgrade-scaleup to force re-init
shell: | include_role:
if podman inspect rabbitmq_init_bundle &> /dev/null; then name: tripleo-container-rm
podman rm rabbitmq_init_bundle vars:
fi tripleo_containers_to_rm:
when: oslo_messaging_notify_short_node_names_upgraded | length > 1 - rabbitmq_init_bundle
when:
- oslo_messaging_notify_short_node_names_upgraded | length > 1
- name: add the oslo_messaging_notify short name to hiera data for the upgrade. - name: add the oslo_messaging_notify short name to hiera data for the upgrade.
include_role: include_role:
name: tripleo-upgrade-hiera name: tripleo-upgrade-hiera

12
deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
View File

@ -410,11 +410,13 @@ outputs:
rabbitmq_short_node_names_upgraded | length == 0 rabbitmq_short_node_names_upgraded | length == 0
- name: remove rabbitmq init container on upgrade-scaleup to force re-init - name: remove rabbitmq init container on upgrade-scaleup to force re-init
shell: | include_role:
if podman inspect rabbitmq_init_bundle &> /dev/null; then name: tripleo-container-rm
podman rm rabbitmq_init_bundle vars:
fi tripleo_containers_to_rm:
when: rabbitmq_short_node_names_upgraded | length > 1 - rabbitmq_init_bundle
when:
- rabbitmq_short_node_names_upgraded | length > 1
- name: add the rabbitmq short name to hiera data for the upgrade. - name: add the rabbitmq short name to hiera data for the upgrade.
include_role: include_role:
name: tripleo-upgrade-hiera name: tripleo-upgrade-hiera

12
deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
View File

@ -419,11 +419,13 @@ outputs:
oslo_messaging_rpc_node_names_upgraded | length == 0 oslo_messaging_rpc_node_names_upgraded | length == 0
- name: remove rabbitmq init container on upgrade-scaleup to force re-init - name: remove rabbitmq init container on upgrade-scaleup to force re-init
shell: | include_role:
if podman inspect rabbitmq_init_bundle &> /dev/null; then name: tripleo-container-rm
podman rm rabbitmq_init_bundle vars:
fi tripleo_containers_to_rm:
when: oslo_messaging_rpc_short_node_names_upgraded | length > 1 - rabbitmq_init_bundle
when:
- oslo_messaging_rpc_short_node_names_upgraded | length > 1
- name: add the oslo_messaging_rpc short name to hiera data for the upgrade. - name: add the oslo_messaging_rpc short name to hiera data for the upgrade.
include_role: include_role:
name: tripleo-upgrade-hiera name: tripleo-upgrade-hiera