diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index 6a42726b58..bbd42dddb2 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/deployment/database/mysql-pacemaker-puppet.yaml @@ -502,9 +502,6 @@ outputs: - groups['mysql'] | length > 1 - item.split('.')[0] in ansible_limit.split(',') loop: "{{ mysql_node_names }}" - - - debug: - msg: "Prepare galera upgrade for {{ mysql_short_node_names_upgraded }}" - fail: msg: > You can't upgrade galera without staged upgrade. @@ -514,7 +511,8 @@ outputs: mysql_short_node_names_upgraded | length == 0 or mysql_node_names_upgraded is not defined or mysql_node_names_upgraded | length == 0 - + - debug: + msg: "Prepare galera upgrade for {{ mysql_short_node_names_upgraded }}" - name: remove mysql init container on upgrade-scaleup to force re-init shell: | if podman inspect mysql_init_bundle &> /dev/null; then diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index 0231768be9..f1c3625420 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/deployment/database/redis-pacemaker-puppet.yaml @@ -427,9 +427,6 @@ outputs: - groups['redis'] | length > 1 - item.split('.')[0] in ansible_limit.split(',') loop: "{{ redis_short_node_names }}" - - - debug: - msg: "Prepare redis upgrade for {{ redis_short_node_names_upgraded }}" - fail: msg: > You can't upgrade redis without staged @@ -438,7 +435,8 @@ outputs: when: >- redis_short_node_names_upgraded is not defined or redis_short_node_names_upgraded | length == 0 - + - debug: + msg: "Prepare redis upgrade for {{ redis_short_node_names_upgraded }}" - name: remove redis init container on upgrade-scaleup to force re-init shell: | if podman inspect redis_init_bundle &> /dev/null; then diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index 1585102098..b3ce756663 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml @@ -546,9 +546,6 @@ outputs: - groups['haproxy'] | length > 1 - item.split('.')[0] in ansible_limit.split(',') loop: "{{ haproxy_short_node_names }}" - - - debug: - msg: "Prepare haproxy upgrade for {{ haproxy_short_node_names_upgraded }}" - fail: msg: > You can't upgrade haproxy without staged @@ -557,7 +554,8 @@ outputs: when: >- haproxy_short_node_names_upgraded is not defined or haproxy_short_node_names_upgraded | length == 0 - + - debug: + msg: "Prepare haproxy upgrade for {{ haproxy_short_node_names_upgraded }}" - name: remove haproxy init container on upgrade-scaleup to force re-init shell: | if podman inspect haproxy_init_bundle &> /dev/null; then diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index bdb8328fa3..4386087769 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml @@ -390,9 +390,6 @@ outputs: - groups['oslo_messaging_notify'] | length > 1 - item.split('.')[0] in ansible_limit.split(',') loop: "{{ oslo_messaging_notify_node_names }}" - - - debug: - msg: "Prepare oslo_messaging_notify upgrade for {{ oslo_messaging_notify_short_node_names_upgraded }}" - fail: msg: > You can't upgrade oslo_messaging_notify without @@ -403,7 +400,8 @@ outputs: oslo_messaging_notify_short_node_names_upgraded | length == 0 or oslo_messaging_notify_node_names_upgraded is not defined or oslo_messaging_notify_node_names_upgraded | length == 0 - + - debug: + msg: "Prepare oslo_messaging_notify upgrade for {{ oslo_messaging_notify_short_node_names_upgraded }}" - name: remove rabbitmq init container on upgrade-scaleup to force re-init shell: | if podman inspect rabbitmq_init_bundle &> /dev/null; then diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index b8955c7633..ad775d5e21 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml @@ -389,9 +389,6 @@ outputs: - groups['rabbitmq'] | length > 1 - item.split('.')[0] in ansible_limit.split(',') loop: "{{ rabbitmq_short_node_names }}" - - - debug: - msg: "Prepare rabbitmq upgrade for {{ rabbitmq_short_node_names_upgraded }}" - fail: msg: > You can't upgrade rabbitmq without staged @@ -400,7 +397,8 @@ outputs: when: >- rabbitmq_short_node_names_upgraded is not defined or rabbitmq_short_node_names_upgraded | length == 0 - + - debug: + msg: "Prepare rabbitmq upgrade for {{ rabbitmq_short_node_names_upgraded }}" - name: remove rabbitmq init container on upgrade-scaleup to force re-init shell: | if podman inspect rabbitmq_init_bundle &> /dev/null; then diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index b6e3f42047..a69e3f7fc7 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -390,9 +390,6 @@ outputs: - groups['oslo_messaging_rpc'] | length > 1 - item.split('.')[0] in ansible_limit.split(',') loop: "{{ oslo_messaging_rpc_node_names }}" - - - debug: - msg: "Prepare oslo_messaging_rpc upgrade for {{ oslo_messaging_rpc_short_node_names_upgraded }}" - fail: msg: > You can't upgrade oslo_messaging_rpc without @@ -403,7 +400,8 @@ outputs: oslo_messaging_rpc_short_node_names_upgraded | length == 0 or oslo_messaging_rpc_node_names_upgraded is not defined or oslo_messaging_rpc_node_names_upgraded | length == 0 - + - debug: + msg: "Prepare oslo_messaging_rpc upgrade for {{ oslo_messaging_rpc_short_node_names_upgraded }}" - name: remove rabbitmq init container on upgrade-scaleup to force re-init shell: | if podman inspect rabbitmq_init_bundle &> /dev/null; then diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml index 86bdc63f9d..34f676c17c 100644 --- a/puppet/services/pacemaker.yaml +++ b/puppet/services/pacemaker.yaml @@ -223,9 +223,6 @@ outputs: - groups['pacemaker'] | length > 1 - item.split('.')[0] in ansible_limit.split(',') loop: "{{ pacemaker_short_node_names }}" - - - debug: - msg: "Prepare pacemaker upgrade for {{ pacemaker_short_node_names_upgraded }}" - fail: msg: > You can't upgrade pacemaker without staged @@ -234,6 +231,8 @@ outputs: when: >- pacemaker_short_node_names_upgraded is not defined or pacemaker_short_node_names_upgraded | length == 0 + - debug: + msg: "Prepare pacemaker upgrade for {{ pacemaker_short_node_names_upgraded }}" - name: set pacemaker node ips fact from the names fact set_fact: # Generate matching IPs for the names, e.g. for these varaible values: