Consume clouds.yaml from /etc/openstack

devstack now writes this file globally, so there is no need for us to
set an override location in here.

Change-Id: I33ea7f522e9b099539bf3a24587d140276412cd0
This commit is contained in:
Monty Taylor 2015-10-30 11:36:01 +09:00
parent 727250bf53
commit 0eccc6dc13

View File

@ -1,8 +1,5 @@
#!/bin/bash -x
# Do this so that the nodepool commands below can find the
# clouds.yaml file
export OS_CLIENT_CONFIG_FILE=${OS_CLIENT_CONFIG_FILE:-/opt/stack/new/.config/openstack/clouds.yaml}
NODEPOOL_CONFIG=${NODEPOOL_CONFIG:-/etc/nodepool/nodepool.yaml}
NODEPOOL_SECURE=${NODEPOOL_SECURE:-/etc/nodepool/secure.conf}
NODEPOOL="nodepool -c $NODEPOOL_CONFIG -s $NODEPOOL_SECURE"