Browse Source

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

changes/23/705923/1
Zuul 2 weeks ago
parent
commit
39d7afce3d
10 changed files with 70 additions and 50 deletions
  1. +7
    -5
      deployment/cinder/cinder-backup-pacemaker-puppet.yaml
  2. +7
    -5
      deployment/cinder/cinder-volume-pacemaker-puppet.yaml
  3. +7
    -5
      deployment/database/mysql-pacemaker-puppet.yaml
  4. +7
    -5
      deployment/database/redis-pacemaker-puppet.yaml
  5. +7
    -5
      deployment/haproxy/haproxy-pacemaker-puppet.yaml
  6. +7
    -5
      deployment/manila/manila-share-pacemaker-puppet.yaml
  7. +7
    -5
      deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
  8. +7
    -5
      deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
  9. +7
    -5
      deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
  10. +7
    -5
      deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml

+ 7
- 5
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 | length == 0
- name: remove cinder_backup init container on upgrade-scaleup to force re-init
shell: |
if podman inspect cinder_backup_init_bundle &> /dev/null; then
podman rm cinder_backup_init_bundle
fi
when: cinder_backup_short_node_names_upgraded | length > 1
include_role:
name: tripleo-container-rm
vars:
tripleo_containers_to_rm:
- 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.
include_role:
name: tripleo-upgrade-hiera

+ 7
- 5
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 | length == 0
- name: remove cinder_volume init container on upgrade-scaleup to force re-init
shell: |
if podman inspect cinder_volume_init_bundle &> /dev/null; then
podman rm cinder_volume_init_bundle
fi
when: cinder_volume_short_node_names_upgraded | length > 1
include_role:
name: tripleo-container-rm
vars:
tripleo_containers_to_rm:
- 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.
include_role:
name: tripleo-upgrade-hiera

+ 7
- 5
deployment/database/mysql-pacemaker-puppet.yaml View File

@@ -517,11 +517,13 @@ outputs:
mysql_node_names_upgraded | length == 0

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

+ 7
- 5
deployment/database/redis-pacemaker-puppet.yaml View File

@@ -449,11 +449,13 @@ outputs:
redis_short_node_names_upgraded | length == 0

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

+ 7
- 5
deployment/haproxy/haproxy-pacemaker-puppet.yaml View File

@@ -568,11 +568,13 @@ outputs:
haproxy_short_node_names_upgraded | length == 0

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

+ 7
- 5
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 | length == 0
- name: remove manila_share init container on upgrade-scaleup to force re-init
shell: |
if podman inspect manila_share_init_bundle &> /dev/null; then
podman rm manila_share_init_bundle
fi
when: manila_share_short_node_names_upgraded | length > 1
include_role:
name: tripleo-container-rm
vars:
tripleo_containers_to_rm:
- 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.
include_role:
name: tripleo-upgrade-hiera

+ 7
- 5
deployment/ovn/ovn-dbs-pacemaker-puppet.yaml View File

@@ -452,11 +452,13 @@ outputs:
ovn_dbs_short_node_names_upgraded | length == 0

- name: remove ovn_dbs init container on upgrade-scaleup to force re-init
shell: |
if podman inspect ovn_dbs_init_bundle &> /dev/null; then
podman rm ovn_dbs_init_bundle
fi
when: ovn_dbs_short_node_names_upgraded | length > 1
include_role:
name: tripleo-container-rm
vars:
tripleo_containers_to_rm:
- 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.
include_role:
name: tripleo-upgrade-hiera

+ 7
- 5
deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml View File

@@ -413,11 +413,13 @@ outputs:
oslo_messaging_notify_node_names_upgraded | length == 0

- name: remove rabbitmq init container on upgrade-scaleup to force re-init
shell: |
if podman inspect rabbitmq_init_bundle &> /dev/null; then
podman rm rabbitmq_init_bundle
fi
when: oslo_messaging_notify_short_node_names_upgraded | length > 1
include_role:
name: tripleo-container-rm
vars:
tripleo_containers_to_rm:
- 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.
include_role:
name: tripleo-upgrade-hiera

+ 7
- 5
deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml View File

@@ -410,11 +410,13 @@ outputs:
rabbitmq_short_node_names_upgraded | length == 0

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

+ 7
- 5
deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml View File

@@ -419,11 +419,13 @@ outputs:
oslo_messaging_rpc_node_names_upgraded | length == 0

- name: remove rabbitmq init container on upgrade-scaleup to force re-init
shell: |
if podman inspect rabbitmq_init_bundle &> /dev/null; then
podman rm rabbitmq_init_bundle
fi
when: oslo_messaging_rpc_short_node_names_upgraded | length > 1
include_role:
name: tripleo-container-rm
vars:
tripleo_containers_to_rm:
- 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.
include_role:
name: tripleo-upgrade-hiera

Loading…
Cancel
Save