From dc279ce8cbe1d8689195a7a626b1763deb9c623b Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Mon, 30 Dec 2013 10:29:23 +0100
Subject: [PATCH] volume: move class

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 manifests/{volume/volume_common.pp => volume.pp}         | 2 +-
 manifests/volume/{volume_controller.pp => controller.pp} | 2 +-
 manifests/volume/{volume_storage.pp => storage.pp}       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename manifests/{volume/volume_common.pp => volume.pp} (98%)
 rename manifests/volume/{volume_controller.pp => controller.pp} (97%)
 rename manifests/volume/{volume_storage.pp => storage.pp} (95%)

diff --git a/manifests/volume/volume_common.pp b/manifests/volume.pp
similarity index 98%
rename from manifests/volume/volume_common.pp
rename to manifests/volume.pp
index dcbffbf6..54b66829 100644
--- a/manifests/volume/volume_common.pp
+++ b/manifests/volume.pp
@@ -16,7 +16,7 @@
 # Volume Common
 #
 
-class os_volume_common(
+class privatecloud::volume(
   $cinder_db_host             = $os_params::cinder_db_host,
   $cinder_db_user             = $os_params::cinder_db_user,
   $cinder_db_password         = $os_params::cinder_db_password,
diff --git a/manifests/volume/volume_controller.pp b/manifests/volume/controller.pp
similarity index 97%
rename from manifests/volume/volume_controller.pp
rename to manifests/volume/controller.pp
index 0b99f6a2..608d4920 100644
--- a/manifests/volume/volume_controller.pp
+++ b/manifests/volume/controller.pp
@@ -16,7 +16,7 @@
 # Volume controller
 #
 
-class os_volume_controller(
+class privatecloud::volume::controller(
   $ks_cinder_internal_port   = $os_params::ks_cinder_internal_port,
   $ks_cinder_password        = $os_params::ks_cinder_password,
   $ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
diff --git a/manifests/volume/volume_storage.pp b/manifests/volume/storage.pp
similarity index 95%
rename from manifests/volume/volume_storage.pp
rename to manifests/volume/storage.pp
index 52f42969..a9dfea3f 100644
--- a/manifests/volume/volume_storage.pp
+++ b/manifests/volume/storage.pp
@@ -16,7 +16,7 @@
 # Volume storage
 #
 
-class os_volume_storage {
+class privatecloud::volume::storage {
 
   class { 'cinder::volume::rbd':
     rbd_pool           => $os_params::cinder_rbd_pool,