From d8c3f15bba82d9f79d19ad50a714f032d9adf400 Mon Sep 17 00:00:00 2001
From: Sebastien Badia <sebastien.badia@enovance.com>
Date: Thu, 2 Jan 2014 13:13:00 +0100
Subject: [PATCH] Re-rename ceph manifest (namespace collision)

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
---
 manifests/{ceph.pp => storage/rbd.pp}      | 2 +-
 manifests/{ceph => storage/rbd}/journal.pp | 2 +-
 manifests/{ceph => storage/rbd}/monitor.pp | 4 ++--
 manifests/{ceph => storage/rbd}/osd.pp     | 6 +++---
 manifests/{ceph => storage/rbd}/pools.pp   | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename manifests/{ceph.pp => storage/rbd.pp} (96%)
 rename manifests/{ceph => storage/rbd}/journal.pp (96%)
 rename manifests/{ceph => storage/rbd}/monitor.pp (91%)
 rename manifests/{ceph => storage/rbd}/osd.pp (87%)
 rename manifests/{ceph => storage/rbd}/pools.pp (96%)

diff --git a/manifests/ceph.pp b/manifests/storage/rbd.pp
similarity index 96%
rename from manifests/ceph.pp
rename to manifests/storage/rbd.pp
index 3a5c3471..5e3fafdb 100644
--- a/manifests/ceph.pp
+++ b/manifests/storage/rbd.pp
@@ -14,7 +14,7 @@
 # under the License.
 #
 
-class privatecloud::ceph (
+class privatecloud::storage::rbd (
   $fsid            = $os_params::ceph_fsid,
   $cluster_network = $os_params::ceph_cluster_network,
   $public_network  = $os_params::ceph_public_network
diff --git a/manifests/ceph/journal.pp b/manifests/storage/rbd/journal.pp
similarity index 96%
rename from manifests/ceph/journal.pp
rename to manifests/storage/rbd/journal.pp
index 0e04f2cf..8c215497 100644
--- a/manifests/ceph/journal.pp
+++ b/manifests/storage/rbd/journal.pp
@@ -15,7 +15,7 @@
 #
 #
 #
-define privatecloud::ceph::journal (
+define privatecloud::storage::rbd::journal (
   $ceph_osd_device = $name
 ) {
 
diff --git a/manifests/ceph/monitor.pp b/manifests/storage/rbd/monitor.pp
similarity index 91%
rename from manifests/ceph/monitor.pp
rename to manifests/storage/rbd/monitor.pp
index 358cf2f9..05d0eab0 100644
--- a/manifests/ceph/monitor.pp
+++ b/manifests/storage/rbd/monitor.pp
@@ -14,13 +14,13 @@
 # under the License.
 #
 
-class privatecloud::ceph::monitor (
+class privatecloud::storage::rbd::monitor (
   $id             = $::uniqueid,
   $mon_addr       = $::ipaddress_eth0,
   $monitor_secret = $os_params::ceph_mon_secret
 ) {
 
-  include 'privatecloud::ceph'
+  include 'privatecloud::storage:rbd'
 
   ceph::mon { $id:
     monitor_secret => $monitor_secret,
diff --git a/manifests/ceph/osd.pp b/manifests/storage/rbd/osd.pp
similarity index 87%
rename from manifests/ceph/osd.pp
rename to manifests/storage/rbd/osd.pp
index 1de79474..c2fca20e 100644
--- a/manifests/ceph/osd.pp
+++ b/manifests/storage/rbd/osd.pp
@@ -13,20 +13,20 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-class privatecloud::ceph::osd (
+class privatecloud::storage::rbd::osd (
   $public_address  = $::ipaddress_eth0,
   $cluster_address = $::ipaddress_eth0,
   $devices         = ['sdb','sdc'],
 ) {
 
-  include 'privatecloud::ceph'
+  include 'privatecloud::storage::rbd'
 
   class { 'ceph::osd' :
     public_address  => $public_address,
     cluster_address => $cluster_address,
   }
 
-  privatecloud::ceph::journal { $devices: }
+  privatecloud::storage::rbd::journal { $devices: }
   $osd_ceph = prefix($devices,'/dev/')
   ceph::osd::device { $osd_ceph: }
 
diff --git a/manifests/ceph/pools.pp b/manifests/storage/rbd/pools.pp
similarity index 96%
rename from manifests/ceph/pools.pp
rename to manifests/storage/rbd/pools.pp
index b065bd66..c537f3cc 100644
--- a/manifests/ceph/pools.pp
+++ b/manifests/storage/rbd/pools.pp
@@ -12,10 +12,10 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-# Class:: privatecloud::ceph::pools()
+# Class:: privatecloud::storage::pools()
 #
 #
-class privatecloud::ceph::pools(
+class privatecloud::storage::rbd::pools(
   $setup_pools        = false,
   $glance_pool        = 'ceph_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
+}