diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 3ab90201af..f81299c175 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml @@ -344,8 +344,6 @@ outputs: - groups['cinder_backup'] | length > 1 - item.split('.')[0] in ansible_limit.split(',') loop: "{{ cinder_backup_node_names }}" - - debug: - msg: "Prepare cinder_backup upgrade for {{ cinder_backup_short_node_names_upgraded }}" - fail: msg: > You can't upgrade cinder_backup without @@ -356,6 +354,8 @@ outputs: cinder_backup_short_node_names_upgraded | length == 0 or cinder_backup_node_names_upgraded is not defined or cinder_backup_node_names_upgraded | length == 0 + - debug: + msg: "Prepare cinder_backup upgrade for {{ cinder_backup_short_node_names_upgraded }}" - name: remove cinder_backup init container on upgrade-scaleup to force re-init include_role: name: tripleo-container-rm diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index c4a3cb88d2..b94ff38515 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -330,8 +330,6 @@ outputs: - groups['cinder_volume'] | length > 1 - item.split('.')[0] in ansible_limit.split(',') loop: "{{ cinder_volume_node_names }}" - - debug: - msg: "Prepare cinder_volume upgrade for {{ cinder_volume_short_node_names_upgraded }}" - fail: msg: > You can't upgrade cinder_volume without @@ -342,6 +340,8 @@ outputs: cinder_volume_short_node_names_upgraded | length == 0 or cinder_volume_node_names_upgraded is not defined or cinder_volume_node_names_upgraded | length == 0 + - debug: + msg: "Prepare cinder_volume upgrade for {{ cinder_volume_short_node_names_upgraded }}" - name: remove cinder_volume init container on upgrade-scaleup to force re-init include_role: name: tripleo-container-rm diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index 25eab3d61e..9f9e0819b1 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/deployment/database/mysql-pacemaker-puppet.yaml @@ -483,9 +483,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. @@ -495,7 +492,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 include_role: name: tripleo-container-rm diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index 9225808274..0b02c3a126 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/deployment/database/redis-pacemaker-puppet.yaml @@ -415,9 +415,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 @@ -426,7 +423,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 include_role: name: tripleo-container-rm diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index 5bdb73afc2..2878345f35 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml @@ -535,9 +535,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 @@ -546,7 +543,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 include_role: name: tripleo-container-rm diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index c8bb3112e2..126280e0b9 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/deployment/manila/manila-share-pacemaker-puppet.yaml @@ -324,8 +324,6 @@ outputs: - groups['manila_share'] | length > 1 - item.split('.')[0] in ansible_limit.split(',') loop: "{{ manila_share_node_names }}" - - debug: - msg: "Prepare manila_share upgrade for {{ manila_share_short_node_names_upgraded }}" - fail: msg: > You can't upgrade manila_share without @@ -336,6 +334,8 @@ outputs: manila_share_short_node_names_upgraded | length == 0 or manila_share_node_names_upgraded is not defined or manila_share_node_names_upgraded | length == 0 + - debug: + msg: "Prepare manila_share upgrade for {{ manila_share_short_node_names_upgraded }}" - name: remove manila_share init container on upgrade-scaleup to force re-init include_role: name: tripleo-container-rm diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index ff7db39c7e..ce9b9b7342 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml @@ -418,9 +418,6 @@ outputs: - groups['ovn_dbs'] | length > 1 - item.split('.')[0] in ansible_limit.split(',') loop: "{{ ovn_dbs_short_node_names }}" - - - debug: - msg: "Prepare ovn_dbs upgrade for {{ ovn_dbs_short_node_names_upgraded }}" - fail: msg: > You can't upgrade ovn_dbs without staged @@ -429,7 +426,8 @@ outputs: when: >- ovn_dbs_short_node_names_upgraded is not defined or ovn_dbs_short_node_names_upgraded | length == 0 - + - debug: + msg: "Prepare ovn_dbs upgrade for {{ ovn_dbs_short_node_names_upgraded }}" - name: remove ovn_dbs init container on upgrade-scaleup to force re-init include_role: name: tripleo-container-rm diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml index fbec0a6721..31e4089e44 100644 --- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml +++ b/deployment/pacemaker/pacemaker-baremetal-puppet.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: diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 5923c767cb..416f4650cc 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml @@ -377,9 +377,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 @@ -390,7 +387,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 include_role: name: tripleo-container-rm diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index f47fc9c43e..46cebe8ac6 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml @@ -376,9 +376,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 @@ -387,7 +384,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 include_role: name: tripleo-container-rm diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index dd0454ac7d..f623013a72 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -383,9 +383,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 @@ -396,7 +393,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 include_role: name: tripleo-container-rm