openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Swap tasks to avoid non-existing variable error." into stable/stein

This commit is contained in:
Zuul 2020-02-20 01:29:01 +00:00 committed by Gerrit Code Review
parent 4dbf886cca 1f6d92bc8f
commit 79e0e3734d
7 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -502,9 +502,6 @@ outputs:
- groups['mysql'] | length > 1 - groups['mysql'] | length > 1
- item.split('.')[0] in ansible_limit.split(',') - item.split('.')[0] in ansible_limit.split(',')
loop: "{{ mysql_node_names }}" loop: "{{ mysql_node_names }}"
- debug:
msg: "Prepare galera upgrade for {{ mysql_short_node_names_upgraded }}"
- fail: - fail:
msg: > msg: >
You can't upgrade galera without staged upgrade. You can't upgrade galera without staged upgrade.
@ -514,7 +511,8 @@ outputs:
mysql_short_node_names_upgraded | length == 0 or mysql_short_node_names_upgraded | length == 0 or
mysql_node_names_upgraded is not defined or mysql_node_names_upgraded is not defined or
mysql_node_names_upgraded | length == 0 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 - name: remove mysql init container on upgrade-scaleup to force re-init
shell: | shell: |
if podman inspect mysql_init_bundle &> /dev/null; then if podman inspect mysql_init_bundle &> /dev/null; then

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

@ -427,9 +427,6 @@ outputs:
- groups['redis'] | length > 1 - groups['redis'] | length > 1
- item.split('.')[0] in ansible_limit.split(',') - item.split('.')[0] in ansible_limit.split(',')
loop: "{{ redis_short_node_names }}" loop: "{{ redis_short_node_names }}"
- debug:
msg: "Prepare redis upgrade for {{ redis_short_node_names_upgraded }}"
- fail: - fail:
msg: > msg: >
You can't upgrade redis without staged You can't upgrade redis without staged
@ -438,7 +435,8 @@ outputs:
when: >- when: >-
redis_short_node_names_upgraded is not defined or redis_short_node_names_upgraded is not defined or
redis_short_node_names_upgraded | length == 0 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 - name: remove redis init container on upgrade-scaleup to force re-init
shell: | shell: |
if podman inspect redis_init_bundle &> /dev/null; then if podman inspect redis_init_bundle &> /dev/null; then

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

@ -546,9 +546,6 @@ outputs:
- groups['haproxy'] | length > 1 - groups['haproxy'] | length > 1
- item.split('.')[0] in ansible_limit.split(',') - item.split('.')[0] in ansible_limit.split(',')
loop: "{{ haproxy_short_node_names }}" loop: "{{ haproxy_short_node_names }}"
- debug:
msg: "Prepare haproxy upgrade for {{ haproxy_short_node_names_upgraded }}"
- fail: - fail:
msg: > msg: >
You can't upgrade haproxy without staged You can't upgrade haproxy without staged
@ -557,7 +554,8 @@ outputs:
when: >- when: >-
haproxy_short_node_names_upgraded is not defined or haproxy_short_node_names_upgraded is not defined or
haproxy_short_node_names_upgraded | length == 0 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 - name: remove haproxy init container on upgrade-scaleup to force re-init
shell: | shell: |
if podman inspect haproxy_init_bundle &> /dev/null; then if podman inspect haproxy_init_bundle &> /dev/null; then

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

@ -390,9 +390,6 @@ outputs:
- groups['oslo_messaging_notify'] | length > 1 - 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 }}" loop: "{{ oslo_messaging_notify_node_names }}"
- debug:
msg: "Prepare oslo_messaging_notify upgrade for {{ oslo_messaging_notify_short_node_names_upgraded }}"
- fail: - fail:
msg: > msg: >
You can't upgrade oslo_messaging_notify without 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_short_node_names_upgraded | length == 0 or
oslo_messaging_notify_node_names_upgraded is not defined or oslo_messaging_notify_node_names_upgraded is not defined or
oslo_messaging_notify_node_names_upgraded | length == 0 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 - name: remove rabbitmq init container on upgrade-scaleup to force re-init
shell: | shell: |
if podman inspect rabbitmq_init_bundle &> /dev/null; then if podman inspect rabbitmq_init_bundle &> /dev/null; then

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

@ -389,9 +389,6 @@ outputs:
- groups['rabbitmq'] | length > 1 - groups['rabbitmq'] | length > 1
- item.split('.')[0] in ansible_limit.split(',') - item.split('.')[0] in ansible_limit.split(',')
loop: "{{ rabbitmq_short_node_names }}" loop: "{{ rabbitmq_short_node_names }}"
- debug:
msg: "Prepare rabbitmq upgrade for {{ rabbitmq_short_node_names_upgraded }}"
- fail: - fail:
msg: > msg: >
You can't upgrade rabbitmq without staged You can't upgrade rabbitmq without staged
@ -400,7 +397,8 @@ outputs:
when: >- when: >-
rabbitmq_short_node_names_upgraded is not defined or rabbitmq_short_node_names_upgraded is not defined or
rabbitmq_short_node_names_upgraded | length == 0 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 - name: remove rabbitmq init container on upgrade-scaleup to force re-init
shell: | shell: |
if podman inspect rabbitmq_init_bundle &> /dev/null; then if podman inspect rabbitmq_init_bundle &> /dev/null; then

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

@ -390,9 +390,6 @@ outputs:
- groups['oslo_messaging_rpc'] | length > 1 - 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 }}" loop: "{{ oslo_messaging_rpc_node_names }}"
- debug:
msg: "Prepare oslo_messaging_rpc upgrade for {{ oslo_messaging_rpc_short_node_names_upgraded }}"
- fail: - fail:
msg: > msg: >
You can't upgrade oslo_messaging_rpc without 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_short_node_names_upgraded | length == 0 or
oslo_messaging_rpc_node_names_upgraded is not defined or oslo_messaging_rpc_node_names_upgraded is not defined or
oslo_messaging_rpc_node_names_upgraded | length == 0 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 - name: remove rabbitmq init container on upgrade-scaleup to force re-init
shell: | shell: |
if podman inspect rabbitmq_init_bundle &> /dev/null; then if podman inspect rabbitmq_init_bundle &> /dev/null; then

5
puppet/services/pacemaker.yaml
View File

@ -223,9 +223,6 @@ outputs:
- groups['pacemaker'] | length > 1 - groups['pacemaker'] | length > 1
- item.split('.')[0] in ansible_limit.split(',') - item.split('.')[0] in ansible_limit.split(',')
loop: "{{ pacemaker_short_node_names }}" loop: "{{ pacemaker_short_node_names }}"
- debug:
msg: "Prepare pacemaker upgrade for {{ pacemaker_short_node_names_upgraded }}"
- fail: - fail:
msg: > msg: >
You can't upgrade pacemaker without staged You can't upgrade pacemaker without staged
@ -234,6 +231,8 @@ outputs:
when: >- when: >-
pacemaker_short_node_names_upgraded is not defined or pacemaker_short_node_names_upgraded is not defined or
pacemaker_short_node_names_upgraded | length == 0 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 - name: set pacemaker node ips fact from the names fact
set_fact: set_fact:
# Generate matching IPs for the names, e.g. for these varaible values: # Generate matching IPs for the names, e.g. for these varaible values: