Merge pull request #222 from Mirantis/package-versions

Allow specific version of python-nova and nova-common
This commit is contained in:
Dan Bode 2012-12-04 16:07:18 -08:00
commit d2a9273ba5
2 changed files with 9 additions and 5 deletions

View File

@ -30,6 +30,7 @@
# [monitoring_notifications] A boolean specifying whether or not to send system usage data notifications out on the message queue. Optional, false by default. Only valid for stable/essex.
#
class nova(
$ensure_package = 'present',
# this is how to query all resources from our clutser
$nova_cluster_id='localcluster',
$sql_connection = false,
@ -85,14 +86,14 @@ class nova(
# allowing a resource to serve as a point where the configuration of nova begins
anchor { 'nova-start': }
package { "python-nova":
ensure => present,
require => Package["python-greenlet"]
package { 'python-nova':
ensure => $ensure_package,
require => Package['python-greenlet']
}
package { 'nova-common':
name => $::nova::params::common_package_name,
ensure => present,
ensure => $ensure_package,
require => [Package["python-nova"], Anchor['nova-start']]
}

View File

@ -91,10 +91,13 @@ describe 'nova' do
'lock_path' => '/var/locky/path',
'state_path' => '/var/lib/nova2',
'service_down_time' => '120',
'auth_strategy' => 'foo'
'auth_strategy' => 'foo',
'ensure_package' => '2012.1.1-15.el6'
}
end
it { should contain_package('nova-common').with('ensure' => '2012.1.1-15.el6') }
it { should contain_package('python-nova').with('ensure' => '2012.1.1-15.el6') }
it { should contain_nova_config('sql_connection').with_value('mysql://user:pass@db/db') }
it { should contain_nova_config('image_service').with_value('nova.image.local.LocalImageService') }