openstack/tripleo-image-elements
Code Issues Proposed changes

Load the storage roles in Tuskar if they exist

Browse Source 
Change-Id: I2b0775b1da85197edb06c3d7b130a42a8ee68ea9
This commit is contained in:
Tomas Sedovic
2014-10-01 15:46:39 +02:00
committed by Tomas Sedovic
parent 60bccfa297
commit 50a8ab3871
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
elements/tuskar/os-refresh-config/configure.d/90-tuskar-db-sync
View File

@@ -5,9 +5,22 @@ TUSKAR_ROLE_DIRECTORY=${TUSKAR_ROLE_DIRECTORY:-"/opt/stack/tripleo-heat-template
if os-is-bootstrap-host ; then
sudo -u tuskar -- tuskar-dbsync --config-file /etc/tuskar/tuskar.conf
BLOCK_STORAGE_ROLE="$TUSKAR_ROLE_DIRECTORY/cinder-storage.yaml"
OBJECT_STORAGE_ROLE="$TUSKAR_ROLE_DIRECTORY/swift-storage.yaml"
EXTRA_ROLES=""
if [ -e "$BLOCK_STORAGE_ROLE" ]; then
EXTRA_ROLES="$EXTRA_ROLES -r $BLOCK_STORAGE_ROLE"
fi
if [ -e "$OBJECT_STORAGE_ROLE" ]; then
EXTRA_ROLES="$EXTRA_ROLES -r $OBJECT_STORAGE_ROLE"
fi
sudo -u tuskar -- tuskar-load-roles --config-file /etc/tuskar/tuskar.conf \
--master-seed $TUSKAR_ROLE_DIRECTORY/overcloud.yaml \
--master-seed $TUSKAR_ROLE_DIRECTORY/overcloud-without-mergepy.yaml \
--resource-registry $TUSKAR_ROLE_DIRECTORY/overcloud-resource-registry.yaml \
$EXTRA_ROLES \
-r $TUSKAR_ROLE_DIRECTORY/compute.yaml \
-r $TUSKAR_ROLE_DIRECTORY/controller.yaml
fi