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 /inventory | |
| 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 'inventory')
| -rw-r--r-- | inventory/byo/hosts.origin.example | 2 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 023f77149..55efc0925 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -145,6 +145,8 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #openshift_cloudprovider_openstack_auth_url=http://openstack.example.com:35357/v2.0/ #openshift_cloudprovider_openstack_username=username #openshift_cloudprovider_openstack_password=password +#openshift_cloudprovider_openstack_domain_id=domain_id +#openshift_cloudprovider_openstack_domain_name=domain_name #openshift_cloudprovider_openstack_tenant_id=tenant_id #openshift_cloudprovider_openstack_tenant_name=tenant_name #openshift_cloudprovider_openstack_region=region diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 14dfbd91e..8a5655104 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -144,6 +144,8 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #openshift_cloudprovider_openstack_auth_url=http://openstack.example.com:35357/v2.0/ #openshift_cloudprovider_openstack_username=username #openshift_cloudprovider_openstack_password=password +#openshift_cloudprovider_openstack_domain_id=domain_id +#openshift_cloudprovider_openstack_domain_name=domain_name #openshift_cloudprovider_openstack_tenant_id=tenant_id #openshift_cloudprovider_openstack_tenant_name=tenant_name #openshift_cloudprovider_openstack_region=region |