openstack
/
puppet-nova
Code Issues Proposed changes

Merge pull request #107 from jmchilton/scheduler_package_version 

Allow specifing specific package version for nova-scheduler.
This commit is contained in:
Dan Bode 2012-05-10 12:21:16 -07:00
parent e08ce5a372 9e8cced563
commit 0a5c8a5fb9
18 changed files with 140 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/cert.pp
View File

@ -1,13 +1,15 @@
class nova::cert(
$enabled=false
$enabled = false,
$ensure_package = 'present'
) {
include nova::params
nova::generic_service { 'cert':
enabled => $enabled,
package_name => $::nova::params::cert_package_name,
service_name => $::nova::params::cert_service_name,
enabled => $enabled,
package_name => $::nova::params::cert_package_name,
service_name => $::nova::params::cert_service_name,
ensure_package => $ensure_package,
}
}

4
manifests/client.pp
View File

@ -1,9 +1,9 @@
class nova::client(
$ensure = 'present'
) {
package { 'python-novaclient':
ensure => present,
ensure => $ensure,
}
}

10
manifests/compute.pp
View File

@ -2,6 +2,7 @@
# from the virtualization implementation of the compute node
class nova::compute(
$enabled = false,
$ensure_package = 'present',
$vnc_enabled = true,
$vncserver_proxyclient_address = '127.0.0.1',
$vncproxy_host = false,
@ -34,10 +35,11 @@ class nova::compute(
}
nova::generic_service { 'compute':
enabled => $enabled,
package_name => $::nova::params::compute_package_name,
service_name => $::nova::params::compute_service_name,
before => Exec['networking-refresh']
enabled => $enabled,
package_name => $::nova::params::compute_package_name,
service_name => $::nova::params::compute_service_name,
ensure_package => $ensure_package,
before => Exec['networking-refresh']
}
}

10
manifests/consoleauth.pp
View File

@ -5,15 +5,17 @@
# for Horizon
#
class nova::consoleauth(
$enabled = false
$enabled = false,
$ensure_package = 'present'
) {
include nova::params
nova::generic_service { 'consoleauth':
enabled => $enabled,
package_name => $::nova::params::consoleauth_package_name,
service_name => $::nova::params::consoleauth_service_name,
enabled => $enabled,
package_name => $::nova::params::consoleauth_package_name,
service_name => $::nova::params::consoleauth_service_name,
ensure_package => $ensure_package,
}
}

10
manifests/network.pp
View File

@ -21,6 +21,7 @@ class nova::network(
$network_manager = 'nova.network.manager.FlatDHCPManager',
$config_overrides = {},
$create_networks = true,
$ensure_package = 'present',
$install_service = true
) {
@ -43,10 +44,11 @@ class nova::network(
if $install_service {
nova::generic_service { 'network':
enabled => $enabled,
package_name => $::nova::params::network_package_name,
service_name => $::nova::params::network_service_name,
before => Exec['networking-refresh']
enabled => $enabled,
package_name => $::nova::params::network_package_name,
service_name => $::nova::params::network_service_name,
ensure_package => $ensure_package,
before => Exec['networking-refresh']
}
}

10
manifests/objectstore.pp
View File

@ -1,13 +1,15 @@
class nova::objectstore(
$enabled=false
$enabled = false,
$ensure_package = 'present'
) {
include nova::params
nova::generic_service { 'objectstore':
enabled => $enabled,
package_name => $::nova::params::objectstore_package_name,
service_name => $::nova::params::objectstore_service_name,
enabled => $enabled,
package_name => $::nova::params::objectstore_package_name,
service_name => $::nova::params::objectstore_service_name,
ensure_package => $ensure_package,
}
}

10
manifests/scheduler.pp
View File

@ -1,13 +1,15 @@
class nova::scheduler(
$enabled = false
$enabled = false,
$ensure_package = 'present'
) {
include nova::params
nova::generic_service { 'scheduler':
enabled => $enabled,
package_name => $::nova::params::scheduler_package_name,
service_name => $::nova::params::scheduler_service_name,
enabled => $enabled,
package_name => $::nova::params::scheduler_package_name,
service_name => $::nova::params::scheduler_service_name,
ensure_package => $ensure_package,
}
}

9
manifests/vncproxy.pp
View File

@ -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']
}
}

10
manifests/volume.pp
View File

@ -1,5 +1,6 @@
class nova::volume(
$enabled=false
$enabled = false,
$ensure_package = 'present'
) {
include 'nova::params'
@ -12,9 +13,10 @@ class nova::volume(
}
nova::generic_service { 'volume':
enabled => $enabled,
package_name => $::nova::params::volume_package_name,
service_name => $::nova::params::volume_service_name,
enabled => $enabled,
package_name => $::nova::params::volume_package_name,
service_name => $::nova::params::volume_service_name,
ensure_package => $ensure_package,
}
package { 'tgt':

8
spec/classes/nova_cert_spec.rb
View File

@ -30,6 +30,14 @@ describe 'nova::cert' do
'enable' => true
)}
end
describe 'with package version' do
let :params do
{:ensure_package => '2012.1-2'}
end
it { should contain_package('nova-cert').with(
'ensure' => '2012.1-2'
)}
end
end
describe 'on rhel' do
let :facts do

7
spec/classes/nova_client_spec.rb
View File

@ -2,4 +2,11 @@ require 'spec_helper'
describe 'nova::client' do
it { should contain_package('python-novaclient').with_ensure('present') }
describe "with specified version" do
let :params do
{:ensure => '2012.1-2'}
end
it { should contain_package('python-novaclient').with_ensure('2012.1-2') }
end
end

8
spec/classes/nova_compute_spec.rb
View File

@ -64,6 +64,14 @@ describe 'nova::compute' do
it { should_not contain_nova_config('novncproxy_base_url') }
end
describe 'with package version' do
let :params do
{:ensure_package => '2012.1-2'}
end
it { should contain_package('nova-compute').with(
'ensure' => '2012.1-2'
)}
end
end
describe 'on rhel' do
let :facts do

25
spec/classes/nova_consoleauth_spec.rb Normal file
View File

@ -0,0 +1,25 @@
require 'spec_helper'
describe 'nova::consoleauth' do
let :pre_condition do
'include nova'
end
describe 'on debian platforms' do
let :facts do
{ :osfamily => 'Debian' }
end
describe 'with package version' do
let :params do
{:ensure_package => '2012.1-2'}
end
it { should contain_package('nova-consoleauth').with(
'ensure' => '2012.1-2'
)}
end
end
end

8
spec/classes/nova_network_spec.rb
View File

@ -182,6 +182,14 @@ describe 'nova::network' do
end
end
end
describe 'with package version' do
let :params do
{:ensure_package => '2012.1-2'}
end
it { should contain_package('nova-network').with(
'ensure' => '2012.1-2'
)}
end
end
describe 'on rhel' do
let :facts do

8
spec/classes/nova_objectstore_spec.rb
View File

@ -30,6 +30,14 @@ describe 'nova::objectstore' do
'enable' => true
)}
end
describe 'with package version' do
let :params do
{:ensure_package => '2012.1-2'}
end
it { should contain_package('nova-objectstore').with(
'ensure' => '2012.1-2'
)}
end
end
describe 'on rhel' do
let :facts do

8
spec/classes/nova_scheduler_spec.rb
View File

@ -30,6 +30,14 @@ describe 'nova::scheduler' do
'enable' => true
)}
end
describe 'with package version' do
let :params do
{:ensure_package => '2012.1-2'}
end
it { should contain_package('nova-scheduler').with(
'ensure' => '2012.1-2'
)}
end
end
describe 'on rhel' do
let :facts do

11
spec/classes/nova_vnc_proxy_spec.rb
View File

@ -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

8
spec/classes/nova_volume_spec.rb
View File

@ -53,6 +53,14 @@ describe 'nova::volume' do
)}
end
end
describe 'with package version' do
let :params do
{:ensure_package => '2012.1-2'}
end
it { should contain_package('nova-volume').with(
'ensure' => '2012.1-2'
)}
end
end
describe 'on rhel' do
let :facts do