From d9ba68ca5aaea0c69ba59cd76e9077dd16c6cdb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= <mgagne@iweb.com>
Date: Mon, 29 Apr 2013 18:31:06 -0400
Subject: [PATCH] Fix rspec tests to support latest apache module

Latest apache module requires new dependencies: concat and firewall.

It now requires those facts:
* operatingsystemrelease
* concat_basedir (requires by concat)

Change-Id: Ib579871e7d9023331590d72d3adbb37a5ee267e9
---
 .fixtures.yml                             |  2 ++
 spec/classes/openstack_all_spec.rb        | 12 +++++++-----
 spec/classes/openstack_controller_spec.rb | 24 +++++++++++++----------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 9414026..c3cb7bc 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -9,6 +9,8 @@ fixtures:
     'quantum': 'git://github.com/bodepd/puppet-quantum'
     "apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
     "apache": "git://github.com/puppetlabs/puppetlabs-apache.git"
+    "concat": "git://github.com/ripienaar/puppet-concat.git"
+    "firewall": "git://github.com/puppetlabs/puppetlabs-firewall.git"
     "mysql": "git://github.com/puppetlabs/puppetlabs-mysql.git"
     "rabbitmq": "git://github.com/puppetlabs/puppetlabs-rabbitmq"
     'memcached': 'git://github.com/saz/puppet-memcached'
diff --git a/spec/classes/openstack_all_spec.rb b/spec/classes/openstack_all_spec.rb
index 0eade20..5da84e0 100644
--- a/spec/classes/openstack_all_spec.rb
+++ b/spec/classes/openstack_all_spec.rb
@@ -25,11 +25,13 @@ describe 'openstack::all' do
 
   let :facts do
     {
-      :operatingsystem => 'Ubuntu',
-      :osfamily        => 'Debian',
-      :puppetversion   => '2.7.x',
-      :memorysize      => '2GB',
-      :processorcount  => '2'
+      :operatingsystem        => 'Ubuntu',
+      :osfamily               => 'Debian',
+      :operatingsystemrelease => '12.04',
+      :puppetversion          => '2.7.x',
+      :memorysize             => '2GB',
+      :processorcount         => '2',
+      :concat_basedir         => '/var/lib/puppet/concat',
     }
   end
 
diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb
index 1736fc4..a684a6d 100644
--- a/spec/classes/openstack_controller_spec.rb
+++ b/spec/classes/openstack_controller_spec.rb
@@ -30,11 +30,13 @@ describe 'openstack::controller' do
 
   let :facts do
     {
-      :operatingsystem => 'Ubuntu',
-      :osfamily        => 'Debian',
-      :puppetversion   => '2.7.x',
-      :memorysize      => '2GB',
-      :processorcount  => '2'
+      :operatingsystem        => 'Ubuntu',
+      :osfamily               => 'Debian',
+      :operatingsystemrelease => '12.04',
+      :puppetversion          => '2.7.x',
+      :memorysize             => '2GB',
+      :processorcount         => '2',
+      :concat_basedir         => '/var/lib/puppet/concat',
     }
   end
 
@@ -324,11 +326,13 @@ describe 'openstack::controller' do
   context 'config for nova' do
     let :facts do
       {
-        :operatingsystem => 'Ubuntu',
-        :osfamily        => 'Debian',
-        :puppetversion   => '2.7.x',
-        :memorysize      => '2GB',
-        :processorcount  => '2'
+        :operatingsystem        => 'Ubuntu',
+        :osfamily               => 'Debian',
+        :operatingsystemrelease => '12.04',
+        :puppetversion          => '2.7.x',
+        :memorysize             => '2GB',
+        :processorcount         => '2',
+        :concat_basedir         => '/var/lib/puppet/concat',
       }
     end