aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-01 19:59:51 +0000
committerGerrit Code Review <review@openstack.org>2016-12-01 19:59:51 +0000
commitd19ae9f4909b36697e224b4fd1878ebe439a679e (patch)
treecb7f51da0712a55c54ecb61c89acd3e3a9397331 /puppet/services
parentec678ff25332a2441cd3e2330b1a07b5316ead10 (diff)
parentf33475840c871f4fc6f638577e25733d60dba94a (diff)
Merge "ceph-rgw: add missing user parameter"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/ceph-rgw.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/services/ceph-rgw.yaml b/puppet/services/ceph-rgw.yaml
index 89c1a5ee..4b85d28f 100644
--- a/puppet/services/ceph-rgw.yaml
+++ b/puppet/services/ceph-rgw.yaml
@@ -68,6 +68,7 @@ outputs:
ceph::rgw::keystone::auth::public_url: {get_param: [EndpointMap, CephRgwPublic, uri]}
ceph::rgw::keystone::auth::internal_url: {get_param: [EndpointMap, CephRgwInternal, uri]}
ceph::rgw::keystone::auth::admin_url: {get_param: [EndpointMap, CephRgwAdmin, uri]}
+ ceph::rgw::keystone::auth::user: 'swift'
ceph::rgw::keystone::auth::password: {get_param: SwiftPassword}
ceph::rgw::keystone::auth::region: {get_param: KeystoneRegion}
ceph::rgw::keystone::auth::tenant: 'service'