diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2017-03-10 12:15:47 -0500 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2017-03-13 10:56:24 -0400 |
| commit | 20003d6deb38c378fccbf7db159d74153874c4dc (patch) | |
| tree | 672539bc608107df58baca0e22d6f4e93a116ee6 /puppet/services | |
| parent | ab83e7731c78d44b05243d6242d026a97f4e170a (diff) | |
congress/tacker: switch auth_uri to use uri_no_suffix
Switch Congress and Tacker to use auth_uri with keystone versionless
endpoint.
Change-Id: I7e17d061344849b0421f3a6c9571f1609e8861fb
Partial-Implement: blueprint keystone-v3
Diffstat (limited to 'puppet/services')
| -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 |