From 0903bb1615cbe4c5c0fe5e3b2b708820d1e67865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= <mgagne@iweb.com>
Date: Wed, 7 Aug 2013 22:35:11 -0400
Subject: [PATCH] Use ensure_packages to install utilities

* Remove nested declaration of nova::utilities::install

Change-Id: I232f8aae8889e448710157966de61510d7420c63
---
 manifests/utilities.pp              | 10 +---------
 spec/classes/nova_utilities_spec.rb | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 spec/classes/nova_utilities_spec.rb

diff --git a/manifests/utilities.pp b/manifests/utilities.pp
index d4f87b78f..abedf4643 100644
--- a/manifests/utilities.pp
+++ b/manifests/utilities.pp
@@ -1,14 +1,6 @@
 # unzip swig screen parted curl euca2ools - extra packages
 class nova::utilities {
-  define nova::utilities::install(){
-    if !defined(Package[$title]){
-      package { $title:
-        ensure => present
-      }
-    }
-  }
   if $::osfamily == 'Debian' {
-    $pkgs = ['unzip', 'screen', 'parted', 'curl', 'euca2ools']
-    nova::utilities::install{$pkgs:}
+    ensure_packages(['unzip', 'screen', 'parted', 'curl', 'euca2ools'])
   }
 }
diff --git a/spec/classes/nova_utilities_spec.rb b/spec/classes/nova_utilities_spec.rb
new file mode 100644
index 000000000..a773e36f7
--- /dev/null
+++ b/spec/classes/nova_utilities_spec.rb
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'nova::utilities' do
+
+  describe 'on debian platforms' do
+    let :facts do
+      { :osfamily => 'Debian' }
+    end
+
+    it 'installes utilities' do
+      should contain_package('unzip').with_ensure('present')
+      should contain_package('screen').with_ensure('present')
+      should contain_package('parted').with_ensure('present')
+      should contain_package('curl').with_ensure('present')
+      should contain_package('euca2ools').with_ensure('present')
+    end
+  end
+end