From f80c82fd5f3369e4c91d5e3836d2a68969912e27 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 9 Dec 2015 14:04:46 -0600 Subject: added support for maas deployment for juniper lab. modified deploy.sh to resolve CI issue. Change-Id: Ifb0f2aaa6806289d2d5c4b493815dda89478a942 --- ci/deploy.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'ci/deploy.sh') diff --git a/ci/deploy.sh b/ci/deploy.sh index 81f39b6a..92d17e20 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -87,14 +87,13 @@ check_status() { configOpenrc() { - cat <<-EOF - export OS_USERNAME=$1 - export OS_PASSWORD=$2 - export OS_TENANT_NAME=$3 - export OS_AUTH_URL=$4 - export OS_REGION_NAME=$5 - EOF -} + echo" " > ./cloud/admin-openrc + echo "export OS_USERNAME=$1" >> ./cloud/admin-openrc + echo "export OS_PASSWORD=$2" >> ./cloud/admin-openrc + echo "export OS_TENANT_NAME=$3" >> ./cloud/admin-openrc + echo "export OS_AUTH_URL=$4" >> ./cloud/admin-openrc + echo "export OS_REGION_NAME=$5" >> ./cloud/admin-openrc + } unitAddress() { @@ -106,7 +105,7 @@ createopenrc() mkdir -m 0700 -p cloud controller_address=$(unitAddress keystone 0) - configOpenrc admin openstack admin http://$controller_address:5000/v2.0 Canonical > cloud/admin-openrc + configOpenrc admin openstack admin http://$controller_address:5000/v2.0 Canonical chmod 0600 cloud/admin-openrc } -- cgit 1.2.3-korg