From eecfc80f73c1e93d3fbb49ca6c8d800872270979 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 8 May 2012 17:01:40 -0500 Subject: [PATCH] Allow specification of nova vnc proxy version. --- manifests/vncproxy.pp | 9 +++++---- spec/classes/nova_vnc_proxy_spec.rb | 11 +++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/manifests/vncproxy.pp b/manifests/vncproxy.pp index b0684b7c6..15142a9dc 100644 --- a/manifests/vncproxy.pp +++ b/manifests/vncproxy.pp @@ -21,10 +21,11 @@ class nova::vncproxy( } nova::generic_service { 'vncproxy': - enabled => $enabled, - package_name => $::nova::params::vncproxy_package_name, - service_name => $::nova::params::vncproxy_service_name, - require => Package['python-numpy'] + enabled => $enabled, + package_name => $::nova::params::vncproxy_package_name, + service_name => $::nova::params::vncproxy_service_name, + ensure_package => $ensure_package, + require => Package['python-numpy'] } } diff --git a/spec/classes/nova_vnc_proxy_spec.rb b/spec/classes/nova_vnc_proxy_spec.rb index 440e27f4c..fe0193706 100644 --- a/spec/classes/nova_vnc_proxy_spec.rb +++ b/spec/classes/nova_vnc_proxy_spec.rb @@ -31,8 +31,19 @@ describe 'nova::vncproxy' do :name => 'novnc', :ensure => 'running' )} + + describe 'with package version' do + let :params do + {:ensure_package => '2012.1-2'} + end + it { should contain_package('nova-vncproxy').with( + 'ensure' => '2012.1-2' + )} + end + end + describe 'on Redhatish platforms' do let :facts do