summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-08-13 20:10:29 +0200
committerGiulio Fidente <gfidente@redhat.com>2015-11-05 19:39:09 +0100
commit9ea7831eaeadced1b5599b6ef1feb01d0cb6dca2 (patch)
tree0720707f75fdd9b7ec320a52958392585620415a /environments
parente19ae9dfe03e2868562ef090c455aa9e8c394d9e (diff)
Allow customization of Ceph client user
Previously we enforced the Ceph user used by the OpenStack clients to be named 'openstack', this change allows for customization of such a name. Change-Id: Idef3e1ed4e8e21b645081869b8d6fad2329bdc60
Diffstat (limited to 'environments')
-rw-r--r--environments/puppet-ceph-external.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/environments/puppet-ceph-external.yaml b/environments/puppet-ceph-external.yaml
index f22967f4..7f5b5080 100644
--- a/environments/puppet-ceph-external.yaml
+++ b/environments/puppet-ceph-external.yaml
@@ -14,10 +14,12 @@ parameter_defaults:
CinderEnableRbdBackend: true
GlanceBackend: rbd
# If the Ceph pools which host VMs, Volumes and Images do not match these
- # names, edit the following as needed.
+ # names OR the client keyring to use is not named 'openstack', edit the
+ # following as needed.
NovaRbdPoolName: vms
CinderRbdPoolName: volumes
GlanceRbdPoolName: images
+ CephClientUserName: openstack
# finally we disable the Cinder LVM backend
CinderEnableIscsiBackend: false