openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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 <ekultails@gmail.com>
(cherry picked from commit 41addbbf20)
This commit is contained in:
Luke Short 2020-05-22 10:38:49 -04:00
parent 8ae59f72fe
commit 1013e6f0c0
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/cinder/cinder-backup-pacemaker-puppet.yaml
View File

@ -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: >

2
deployment/cinder/cinder-volume-pacemaker-puppet.yaml
View File

@ -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: >

2
deployment/database/mysql-pacemaker-puppet.yaml
View File

@ -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: >

2
deployment/database/redis-pacemaker-puppet.yaml
View File

@ -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: >

2
deployment/haproxy/haproxy-pacemaker-puppet.yaml
View File

@ -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: >

2
deployment/manila/manila-share-pacemaker-puppet.yaml
View File

@ -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: >

2
deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
View File

@ -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: >

2
deployment/pacemaker/pacemaker-baremetal-puppet.yaml
View File

@ -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: >

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

@ -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: >

2
deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
View File

@ -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: >

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

@ -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: >