diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-14 01:52:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-14 01:52:21 +0000 |
| commit | 256d86a726532574aa8cebfaacc8547d3af7f1d8 (patch) | |
| tree | 3d2828bd0f76a343d3112f2f598167c0cf01e544 | |
| parent | 4795a1116850f8bb62e4b179b2190a482a63ac13 (diff) | |
| parent | 20003d6deb38c378fccbf7db159d74153874c4dc (diff) | |
Merge "congress/tacker: switch auth_uri to use uri_no_suffix"
| -rw-r--r-- | puppet/services/congress.yaml | 6 | ||||
| -rw-r--r-- | puppet/services/tacker.yaml | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/puppet/services/congress.yaml b/puppet/services/congress.yaml index 8bc9f2e3..fd1ee24b 100644 --- a/puppet/services/congress.yaml +++ b/puppet/services/congress.yaml @@ -74,8 +74,10 @@ outputs: congress::server::bind_host: {get_param: [ServiceNetMap, CongressApiNetwork]} congress::keystone::authtoken::project_name: 'service' - congress::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} - congress::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} + congress::keystone::authtoken::user_domain_name: 'Default' + congress::keystone::authtoken::project_domain_name: 'Default' + congress::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} + congress::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} congress::db::mysql::password: {get_param: CongressPassword} congress::db::mysql::user: congress diff --git a/puppet/services/tacker.yaml b/puppet/services/tacker.yaml index 6f92066e..a4c139b5 100644 --- a/puppet/services/tacker.yaml +++ b/puppet/services/tacker.yaml @@ -75,8 +75,10 @@ outputs: tacker::server::bind_host: {get_param: [ServiceNetMap, TackerApiNetwork]} tacker::keystone::authtoken::project_name: 'service' - tacker::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} - tacker::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} + tacker::keystone::authtoken::user_domain_name: 'Default' + tacker::keystone::authtoken::project_domain_name: 'Default' + tacker::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} + tacker::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} tacker::db::mysql::password: {get_param: TackerPassword} tacker::db::mysql::user: tacker |