summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-11 15:29:28 +0000
committerGerrit Code Review <review@openstack.org>2015-11-11 15:29:28 +0000
commit1b22aed7054ca08e93d870bdc6103c36f97c4b17 (patch)
tree3928dda1c9ce09b385efeafb70ec1418c0d49749 /environments
parent7961f61a413eb36caf46677655cbf8af8bfb6303 (diff)
parent9ea7831eaeadced1b5599b6ef1feb01d0cb6dca2 (diff)
Merge "Allow customization of Ceph client user"
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