diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-10 04:14:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-10 04:14:03 +0000 |
| commit | 50e483f77e9d8a322a5afd5a20504b78bd48397c (patch) | |
| tree | 71bc670a6f78887e9eeb08d1ae2db1e9b419e7ec /spec/fixtures/hieradata | |
| parent | 77cd102c9a96c1be4bef7f8afb95f300c06d2134 (diff) | |
| parent | bbf13fe1d5dd242ce370afbdb7bb13db77d53d7f (diff) | |
Merge "Add support for not using admin_token in Ceph/RGW"
Diffstat (limited to 'spec/fixtures/hieradata')
| -rw-r--r-- | spec/fixtures/hieradata/default.yaml | 7 |
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' |