Merge "Force re-run of pacemaker bundle init containers during upgrade-scaleup"

deployment/database/mysql-pacemaker-puppet.yaml

@@ -528,6 +528,12 @@ outputs:
                 mysql_node_names_upgraded is not defined or
                 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
             - name: add the mysql short name to hiera data for the upgrade.
               include_role:
                 name: tripleo-upgrade-hiera

deployment/database/redis-pacemaker-puppet.yaml

@@ -452,6 +452,12 @@ outputs:
                 redis_short_node_names_upgraded is not defined or
                 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
             - name: add the redis short name to hiera data for the upgrade.
               include_role:
                 name: tripleo-upgrade-hiera

deployment/haproxy/haproxy-pacemaker-puppet.yaml

@@ -551,6 +551,12 @@ outputs:
                 haproxy_short_node_names_upgraded is not defined or
                 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
             - name: add the haproxy short name to hiera data for the upgrade.
               include_role:
                 name: tripleo-upgrade-hiera

deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml

@@ -421,6 +421,12 @@ outputs:
                 oslo_messaging_notify_node_names_upgraded is not defined or
                 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
             - name: add the oslo_messaging_notify short name to hiera data for the upgrade.
               include_role:
                 name: tripleo-upgrade-hiera

deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml

@@ -418,6 +418,12 @@ outputs:
                 rabbitmq_short_node_names_upgraded is not defined or
                 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
             - name: add the rabbitmq short name to hiera data for the upgrade.
               include_role:
                 name: tripleo-upgrade-hiera

deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml

@@ -421,6 +421,12 @@ outputs:
                 oslo_messaging_rpc_node_names_upgraded is not defined or
                 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
             - name: add the oslo_messaging_rpc short name to hiera data for the upgrade.
               include_role:
                 name: tripleo-upgrade-hiera