summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorLénaïc Huard <lhuard@amadeus.com>2016-09-29 10:30:23 +0200
committerLénaïc Huard <lhuard@amadeus.com>2016-09-29 10:30:23 +0200
commit4d90cd08d850b5916c93adecbea5b4dcbb22c140 (patch)
tree5f532e018b38b6dbc6473aae38eaea8e48fcbce8 /roles
parent7f1a3f99fc39265e39054e5de1a8d6e29f0d63b8 (diff)
downloadopenshift-4d90cd08d850b5916c93adecbea5b4dcbb22c140.tar.gz
openshift-4d90cd08d850b5916c93adecbea5b4dcbb22c140.tar.bz2
openshift-4d90cd08d850b5916c93adecbea5b4dcbb22c140.tar.xz
openshift-4d90cd08d850b5916c93adecbea5b4dcbb22c140.zip
Set the DomainName or DomainID in the OpenStack cloud provider
Whereas with the OpenStack keystone v2 authentication API, the username and the password are enough, the keystone v3 API requires an additional domain parameter. Fixes #2515
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_cloud_provider/templates/openstack.conf.j25
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_cloud_provider/templates/openstack.conf.j2 b/roles/openshift_cloud_provider/templates/openstack.conf.j2
index ce452db24..313ee02b4 100644
--- a/roles/openshift_cloud_provider/templates/openstack.conf.j2
+++ b/roles/openshift_cloud_provider/templates/openstack.conf.j2
@@ -2,6 +2,11 @@
auth-url = {{ openshift_cloudprovider_openstack_auth_url }}
username = {{ openshift_cloudprovider_openstack_username }}
password = {{ openshift_cloudprovider_openstack_password }}
+{% if openshift_cloudprovider_openstack_domain_id is defined %}
+domain-id = {{ openshift_cloudprovider_openstack_domain_id }}
+{% elif openshift_cloudprovider_openstack_domain_name is defined %}
+domain-name = {{ openshift_cloudprovider_openstack_domain_name }}
+{% endif %}
{% if openshift_cloudprovider_openstack_tenant_id is defined %}
tenant-id = {{ openshift_cloudprovider_openstack_tenant_id }}
{% else %}