openstack/puppet-nova
Code Issues Proposed changes

Added parameter libvirt_type to nova class

Browse Source 
need to set it to qemu for vagrant testing
This commit is contained in:
Dan Bode 2011-06-18 16:50:12 -07:00
parent eb468b2569
commit a0e403682a
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/all.pp
View File

@ -12,6 +12,8 @@ class nova::all(
$rabbit_virtual_host = undef, $rabbit_virtual_host = undef,
$rabbit_host = undef, $rabbit_host = undef,
$libvirt_type = 'qemu',
$flat_network_bridge = 'br100', $flat_network_bridge = 'br100',
$flat_network_bridge_ip = '11.0.0.1', $flat_network_bridge_ip = '11.0.0.1',
$flat_network_bridge_netmask = '255.255.255.0', $flat_network_bridge_netmask = '255.255.255.0',
@ -59,8 +61,9 @@ class nova::all(
class { "nova::api": enabled => true } class { "nova::api": enabled => true }
class { "nova::compute": class { "nova::compute":
api_server => $ipaddress, api_server => $ipaddress,
enabled => true, libvirt_type => $libvirt_type,
enabled => true,
} }
class { "nova::network::flat": class { "nova::network::flat":

3
manifests/compute.pp
View File

@ -5,10 +5,13 @@ class nova::compute(
$enabled = false, $enabled = false,
$api_port = 8773, $api_port = 8773,
$aws_address = '169.254.169.254' $aws_address = '169.254.169.254'
$libvirt_type = 'kvm',
) { ) {
Nova_config<| |>~>Service['nova-compute'] Nova_config<| |>~>Service['nova-compute']
nova_config { 'libvirt_type': value => $libvirt_type }
if $enabled { if $enabled {
$service_ensure = 'running' $service_ensure = 'running'
} else { } else {

1
tests/all.pp
View File

@ -31,4 +31,5 @@ class { 'nova::all':
glance_host => 'localhost', glance_host => 'localhost',
glance_port => '9292', glance_port => '9292',
libvirt_type => 'qemu',
} }