summaryrefslogtreecommitdiffstats
path: root/spec/fixtures
diff options
context:
space:
mode:
authorKeith Schincke <keith.schincke@gmail.com>2016-12-01 13:37:12 -0500
committerGiulio Fidente <gfidente@redhat.com>2017-01-09 18:31:33 +0100
commitbbf13fe1d5dd242ce370afbdb7bb13db77d53d7f (patch)
tree40a737c43b78d9c24bd7ee66346945bdf54d7f08 /spec/fixtures
parent17fbadba7df13df3df5c263e27fd55d561a6b576 (diff)
Add support for not using admin_token in Ceph/RGW
This patch add the option for using Keyston V3 authention with the Ceph/RGW service instead of using the admin_token Change-Id: I42861afcac221478dcb68be13b6dbc2533a7f158
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/hieradata/default.yaml7
1 files changed, 7 insertions, 0 deletions
diff --git a/spec/fixtures/hieradata/default.yaml b/spec/fixtures/hieradata/default.yaml
index d63fc76..b09e914 100644
--- a/spec/fixtures/hieradata/default.yaml
+++ b/spec/fixtures/hieradata/default.yaml
@@ -14,6 +14,13 @@ barbican::keystone::authtoken::password: 'password'
ceilometer::keystone::authtoken::password: 'password'
# ceph related items
ceph::profile::params::mon_key: 'password'
+# NOTE(gfidente): we want to use keystone v3 API for RGW so the following are
+# needed to comply with the if condition:
+# https://github.com/openstack/puppet-ceph/blob/master/manifests/rgw/keystone.pp#L111
+ceph::profile::params::rgw_keystone_admin_domain: 'keystone_domain'
+ceph::profile::params::rgw_keystone_admin_project: 'keystone_project'
+ceph::profile::params::rgw_keystone_admin_user: 'keystone_admin_user'
+ceph::profile::params::rgw_keystone_admin_password: 'keystone_admin_password'
# cinder related items
cinder::rabbit_password: 'password'
cinder::keystone::authtoken::password: 'password'