From 541f2b89a07806615c17dcdc32a2a68a77a7a115 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Mon, 12 Jan 2015 10:23:38 -0500
Subject: [PATCH] Move cloud::cache to cloud::database::nosql::memcached

Move memcached to a new nosql backend for future consistency with Redis
& MongoDB.

Change-Id: Id257b0173855c0432c22ecc2201d08f9ab4d58b8
---
 manifests/{cache.pp => database/nosql/memcached.pp}    |  8 ++++----
 ..._spec.rb => cloud_database_nosql_memcached_spec.rb} | 10 +++++-----
 spec/classes/cloud_selinux_spec.rb                     |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename manifests/{cache.pp => database/nosql/memcached.pp} (87%)
 rename spec/classes/{cloud_cache_spec.rb => cloud_database_nosql_memcached_spec.rb} (90%)

diff --git a/manifests/cache.pp b/manifests/database/nosql/memcached.pp
similarity index 87%
rename from manifests/cache.pp
rename to manifests/database/nosql/memcached.pp
index 3789bfd3..7cb675c2 100644
--- a/manifests/cache.pp
+++ b/manifests/database/nosql/memcached.pp
@@ -13,9 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# == Class: cloud::cache
+# == Class: cloud::database::nosql::memcached
 #
-# Install a cache server (used by OpenStack services)
+# Install a Memcached server (used by OpenStack services)
 #
 # === Parameters:
 #
@@ -28,12 +28,12 @@
 #   Should be an hash.
 #   Default to {}
 #
-class cloud::cache (
+class cloud::database::nosql::memcached (
   $listen_ip         = '127.0.0.1',
   $firewall_settings = {},
 ){
 
-  class { 'memcached':
+  class { '::memcached':
     listen_ip  => $listen_ip,
     max_memory => '60%',
   }
diff --git a/spec/classes/cloud_cache_spec.rb b/spec/classes/cloud_database_nosql_memcached_spec.rb
similarity index 90%
rename from spec/classes/cloud_cache_spec.rb
rename to spec/classes/cloud_database_nosql_memcached_spec.rb
index ea4f476e..46b6aac0 100644
--- a/spec/classes/cloud_cache_spec.rb
+++ b/spec/classes/cloud_database_nosql_memcached_spec.rb
@@ -13,14 +13,14 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# Unit tests for cloud::cache
+# Unit tests for cloud::cache::memcached
 #
 
 require 'spec_helper'
 
-describe 'cloud::cache' do
+describe 'cloud::database::nosql::memcached' do
 
-  shared_examples_for 'cache server' do
+  shared_examples_for 'memcached server' do
 
     let :params do
       { :listen_ip => '10.0.0.1' }
@@ -70,7 +70,7 @@ describe 'cloud::cache' do
       { :osfamily => 'Debian' }
     end
 
-    it_configures 'cache server'
+    it_configures 'memcached server'
   end
 
   context 'on RedHat platforms' do
@@ -78,7 +78,7 @@ describe 'cloud::cache' do
       { :osfamily => 'RedHat' }
     end
 
-    it_configures 'cache server'
+    it_configures 'memcached server'
   end
 
 end
diff --git a/spec/classes/cloud_selinux_spec.rb b/spec/classes/cloud_selinux_spec.rb
index 1da314f1..bcd0d3aa 100644
--- a/spec/classes/cloud_selinux_spec.rb
+++ b/spec/classes/cloud_selinux_spec.rb
@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# Unit tests for cloud::cache
+# Unit tests for cloud::selinux
 #
 
 require 'spec_helper'