diff options
| author | Clark Laughlin <clark.laughlin@linaro.org> | 2015-04-15 22:41:57 +0000 |
|---|---|---|
| committer | Clark Laughlin <clark.laughlin@linaro.org> | 2015-04-15 22:41:57 +0000 |
| commit | 2a7ec8e93f6b193675c5a75ea261c552eee4a20c (patch) | |
| tree | 2448de75e68c3c0e7c656035c69ef2f65d63ecd0 | |
| parent | dc3510d3e2e42bcd3fc5e932de3e09d6b9bd05ee (diff) | |
| -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 |