openstack
/
puppet-nova
Code Issues Proposed changes

Merge pull request #68 from bodepd/fix_multi_host_issues 

Fix multi host issues
This commit is contained in:
Dan Bode 2012-04-15 10:48:25 -07:00
parent 02e9e67632 07992de6ca
commit 136ec11770
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/all.pp
View File

@ -179,9 +179,12 @@ class { 'nova::compute':
}
class { 'nova::compute::libvirt':
libvirt_type => 'qemu',
flat_network_bridge_ip => '192.168.188.1',
flat_network_bridge_netmask => '255.255.255.0',
libvirt_type => 'qemu',
}
nova::network::bridge { 'br100':
ip => '192.168.188.1',
netmask => '255.255.255.0',
}
######## Horizon ########

2
manifests/compute/multi_host.pp
View File

@ -2,8 +2,6 @@ class nova::compute::multi_host(
$enabled = false
) inherits nova::compute {
Class['nova::compute'] { enabled => $enabled }
nova_config { 'enabled_apis': value => 'metadata' }
class { 'nova::api': enabled => $enabled }

2
manifests/init.pp
View File

@ -14,7 +14,7 @@ class nova(
$rabbit_userid='guest',
$rabbit_virtual_host='/',
$network_manager = 'nova.network.manager.FlatManager',
multi_host_networking = false,
$multi_host_networking = false,
$flat_network_bridge = 'br100',
$vlan_interface = 'eth1',
$vlan_start = 1000,