Skip to content

Commit

Permalink
Fix issues of docker machine + Devstack jobs (apache#411)
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
liusheng authored and kiwik committed Jan 16, 2019
1 parent 2c0146b commit 2126e02
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions playbooks/docker-machine-functional-devstack/run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down

0 comments on commit 2126e02

Please sign in to comment.