summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri Mazmanov <dimitri.mazmanov@ericsson.com>2016-07-25 15:17:17 +0200
committerDimitri Mazmanov <dimitri.mazmanov@ericsson.com>2016-07-25 15:20:19 +0200
commit3661a87d2cc920f1a14f4f813e30833504dc313e (patch)
tree5249e64eda4a440b54f04d9ed0da17032c542907
parent797d30bd84f4b8a91c9c2daf1a8f029639fb3a31 (diff)
Always use controller from environment 1
In case of multiregion fuel deployments (which is implemented using fuel environments), always use a controller from the first environment (RegionOne), as for multisite RegionOne is the master region. This fix will not affect single region deployments, because the -env 1 property will result in the same single output. Signed-off-by: Dimitri Mazmanov <dimitri.mazmanov@ericsson.com>
-rwxr-xr-xutils/fetch_os_creds.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index c240976d8..88e964b15 100755
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -82,7 +82,7 @@ if [ "$installer_type" == "fuel" ]; then
# Check if controller is alive (online='True')
controller_ip=$(sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \
- 'fuel node | grep controller | grep "True\| 1" | awk -F\| "{print \$5}" | tail -1' | \
+ 'fuel node -env 1 | grep controller | grep "True\| 1" | awk -F\| "{print \$5}" | tail -1' | \
sed 's/ //g') &> /dev/null
if [ -z $controller_ip ]; then