summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-08-02 21:56:11 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2017-08-02 21:56:11 -0500
commitf748860605ea45931ccee3f727ca94fc354d65ca (patch)
treebe4a0ca79b552cb6131c2f90be01ff91837b6325 /ci
parent0c718772057f3a69ee48a947aadffe4a408bd6c0 (diff)
modfieid to pass user_domain_id as well.
Change-Id: I1b5ef9efbbe4f25315309c48c7f3714c5e81b69f Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/openstack.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/ci/openstack.sh b/ci/openstack.sh
index e41dbf83..3a9a7ebe 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -100,9 +100,10 @@ create_openrc() {
source ~/joid_config/admin-openrc
projectid=`openstack project show admin -c id -f value`
projectdomainid=`openstack domain show admin_domain -c id -f value`
+ userdomainid=`openstack user show admin -c domain_id -f value`
urlapi=`openstack catalog show keystone --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)['endpoints']" | grep public | cut -d " " -f 4`
- configOpenrc admin $adminPasswd admin $urlapi RegionOne publicURL $projectid $projectdomainid > ~/joid_config/admin-openrcinternal
- configOpenrc admin $adminPasswd admin $urlapi RegionOne publicURL $projectid $projectdomainid > ~/joid_config/admin-openrc
+ configOpenrc admin $adminPasswd admin $urlapi RegionOne publicURL $projectid $projectdomainid $userdomainid > ~/joid_config/admin-openrcinternal
+ configOpenrc admin $adminPasswd admin $urlapi RegionOne publicURL $projectid $projectdomainid $userdomainid > ~/joid_config/admin-openrc
else
configOpenrc2 admin $adminPasswd admin http://$keystoneIp:5000/v2.0 RegionOne > ~/joid_config/admin-openrc
chmod 0600 ~/joid_config/admin-openrc
@@ -133,6 +134,7 @@ export OS_PASSWORD=$2
export OS_IDENTITY_API_VERSION=3
export OS_DEFAULT_DOMAIN=admin_domain
export OS_USER_DOMAIN_NAME=admin_domain
+export OS_USER_DOMAIN_ID=$9
export OS_PROJECT_DOMAIN_NAME=admin_domain
export OS_PROJECT_DOMAIN_ID=$8
export OS_AUTH_STRATEGY='keystone'