Merge "Ignore case for bootstrap node checks"
This commit is contained in:
commit
3c9aa3543b
|
@ -11,7 +11,7 @@ function log_debug {
|
|||
}
|
||||
|
||||
function is_bootstrap_node {
|
||||
if [ "$(hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid)" = "$(facter hostname)" ]; then
|
||||
if [ "$(hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid | tr '[:upper:]' '[:lower:]')" = "$(facter hostname | tr '[:upper:]' '[:lower:]')" ]; then
|
||||
log_debug "Node is bootstrap"
|
||||
echo "true"
|
||||
fi
|
||||
|
|
|
@ -49,7 +49,7 @@ fi
|
|||
# of packages to update (the check for -z "$update_identifier" guarantees that this
|
||||
# is run only on overcloud stack update -i)
|
||||
if [[ "$pacemaker_status" == "active" && \
|
||||
"$(hiera -c /etc/puppet/hiera.yaml pacemaker_short_bootstrap_node_name)" == "$(facter hostname)" ]] ; then \
|
||||
"$(hiera -c /etc/puppet/hiera.yaml pacemaker_short_bootstrap_node_name | tr '[:upper:]' '[:lower:]')" == "$(facter hostname | tr '[:upper:]' '[:lower:]')" ]] ; then \
|
||||
# OCF scripts don't cope with -eu
|
||||
echo "Verifying if we need to fix up any IPv6 VIPs"
|
||||
set +eu
|
||||
|
|
|
@ -210,7 +210,7 @@ outputs:
|
|||
register: bootstrap_node
|
||||
- name: set is_bootstrap_node fact
|
||||
tags: common
|
||||
set_fact: is_bootstrap_node={{bootstrap_node.stdout == ansible_hostname}}
|
||||
set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
|
||||
- name: Extra migration for nova tripleo/+bug/1656791
|
||||
tags: step0,pre-upgrade
|
||||
when: is_bootstrap_node
|
||||
|
|
Loading…
Reference in New Issue