From 2126e020a174dac5577091425ad1ab2d1d326ad9 Mon Sep 17 00:00:00 2001 From: liusheng Date: Wed, 16 Jan 2019 15:58:02 +0800 Subject: [PATCH] Fix issues of docker machine + Devstack jobs (#411) - Add OS_USER_DOMAIN_ID and OS_PROJECT_DOMAIN_ID for Mitaka jobs - Change the AUTH_URL by adding '/v3' postfix for M+ jobs Closes: theopenlab/openlab#160 --- playbooks/docker-machine-functional-devstack/run.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/playbooks/docker-machine-functional-devstack/run.yaml b/playbooks/docker-machine-functional-devstack/run.yaml index b1791ade16e5b..3c35bdc675f66 100644 --- a/playbooks/docker-machine-functional-devstack/run.yaml +++ b/playbooks/docker-machine-functional-devstack/run.yaml @@ -21,6 +21,8 @@ project_id=$(openstack token issue -f value -c project_id) sg_id=$(openstack security group list | grep default | grep $project_id | head -n 1 | awk '{print $2}') if [ "{{ global_env.OS_BRANCH }}" == "stable/mitaka" ]; then + export OS_USER_DOMAIN_ID=default + export OS_PROJECT_DOMAIN_ID=default sg_cmd_prefix="openstack security group rule create --proto" else sg_cmd_prefix="openstack security group rule create --ingress --protocol" @@ -40,6 +42,7 @@ export OS_FLOATINGIP_POOL=public export OS_SECURITY_GROUPS=default + [[ "$OS_AUTH_URL" =~ "v3" ]] || export OS_AUTH_URL="$OS_AUTH_URL"/v3 export OS_DOMAIN_ID=default export DRIVER=openstack