aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-10 23:22:03 +0000
committerGerrit Code Review <review@openstack.org>2015-11-10 23:22:03 +0000
commitb044733893f97eae6ca8f081ee58c28bc9fa1f5a (patch)
tree8cf104d95cedd60ad3be23d0f616eb477f58fc31 /environments
parent266d123286e91bb733102ae20f607caeead520f2 (diff)
parente19ae9dfe03e2868562ef090c455aa9e8c394d9e (diff)
Merge "Allow customization of the Ceph pool names"
Diffstat (limited to 'environments')
-rw-r--r--environments/puppet-ceph-external.yaml7
1 files changed, 6 insertions, 1 deletions
diff --git a/environments/puppet-ceph-external.yaml b/environments/puppet-ceph-external.yaml
index 3c7901cc..f22967f4 100644
--- a/environments/puppet-ceph-external.yaml
+++ b/environments/puppet-ceph-external.yaml
@@ -3,7 +3,7 @@
resource_registry:
OS::TripleO::CephClusterConfig::SoftwareConfig: ../puppet/extraconfig/ceph/ceph-external-config.yaml
-parameters:
+parameter_defaults:
# NOTE: These example parameters are required when using Ceph External
#CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
#CephClientKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
@@ -13,6 +13,11 @@ parameters:
NovaEnableRbdBackend: true
CinderEnableRbdBackend: true
GlanceBackend: rbd
+ # If the Ceph pools which host VMs, Volumes and Images do not match these
+ # names, edit the following as needed.
+ NovaRbdPoolName: vms
+ CinderRbdPoolName: volumes
+ GlanceRbdPoolName: images
# finally we disable the Cinder LVM backend
CinderEnableIscsiBackend: false