stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Set default parameters for storage/*.pp

Browse Source 
Related #1
This commit is contained in:
Yanis Guenane
2014-02-25 13:53:23 -05:00
committed by Emilien Macchi
parent 82265d36f3
commit 74187a829b
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/storage/rbd.pp
View File

@@ -15,9 +15,9 @@
# #
class cloud::storage::rbd ( class cloud::storage::rbd (
$fsid = $os_params::ceph_fsid, $fsid = '4a158d27-f750-41d5-9e7f-26ce4c9d2d45',
$cluster_network = $os_params::ceph_cluster_network, $cluster_network = '127.0.0.1/24',
$public_network = $os_params::ceph_public_network $public_network = '127.0.0.1/24'
) { ) {
class { 'ceph::conf': class { 'ceph::conf':

4
manifests/storage/rbd/monitor.pp
View File

@@ -16,8 +16,8 @@
class cloud::storage::rbd::monitor ( class cloud::storage::rbd::monitor (
$id = $::uniqueid, $id = $::uniqueid,
$mon_addr = $os_params::internal_netif_ip, $mon_addr = '127.0.0.1',
$monitor_secret = $os_params::ceph_mon_secret $monitor_secret = 'cephmonsecret'
) { ) {
include 'cloud::storage::rbd' include 'cloud::storage::rbd'

4
manifests/storage/rbd/osd.pp
View File

@@ -14,8 +14,8 @@
# under the License. # under the License.
# #
class cloud::storage::rbd::osd ( class cloud::storage::rbd::osd (
$public_address = $os_params::api_eth, $public_address = '127.0.0.1',
$cluster_address = $os_params::storage_eth, $cluster_address = '127.0.0.1',
$devices = ['sdb','sdc'], $devices = ['sdb','sdc'],
) { ) {

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

@@ -15,14 +15,14 @@
# #
class cloud::storage::rbd::pools( class cloud::storage::rbd::pools(
$setup_pools = false, $setup_pools = false,
$glance_rbd_user = $os_params::glance_rbd_user, $glance_rbd_user = 'glance',
$glance_rbd_pool = $os_params::glance_rbd_pool, $glance_rbd_pool = 'images',
$cinder_rbd_user = $os_params::cinder_rbd_user, $cinder_rbd_user = 'cinder',
$cinder_rbd_pool = $os_params::cinder_rbd_pool, $cinder_rbd_pool = 'volumes',
$nova_rbd_pool = $os_params::nova_rbd_pool, $nova_rbd_pool = 'vms',
$cinder_backup_user = $os_params::cinder_rbd_backup_user, $cinder_backup_user = 'cinder',
$cinder_backup_pool = $os_params::cinder_rbd_backup_pool, $cinder_backup_pool = 'cinder_backup',
$ceph_fsid = $os_params::ceph_fsid, $ceph_fsid = '4a158d27-f750-41d5-9e7f-26ce4c9d2d45'
) { ) {
if $setup_pools { if $setup_pools {