stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #82 from enovance/enhancement/80/sbadia

Browse Source 
Use of more explicit name for ceph pools
This commit is contained in:
Sebastien Badia 2014-01-28 03:05:48 -08:00
commit b3259ca98e
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/storage/rbd/pools.pp
View File

@ -15,15 +15,15 @@
#
class cloud::storage::rbd::pools(
$setup_pools = false,
$glance_pool = 'ceph_glance',
$glance_user = 'glance',
$cinder_pool = 'ceph_cinder',
$glance_user = $os_params::glance_rbd_user,
$glance_pool = $os_params::glance_rbd_pool,
$cinder_user = $os_params::cinder_rbd_user,
$cinder_pool = $os_params::cinder_rbd_pool,
$pool_default_pg_num = $::ceph::conf::pool_default_pg_num,
$pool_default_pgp_num = $::ceph::conf::pool_default_pgp_num,
$cinder_user = 'cinder',
$cinder_backup_user = 'cinder',
$cinder_backup_pool = 'ceph_backup_cinder',
$ceph_fsid = $::os_params::ceph_fsid,
$cinder_backup_user = $os_params::cinder_rbd_backup_user,
$cinder_backup_pool = $os_params::cinder_rbd_backup_pool,
$ceph_fsid = $os_params::ceph_fsid,
) {
if $setup_pools {

4
manifests/volume/controller.pp
View File

@ -23,8 +23,8 @@ class cloud::volume::controller(
$ks_glance_internal_host = $os_params::ks_glance_internal_host,
$api_eth = $os_params::api_eth,
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
#$backup_ceph_pool = 'ceph_backup_cinder',
#$backup_ceph_user = 'cinder'
#$backup_ceph_pool = $os_params::cinder_rbd_backup_pool,
#$backup_ceph_user = $os_params::cinder_rbd_backup_user
) {
include 'cloud::volume'

4
manifests/volume/storage.pp
View File

@ -18,8 +18,8 @@
class cloud::volume::storage(
$glance_api_version = $os_params::glance_api_version,
$cinder_rbd_pool = 'ceph_cinder',
$cinder_rbd_user = 'cinder',
$cinder_rbd_pool = $os_params::cinder_rbd_pool,
$cinder_rbd_user = $os_params::cinder_rbd_user,
$cinder_rbd_secret_uuid = $os_params::cinder_rbd_secret_uuid,
) {