Refactor get-occ-config.sh
* Add $ to to eval hosts to get proper dereference
* Add quatas around eval
* Replace let with ((i++))
Change-Id: I5dbb6ef16598905b6d3bbb9efc448e0b45cbe099
(cherry picked from commit 961f7315f3
)
This commit is contained in:
parent
85e49596bb
commit
2cb70926be
|
@ -24,13 +24,10 @@ CephStorage_hosts=${CephStorage_hosts:-"$CEPHSTORAGE_HOSTS"}
|
|||
|
||||
# Set the _hosts_a vars for each role defined
|
||||
for role in $OVERCLOUD_ROLES; do
|
||||
eval hosts=\${${role}_hosts}
|
||||
eval "hosts=\${${role}_hosts}"
|
||||
read -a ${role}_hosts_a <<< $hosts
|
||||
done
|
||||
|
||||
admin_user_id=$(openstack user show admin -c id -f value)
|
||||
admin_project_id=$(openstack project show admin -c id -f value)
|
||||
|
||||
function check_stack {
|
||||
local stack_to_check=${1:-""}
|
||||
|
||||
|
@ -107,7 +104,7 @@ for role in $OVERCLOUD_ROLES; do
|
|||
|
||||
|
||||
host=
|
||||
eval host=\${${role}_hosts_a[i]}
|
||||
eval "host=\${${role}_hosts_a[$i]}"
|
||||
if [ -n "$host" ]; then
|
||||
ssh $SSH_OPTIONS -i $SUBNODES_SSH_KEY $host "echo '$config' > deployed-server.json"
|
||||
ssh $SSH_OPTIONS -i $SUBNODES_SSH_KEY $host sudo mkdir -p -m 0700 /var/lib/os-collect-config/local-data/ || true
|
||||
|
@ -116,7 +113,7 @@ for role in $OVERCLOUD_ROLES; do
|
|||
ssh $SSH_OPTIONS -i $SUBNODES_SSH_KEY $host sudo systemctl enable os-collect-config
|
||||
fi
|
||||
|
||||
let i+=1
|
||||
((i++))
|
||||
|
||||
done
|
||||
|
||||
|
|
Loading…
Reference in New Issue