openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Add $STACK_NAME input var 

The stack name can now be overridden in the get-occ-config.sh script for
deployed-server's by setting the $STACK_NAME variable in the
environment.

Change-Id: Iecba21499b80e463b4c629be53c309996d39472d
Closes-Bug: #1686719
(cherry picked from commit e17590c69e)
This commit is contained in:
James Slagle 2017-04-27 13:00:17 -04:00
parent 0137f67f2e
commit d8e27308c7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployed-server/scripts/get-occ-config.sh
View File

@ -12,6 +12,7 @@ CEPHSTORAGE_HOSTS=${CEPHSTORAGE_HOSTS:-""}
SUBNODES_SSH_KEY=${SUBNODES_SSH_KEY:-"~/.ssh/id_rsa"}
SSH_OPTIONS="-tt -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=Verbose -o PasswordAuthentication=no -o ConnectionAttempts=32"
OVERCLOUD_ROLES=${OVERCLOUD_ROLES:-"Controller Compute BlockStorage ObjectStorage CephStorage"}
STACK_NAME=${STACK_NAME:-"overcloud"}
# Set the _hosts vars for the default roles based on the old var names that
# were all caps for backwards compatibility.
@ -53,14 +54,14 @@ function check_stack {
for role in $OVERCLOUD_ROLES; do
while ! check_stack overcloud; do
while ! check_stack $STACK_NAME; do
sleep $SLEEP_TIME
done
rg_stack=$(openstack stack resource show overcloud $role -c physical_resource_id -f value)
rg_stack=$(openstack stack resource show $STACK_NAME $role -c physical_resource_id -f value)
while ! check_stack $rg_stack; do
sleep $SLEEP_TIME
rg_stack=$(openstack stack resource show overcloud $role -c physical_resource_id -f value)
rg_stack=$(openstack stack resource show $STACK_NAME $role -c physical_resource_id -f value)
done
stacks=$(openstack stack resource list $rg_stack -c resource_name -c physical_resource_id -f json | jq -r "sort_by(.resource_name) | .[] | .physical_resource_id")

5
releasenotes/notes/stack-name-input-73f4d4d052f1377e.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- The stack name can now be overridden in the get-occ-config.sh script
for deployed-server's by setting the $STACK_NAME variable in the
environment.