From f901e1a63031cc36fb9dbacb870f849a4345ecb3 Mon Sep 17 00:00:00 2001
From: Yanis Guenane <yanis.guenane@enovance.com>
Date: Thu, 22 May 2014 16:21:45 -0400
Subject: [PATCH] Remove ssh::server::install from puppet-openstack-cloud

Since ssh::server::install is already installed by the swift module
there is no need to have it declared here also.
---
 manifests/object.pp             | 2 --
 manifests/object/ringbuilder.pp | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/object.pp b/manifests/object.pp
index 84dd7e36..9e0c5340 100644
--- a/manifests/object.pp
+++ b/manifests/object.pp
@@ -27,8 +27,6 @@ class cloud::object(
   $swift_hash_suffix = undef
 ) {
 
-  class { 'ssh::server::install': }
-
   class { 'swift':
     swift_hash_suffix => $swift_hash_suffix,
   }
diff --git a/manifests/object/ringbuilder.pp b/manifests/object/ringbuilder.pp
index 4889b978..ddfe72cc 100644
--- a/manifests/object/ringbuilder.pp
+++ b/manifests/object/ringbuilder.pp
@@ -22,6 +22,8 @@ class cloud::object::ringbuilder(
     $swift_rsync_max_connections = 5,
 ) {
 
+  include cloud::object
+
   Ring_object_device <<| |>>
   Ring_container_device <<| |>>
   Ring_account_device <<| |>>