diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-06-16 09:07:53 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-06-16 09:07:53 +0000 |
commit | 3c9aa3543b221a16cbe8a5cfce32e8a080f69e92 (patch) | |
tree | cf57b026e1e906cfe815bf9203d2952837ef56d3 /extraconfig/tasks | |
parent | 3fba97012cb75abecb3cf59104cc6693aeb7438b (diff) | |
parent | abf4444d90b6f01342938ad0684e55678fa3b579 (diff) |
Merge "Ignore case for bootstrap node checks"
Diffstat (limited to 'extraconfig/tasks')
-rwxr-xr-x | extraconfig/tasks/pacemaker_common_functions.sh | 2 | ||||
-rwxr-xr-x | extraconfig/tasks/yum_update.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extraconfig/tasks/pacemaker_common_functions.sh b/extraconfig/tasks/pacemaker_common_functions.sh index f17a073a..d1dd5d1d 100755 --- a/extraconfig/tasks/pacemaker_common_functions.sh +++ b/extraconfig/tasks/pacemaker_common_functions.sh @@ -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 diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh index cb9cc5b1..0c4a7928 100755 --- a/extraconfig/tasks/yum_update.sh +++ b/extraconfig/tasks/yum_update.sh @@ -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 |