diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-29 10:12:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-29 10:12:25 -0400 |
| commit | be3a68ae520d518daef2e35553c28cd150d3c344 (patch) | |
| tree | 5f532e018b38b6dbc6473aae38eaea8e48fcbce8 /roles/openshift_cloud_provider | |
| parent | 7f1a3f99fc39265e39054e5de1a8d6e29f0d63b8 (diff) | |
| parent | 4d90cd08d850b5916c93adecbea5b4dcbb22c140 (diff) | |
| download | openshift-be3a68ae520d518daef2e35553c28cd150d3c344.tar.gz openshift-be3a68ae520d518daef2e35553c28cd150d3c344.tar.bz2 openshift-be3a68ae520d518daef2e35553c28cd150d3c344.tar.xz openshift-be3a68ae520d518daef2e35553c28cd150d3c344.zip | |
Merge pull request #2527 from lhuard1A/fix_cloudprovider_openstack_keystonev3
Set the DomainName or DomainID in the OpenStack cloud provider
Diffstat (limited to 'roles/openshift_cloud_provider')
| -rw-r--r-- | roles/openshift_cloud_provider/templates/openstack.conf.j2 | 5 |
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 %} |