diff --git a/manifests/storage/rbd.pp b/manifests/storage/rbd.pp index 1b37e27a..a0853dd8 100644 --- a/manifests/storage/rbd.pp +++ b/manifests/storage/rbd.pp @@ -15,9 +15,9 @@ # class cloud::storage::rbd ( - $fsid = $os_params::ceph_fsid, - $cluster_network = $os_params::ceph_cluster_network, - $public_network = $os_params::ceph_public_network + $fsid = '4a158d27-f750-41d5-9e7f-26ce4c9d2d45', + $cluster_network = '127.0.0.1/24', + $public_network = '127.0.0.1/24' ) { class { 'ceph::conf': diff --git a/manifests/storage/rbd/monitor.pp b/manifests/storage/rbd/monitor.pp index 57e8f8a0..e6a950be 100644 --- a/manifests/storage/rbd/monitor.pp +++ b/manifests/storage/rbd/monitor.pp @@ -16,8 +16,8 @@ class cloud::storage::rbd::monitor ( $id = $::uniqueid, - $mon_addr = $os_params::internal_netif_ip, - $monitor_secret = $os_params::ceph_mon_secret + $mon_addr = '127.0.0.1', + $monitor_secret = 'cephmonsecret' ) { include 'cloud::storage::rbd' diff --git a/manifests/storage/rbd/osd.pp b/manifests/storage/rbd/osd.pp index 7f668d92..e85608cc 100644 --- a/manifests/storage/rbd/osd.pp +++ b/manifests/storage/rbd/osd.pp @@ -14,8 +14,8 @@ # under the License. # class cloud::storage::rbd::osd ( - $public_address = $os_params::api_eth, - $cluster_address = $os_params::storage_eth, + $public_address = '127.0.0.1', + $cluster_address = '127.0.0.1', $devices = ['sdb','sdc'], ) { diff --git a/manifests/storage/rbd/pools.pp b/manifests/storage/rbd/pools.pp index 37c74a0b..640be556 100644 --- a/manifests/storage/rbd/pools.pp +++ b/manifests/storage/rbd/pools.pp @@ -15,14 +15,14 @@ # class cloud::storage::rbd::pools( $setup_pools = false, - $glance_rbd_user = $os_params::glance_rbd_user, - $glance_rbd_pool = $os_params::glance_rbd_pool, - $cinder_rbd_user = $os_params::cinder_rbd_user, - $cinder_rbd_pool = $os_params::cinder_rbd_pool, - $nova_rbd_pool = $os_params::nova_rbd_pool, - $cinder_backup_user = $os_params::cinder_rbd_backup_user, - $cinder_backup_pool = $os_params::cinder_rbd_backup_pool, - $ceph_fsid = $os_params::ceph_fsid, + $glance_rbd_user = 'glance', + $glance_rbd_pool = 'images', + $cinder_rbd_user = 'cinder', + $cinder_rbd_pool = 'volumes', + $nova_rbd_pool = 'vms', + $cinder_backup_user = 'cinder', + $cinder_backup_pool = 'cinder_backup', + $ceph_fsid = '4a158d27-f750-41d5-9e7f-26ce4c9d2d45' ) { if $setup_pools {