stackforge/puppet-openstack-cloud
Code Issues Proposed changes

compute/hypervisor: configure neutron with ml2 on computes

Browse Source 
Ensure Compute nodes have good common configuration to support ML2
plugin.

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-02-18 16:40:56 +01:00
parent da044322c4
commit 79cb2a3275
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/compute/hypervisor.pp
View File

@ -42,6 +42,7 @@ class cloud::compute::hypervisor(
include 'cloud::compute'
include 'cloud::telemetry'
include 'cloud::network'
exec { 'insert_module_nbd':
command => '/bin/echo "nbd" > /etc/modules',

46
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@ -52,7 +52,18 @@ describe 'cloud::compute::hypervisor' do
log_facility => 'LOG_LOCAL0',
use_syslog => true,
verbose => true,
debug => true }"
debug => true }
class { 'cloud::network':
rabbit_hosts => ['10.0.0.1'],
rabbit_password => 'secrete',
tunnel_eth => '10.0.1.1',
api_eth => '10.0.0.1',
provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true,
debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end
let :params do
@ -114,6 +125,39 @@ describe 'cloud::compute::hypervisor' do
)
end
it 'configure neutron common' do
should contain_class('neutron').with(
:allow_overlapping_ips => true,
:dhcp_agents_per_network => '2',
:verbose => true,
:debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',
:rabbit_virtual_host => '/',
:bind_host => '10.0.0.1',
:core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin',
:service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin']
)
should contain_class('neutron::agents::ovs').with(
:enable_tunneling => true,
:tunnel_types => ['gre'],
:bridge_mappings => ['physnet1:br-eth1'],
:local_ip => '10.0.1.1'
)
should contain_class('neutron::plugins::ml2').with(
:type_drivers => ['gre','vlan'],
:tenant_network_types => ['gre'],
:mechanism_drivers => ['openvswitch','l2population'],
:tunnel_id_ranges => ['1:10000'],
:network_vlan_ranges => ['physnet1:1000:2999'],
:enable_security_group => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
)
end
it 'configure neutron on compute node' do
should contain_class('nova::network::neutron').with(
:neutron_admin_password => 'secrete',