From 1013e6f0c0deb63ad1436eb13b6528db139541a7 Mon Sep 17 00:00:00 2001 From: Luke Short Date: Fri, 22 May 2020 10:38:49 -0400 Subject: [PATCH] Split ansible_limit with a colon. Previously the --limit from tripleoclient assumed an operator would only use a comma ','. It now converts all limit formats into a standardized format that will always be colon ':' separated instead. This patch corrects issues with upgrade tasks in Train and newer. Conflicts: deployment/cinder/cinder-backup-pacemaker-puppet.yaml deployment/cinder/cinder-volume-pacemaker-puppet.yaml deployment/database/mysql-pacemaker-puppet.yaml deployment/database/redis-pacemaker-puppet.yaml deployment/haproxy/haproxy-pacemaker-puppet.yaml deployment/manila/manila-share-pacemaker-puppet.yaml deployment/ovn/ovn-dbs-pacemaker-puppet.yaml deployment/pacemaker/pacemaker-baremetal-puppet.yaml deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml Change-Id: Icbd6b8568a697cbb0cf5740fc1a6c17b2b001c0e Related-Change-Id: I190f6efe8d728f124c18ce80be715ae7c5c0da01 Signed-off-by: Luke Short (cherry picked from commit 41addbbf20468623f36c91abae36993897432dc1) --- deployment/cinder/cinder-backup-pacemaker-puppet.yaml | 2 +- deployment/cinder/cinder-volume-pacemaker-puppet.yaml | 2 +- deployment/database/mysql-pacemaker-puppet.yaml | 2 +- deployment/database/redis-pacemaker-puppet.yaml | 2 +- deployment/haproxy/haproxy-pacemaker-puppet.yaml | 2 +- deployment/manila/manila-share-pacemaker-puppet.yaml | 2 +- deployment/ovn/ovn-dbs-pacemaker-puppet.yaml | 2 +- deployment/pacemaker/pacemaker-baremetal-puppet.yaml | 2 +- .../rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml | 2 +- deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml | 2 +- .../rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 5efcfa1f1a..1c34bf7c7f 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml @@ -343,7 +343,7 @@ outputs: cacheable: no when: - groups['cinder_backup'] | length > 1 - - item.split('.')[0] in ansible_limit.split(',') + - item.split('.')[0] in ansible_limit.split(':') loop: "{{ cinder_backup_node_names }}" - fail: msg: > diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index 2d664f61b7..08d297c1b0 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -329,7 +329,7 @@ outputs: cacheable: no when: - groups['cinder_volume'] | length > 1 - - item.split('.')[0] in ansible_limit.split(',') + - item.split('.')[0] in ansible_limit.split(':') loop: "{{ cinder_volume_node_names }}" - fail: msg: > diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index ebedba7048..3354597e0b 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/deployment/database/mysql-pacemaker-puppet.yaml @@ -484,7 +484,7 @@ outputs: cacheable: no when: - groups['mysql'] | length > 1 - - item.split('.')[0] in ansible_limit.split(',') + - item.split('.')[0] in ansible_limit.split(':') loop: "{{ mysql_node_names }}" - fail: msg: > diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index 4175ef05fa..7f32ecd9fb 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/deployment/database/redis-pacemaker-puppet.yaml @@ -416,7 +416,7 @@ outputs: cacheable: no when: - groups['redis'] | length > 1 - - item.split('.')[0] in ansible_limit.split(',') + - item.split('.')[0] in ansible_limit.split(':') loop: "{{ redis_short_node_names }}" - fail: msg: > diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index a57f64558f..efc0a69735 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml @@ -534,7 +534,7 @@ outputs: cacheable: no when: - groups['haproxy'] | length > 1 - - item.split('.')[0] in ansible_limit.split(',') + - item.split('.')[0] in ansible_limit.split(':') loop: "{{ haproxy_short_node_names }}" - fail: msg: > diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index c444f1863b..9054e7a0fa 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/deployment/manila/manila-share-pacemaker-puppet.yaml @@ -324,7 +324,7 @@ outputs: cacheable: no when: - groups['manila_share'] | length > 1 - - item.split('.')[0] in ansible_limit.split(',') + - item.split('.')[0] in ansible_limit.split(':') loop: "{{ manila_share_node_names }}" - fail: msg: > diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index de4d61ef0c..9b81c36c40 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml @@ -433,7 +433,7 @@ outputs: cacheable: no when: - groups['ovn_dbs'] | length > 1 - - item.split('.')[0] in ansible_limit.split(',') + - item.split('.')[0] in ansible_limit.split(':') loop: "{{ ovn_dbs_short_node_names }}" - fail: msg: > diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml index f860987b00..27eac3f26c 100644 --- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml +++ b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml @@ -223,7 +223,7 @@ outputs: cacheable: no when: - groups['pacemaker'] | length > 1 - - item.split('.')[0] in ansible_limit.split(',') + - item.split('.')[0] in ansible_limit.split(':') loop: "{{ pacemaker_short_node_names }}" - fail: msg: > diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 33dea64da5..925db43200 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml @@ -378,7 +378,7 @@ outputs: cacheable: no when: - groups['oslo_messaging_notify'] | length > 1 - - item.split('.')[0] in ansible_limit.split(',') + - item.split('.')[0] in ansible_limit.split(':') loop: "{{ oslo_messaging_notify_node_names }}" - fail: msg: > diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index b5db7ce103..3d15c6d7e1 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml @@ -377,7 +377,7 @@ outputs: cacheable: no when: - groups['rabbitmq'] | length > 1 - - item.split('.')[0] in ansible_limit.split(',') + - item.split('.')[0] in ansible_limit.split(':') loop: "{{ rabbitmq_short_node_names }}" - fail: msg: > diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index 993d59f75c..c93bcc5efd 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -384,7 +384,7 @@ outputs: cacheable: no when: - groups['oslo_messaging_rpc'] | length > 1 - - item.split('.')[0] in ansible_limit.split(',') + - item.split('.')[0] in ansible_limit.split(':') loop: "{{ oslo_messaging_rpc_node_names }}" - fail: msg: >