diff options
| -rwxr-xr-x | cloud-deploy/4-novarc-to-cloud-controller.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloud-deploy/4-novarc-to-cloud-controller.sh b/cloud-deploy/4-novarc-to-cloud-controller.sh index 4673946..8efce7c 100755 --- a/cloud-deploy/4-novarc-to-cloud-controller.sh +++ b/cloud-deploy/4-novarc-to-cloud-controller.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e KEYSTONE_IP=`juju status keystone/0 | grep public-address | awk '{ print $2 }'` -KEYSTONE_ADMIN_TOKEN=`juju ssh keystone/0 "sudo cat /etc/keystone/keystone.conf | grep admin_token" | sed -e '/sudo: unable.*/d' -e '/^M/d' -e 's/admin_token=.$//' | awk '{ print $3 }'` +KEYSTONE_ADMIN_TOKEN=`juju ssh keystone/0 "sudo cat /etc/keystone/keystone.conf | grep admin_token" | sed 's/\r$//' | sed -n -e '2,2p' | awk '{ print $3 }'` echo "Keystone IP: [${KEYSTONE_IP}]" echo "Keystone Admin Token: [${KEYSTONE_ADMIN_TOKEN}]" cat << EOF > ./stackrc |