stackforge/puppet-openstack
Code Issues Proposed changes

Fix rspec tests to support latest apache module

Browse Source 
Latest apache module requires new dependencies: concat and firewall.

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

Change-Id: Ib579871e7d9023331590d72d3adbb37a5ee267e9
This commit is contained in:
Mathieu Gagné
2013-04-29 18:31:06 -04:00
parent 7f2eb3f341
commit d9ba68ca5a
3 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.fixtures.yml
View File

@@ -9,6 +9,8 @@ fixtures:
'quantum': 'git://github.com/bodepd/puppet-quantum' 'quantum': 'git://github.com/bodepd/puppet-quantum'
"apt": "git://github.com/puppetlabs/puppetlabs-apt.git" "apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
"apache": "git://github.com/puppetlabs/puppetlabs-apache.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" "mysql": "git://github.com/puppetlabs/puppetlabs-mysql.git"
"rabbitmq": "git://github.com/puppetlabs/puppetlabs-rabbitmq" "rabbitmq": "git://github.com/puppetlabs/puppetlabs-rabbitmq"
'memcached': 'git://github.com/saz/puppet-memcached' 'memcached': 'git://github.com/saz/puppet-memcached'

12
spec/classes/openstack_all_spec.rb
View File

@@ -25,11 +25,13 @@ describe 'openstack::all' do
let :facts do let :facts do
{ {
:operatingsystem => 'Ubuntu', :operatingsystem => 'Ubuntu',
:osfamily => 'Debian', :osfamily => 'Debian',
:puppetversion => '2.7.x', :operatingsystemrelease => '12.04',
:memorysize => '2GB', :puppetversion => '2.7.x',
:processorcount => '2' :memorysize => '2GB',
:processorcount => '2',
:concat_basedir => '/var/lib/puppet/concat',
} }
end end

24
spec/classes/openstack_controller_spec.rb
View File

@@ -30,11 +30,13 @@ describe 'openstack::controller' do
let :facts do let :facts do
{ {
:operatingsystem => 'Ubuntu', :operatingsystem => 'Ubuntu',
:osfamily => 'Debian', :osfamily => 'Debian',
:puppetversion => '2.7.x', :operatingsystemrelease => '12.04',
:memorysize => '2GB', :puppetversion => '2.7.x',
:processorcount => '2' :memorysize => '2GB',
:processorcount => '2',
:concat_basedir => '/var/lib/puppet/concat',
} }
end end
@@ -324,11 +326,13 @@ describe 'openstack::controller' do
context 'config for nova' do context 'config for nova' do
let :facts do let :facts do
{ {
:operatingsystem => 'Ubuntu', :operatingsystem => 'Ubuntu',
:osfamily => 'Debian', :osfamily => 'Debian',
:puppetversion => '2.7.x', :operatingsystemrelease => '12.04',
:memorysize => '2GB', :puppetversion => '2.7.x',
:processorcount => '2' :memorysize => '2GB',
:processorcount => '2',
:concat_basedir => '/var/lib/puppet/concat',
} }
end end