stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Re-rename ceph manifest (namespace collision)

Browse Source 
Error: Duplicate declaration: Class[Privatecloud::Ceph::Osd] is already
declared in file /etc/puppet/manifests/site.pp:155; cannot redeclare at
/etc/puppet/modules/privatecloud/manifests/ceph/osd.pp:27 on node
os-ci-test12.enovance.com
This commit is contained in:
Sebastien Badia 2014-01-02 13:13:00 +01:00
parent 1649a67163
commit d8c3f15bba
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/ceph.pp → manifests/storage/rbd.pp
View File

@ -14,7 +14,7 @@
# under the License. # under the License.
# #
class privatecloud::ceph ( class privatecloud::storage::rbd (
$fsid = $os_params::ceph_fsid, $fsid = $os_params::ceph_fsid,
$cluster_network = $os_params::ceph_cluster_network, $cluster_network = $os_params::ceph_cluster_network,
$public_network = $os_params::ceph_public_network $public_network = $os_params::ceph_public_network

2
manifests/ceph/journal.pp → manifests/storage/rbd/journal.pp
View File

@ -15,7 +15,7 @@
# #
# #
# #
define privatecloud::ceph::journal ( define privatecloud::storage::rbd::journal (
$ceph_osd_device = $name $ceph_osd_device = $name
) { ) {

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

@ -14,13 +14,13 @@
# under the License. # under the License.
# #
class privatecloud::ceph::monitor ( class privatecloud::storage::rbd::monitor (
$id = $::uniqueid, $id = $::uniqueid,
$mon_addr = $::ipaddress_eth0, $mon_addr = $::ipaddress_eth0,
$monitor_secret = $os_params::ceph_mon_secret $monitor_secret = $os_params::ceph_mon_secret
) { ) {
include 'privatecloud::ceph' include 'privatecloud::storage:rbd'
ceph::mon { $id: ceph::mon { $id:
monitor_secret => $monitor_secret, monitor_secret => $monitor_secret,

6
manifests/ceph/osd.pp → manifests/storage/rbd/osd.pp
View File

@ -13,20 +13,20 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# #
class privatecloud::ceph::osd ( class privatecloud::storage::rbd::osd (
$public_address = $::ipaddress_eth0, $public_address = $::ipaddress_eth0,
$cluster_address = $::ipaddress_eth0, $cluster_address = $::ipaddress_eth0,
$devices = ['sdb','sdc'], $devices = ['sdb','sdc'],
) { ) {
include 'privatecloud::ceph' include 'privatecloud::storage::rbd'
class { 'ceph::osd' : class { 'ceph::osd' :
public_address => $public_address, public_address => $public_address,
cluster_address => $cluster_address, cluster_address => $cluster_address,
} }
privatecloud::ceph::journal { $devices: } privatecloud::storage::rbd::journal { $devices: }
$osd_ceph = prefix($devices,'/dev/') $osd_ceph = prefix($devices,'/dev/')
ceph::osd::device { $osd_ceph: } ceph::osd::device { $osd_ceph: }

6
manifests/ceph/pools.pp → manifests/storage/rbd/pools.pp
View File

@ -12,10 +12,10 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# Class:: privatecloud::ceph::pools() # Class:: privatecloud::storage::pools()
# #
# #
class privatecloud::ceph::pools( class privatecloud::storage::rbd::pools(
$setup_pools = false, $setup_pools = false,
$glance_pool = 'ceph_glance', $glance_pool = 'ceph_glance',
$glance_user = 'glance', $glance_user = 'glance',
@ -70,4 +70,4 @@ osd 'allow class-read object_prefix rbd_children, allow rwx pool=${::glance_pool
# } # }
} }
} # Class:: privatecloud::ceph::pools }