Browse Source

Merge "Check for rc instead of |succeeded" into stable/stein

tags/10.6.1
Zuul 1 month ago
parent
commit
355bc6c34f

+ 1
- 1
deployment/cinder/cinder-backup-pacemaker-puppet.yaml View File

@@ -308,7 +308,7 @@ outputs:
308 308
               register: cinder_backup_pcs_res_result
309 309
             - name: Set fact cinder_backup_pcs_res
310 310
               set_fact:
311
-                cinder_backup_pcs_res: "{{cinder_backup_pcs_res_result|succeeded}}"
311
+                cinder_backup_pcs_res: "{{cinder_backup_pcs_res_result.rc == 0}}"
312 312
             - name: set is_cinder_backup_bootstrap_node fact
313 313
               tags: common
314 314
               set_fact: is_cinder_backup_bootstrap_node={{cinder_backup_short_bootstrap_node_name|lower == ansible_hostname|lower}}

+ 1
- 1
deployment/cinder/cinder-volume-pacemaker-puppet.yaml View File

@@ -301,7 +301,7 @@ outputs:
301 301
               register: cinder_volume_pcs_res_result
302 302
             - name: Set fact cinder_volume_pcs_res
303 303
               set_fact:
304
-                cinder_volume_pcs_res: "{{cinder_volume_pcs_res_result|succeeded}}"
304
+                cinder_volume_pcs_res: "{{cinder_volume_pcs_res_result.rc == 0}}"
305 305
             - name: set is_cinder_volume_bootstrap_node fact
306 306
               tags: common
307 307
               set_fact: is_cinder_volume_bootstrap_node={{cinder_volume_short_bootstrap_node_name|lower == ansible_hostname|lower}}

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

@@ -453,7 +453,7 @@ outputs:
453 453
               register: galera_pcs_res_result
454 454
             - name: Set fact galera_pcs_res
455 455
               set_fact:
456
-                galera_pcs_res: "{{galera_pcs_res_result|succeeded}}"
456
+                galera_pcs_res: "{{galera_pcs_res_result.rc == 0}}"
457 457
             - name: set is_mysql_bootstrap_node fact
458 458
               tags: common
459 459
               set_fact: is_mysql_bootstrap_node={{mysql_short_bootstrap_node_name|lower == ansible_hostname|lower}}

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

@@ -391,7 +391,7 @@ outputs:
391 391
               register: redis_pcs_res_result
392 392
             - name: Set upgrade redis facts
393 393
               set_fact:
394
-                redis_pcs_res: "{{redis_pcs_res_result|succeeded}}"
394
+                redis_pcs_res: "{{redis_pcs_res_result.rc == 0}}"
395 395
                 is_redis_bootstrap_node: "{{redis_short_bootstrap_node_name|lower == ansible_hostname|lower}}"
396 396
         - name: Update redis-bundle pcs resource bundle for new container image
397 397
           when:

+ 1
- 1
deployment/haproxy/haproxy-pacemaker-puppet.yaml View File

@@ -471,7 +471,7 @@ outputs:
471 471
               register: haproxy_pcs_res_result
472 472
             - name: Set upgrade haproxy facts
473 473
               set_fact:
474
-                haproxy_pcs_res: "{{haproxy_pcs_res_result|succeeded}}"
474
+                haproxy_pcs_res: "{{haproxy_pcs_res_result.rc == 0}}"
475 475
                 is_haproxy_bootstrap_node: "{{haproxy_short_bootstrap_node_name|lower == ansible_hostname|lower}}"
476 476
 
477 477
         - name: Update haproxy pcs resource bundle for new container image

+ 1
- 1
deployment/manila/manila-share-pacemaker-puppet.yaml View File

@@ -293,7 +293,7 @@ outputs:
293 293
               register: manila_share_pcs_res_result
294 294
             - name: Set fact manila_share_pcs_res
295 295
               set_fact:
296
-                manila_share_pcs_res: "{{manila_share_pcs_res_result|succeeded}}"
296
+                manila_share_pcs_res: "{{manila_share_pcs_res_result.rc == 0}}"
297 297
             - name: set is_manila_share_bootstrap_node fact
298 298
               tags: common
299 299
               set_fact: is_manila_share_bootstrap_node={{manila_share_short_bootstrap_node_name|lower == ansible_hostname|lower}}

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

@@ -350,7 +350,7 @@ outputs:
350 350
               register: rabbitmq_pcs_res_result
351 351
             - name: Set fact rabbitmq_pcs_res
352 352
               set_fact:
353
-                rabbitmq_pcs_res: "{{rabbitmq_pcs_res_result|succeeded}}"
353
+                rabbitmq_pcs_res: "{{rabbitmq_pcs_res_result.rc == 0}}"
354 354
             - name: set is_notify_rabbitmq_bootstrap_node fact
355 355
               set_fact: is_notify_rabbitmq_bootstrap_node={{oslo_messaging_notify_short_bootstrap_node_name|lower == ansible_hostname|lower}}
356 356
         - name: Update rabbitmq-bundle pcs resource bundle for new container image

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

@@ -350,7 +350,7 @@ outputs:
350 350
               register: rabbitmq_pcs_res_result
351 351
             - name: Set fact rabbitmq_pcs_res
352 352
               set_fact:
353
-                rabbitmq_pcs_res: "{{rabbitmq_pcs_res_result|succeeded}}"
353
+                rabbitmq_pcs_res: "{{rabbitmq_pcs_res_result.rc == 0}}"
354 354
             - name: set is_rabbitmq_bootstrap_node fact
355 355
               tags: common
356 356
               set_fact: is_rabbitmq_bootstrap_node={{rabbitmq_short_bootstrap_node_name|lower == ansible_hostname|lower}}

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

@@ -350,7 +350,7 @@ outputs:
350 350
               register: rabbitmq_pcs_res_result
351 351
             - name: Set fact rabbitmq_pcs_res
352 352
               set_fact:
353
-                rabbitmq_pcs_res: "{{rabbitmq_pcs_res_result|succeeded}}"
353
+                rabbitmq_pcs_res: "{{rabbitmq_pcs_res_result.rc == 0}}"
354 354
             - name: set is_rpc_rabbitmq_bootstrap_node fact
355 355
               set_fact: is_rpc_rabbitmq_bootstrap_node={{oslo_messaging_rpc_short_bootstrap_node_name|lower == ansible_hostname|lower}}
356 356
         - name: Update rabbitmq-bundle pcs resource bundle for new container image

Loading…
Cancel
Save