aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-04 20:15:07 +0000
committerGerrit Code Review <review@openstack.org>2017-09-04 20:15:07 +0000
commit9b3170ce17d6234cecee31cd210158e19809dc22 (patch)
treef5571c0fa03ebb235e2e5d45c071f22a482e39a7 /puppet/services
parentf20b25c29832d9ce97c1ba60533cb2bcd0b1c227 (diff)
parented73f20f5bea1cf94bb88841d48cd02fed4f0195 (diff)
Merge "Configure Zaqar trust notifier" into stable/pike
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/zaqar-api.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/services/zaqar-api.yaml b/puppet/services/zaqar-api.yaml
index 9232675..71f9053 100644
--- a/puppet/services/zaqar-api.yaml
+++ b/puppet/services/zaqar-api.yaml
@@ -98,6 +98,7 @@ outputs:
zaqar::keystone::authtoken::project_name: 'service'
zaqar::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
zaqar::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
+ zaqar::keystone::trust::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
zaqar::debug:
if:
- service_debug_unset
@@ -164,6 +165,8 @@ outputs:
zaqar::keystone::auth_websocket::internal_url: {get_param: [EndpointMap, ZaqarWebSocketInternal, uri]}
zaqar::keystone::auth_websocket::region: {get_param: KeystoneRegion}
zaqar::keystone::auth_websocket::tenant: 'service'
+ zaqar::keystone::trust::password: {get_param: ZaqarPassword}
+ zaqar::keystone::trust::user_domain_name: 'Default'
-
if:
- zaqar_management_store_sqlalchemy