stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Reintroduce support for provider networks"

Browse Source
This commit is contained in:
Jenkins
2013-07-26 05:00:56 +00:00
committed by Gerrit Code Review
parent f10de77dff 6ab5fed9bb
commit 0f67b9e7d2
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/compute.pp
View File

@@ -56,6 +56,8 @@ class openstack::compute (
$quantum_host = '127.0.0.1',
$ovs_local_ip = false,
$quantum_firewall_driver = false,
$bridge_mappings = undef,
$bridge_uplinks = undef,
# Nova
$nova_admin_tenant_name = 'services',
$nova_admin_user = 'nova',
@@ -222,6 +224,8 @@ class openstack::compute (
enabled => $enabled,
enable_server => false,
verbose => $verbose,
bridge_mappings => $bridge_mappings,
bridge_uplinks => $bridge_uplinks
}
class { 'nova::compute::quantum':

20
manifests/controller.pp
View File

@@ -223,9 +223,11 @@ class openstack::controller (
$tenant_network_type = 'gre',
$ovs_enable_tunneling = true,
$ovs_local_ip = false,
$network_vlan_ranges = 'physnet1:1000:2000',
$network_vlan_ranges = undef,
$bridge_interface = undef,
$external_bridge_name = 'br-ex',
$bridge_uplinks = undef,
$bridge_mappings = undef,
$enable_ovs_agent = true,
$enable_dhcp_agent = true,
$enable_l3_agent = true,
@@ -428,6 +430,18 @@ class openstack::controller (
fail('bridge_interface must be set when configuring quantum')
}
if ! $bridge_uplinks {
$bridge_uplinks_real = ["${external_bridge_name}:${bridge_interface}"]
} else {
$bridge_uplinks_real = $bridge_uplinks
}
if ! $bridge_mappings {
$bridge_mappings_real = ["${physical_network}:${external_bridge_name}"]
} else {
$bridge_mappings_real = $bridge_mappings
}
class { 'openstack::quantum':
# Database
db_host => $db_host,
@@ -443,8 +457,8 @@ class openstack::controller (
network_vlan_ranges => $network_vlan_ranges,
ovs_enable_tunneling => $ovs_enable_tunneling,
ovs_local_ip => $ovs_local_ip_real,
bridge_uplinks => ["${external_bridge_name}:${bridge_interface}"],
bridge_mappings => ["${physical_network}:${external_bridge_name}"],
bridge_uplinks => $bridge_uplinks_real,
bridge_mappings => $bridge_mappings_real,
enable_ovs_agent => $enable_ovs_agent,
firewall_driver => $firewall_driver,
# Database

2
manifests/quantum.pp
View File

@@ -164,7 +164,7 @@ class openstack::quantum (
$enable_ovs_agent = false,
# OVS settings
$tenant_network_type = 'gre',
$network_vlan_ranges = 'physnet1:1000:2000',
$network_vlan_ranges = undef,
$ovs_local_ip = false,
$ovs_enable_tunneling = true,
$bridge_uplinks = [],

5
spec/classes/openstack_controller_spec.rb
View File

@@ -31,6 +31,7 @@ describe 'openstack::controller' do
:nova_admin_tenant_name => 'services',
:nova_admin_user => 'nova',
:enabled_apis => 'ec2,osapi_compute,metadata',
:physical_network => 'default'
}
end
@@ -547,7 +548,8 @@ describe 'openstack::controller' do
:bridge_interface => 'eth_27',
:internal_address => '10.0.0.3',
:quantum_db_password => 'q_db_pass',
:metadata_shared_secret => 'secret'
:metadata_shared_secret => 'secret',
:external_bridge_name => 'br-ex'
})
end
@@ -564,7 +566,6 @@ describe 'openstack::controller' do
:rabbit_password => 'rabbit_pw',
:rabbit_virtual_host => '/',
:tenant_network_type => 'gre',
:network_vlan_ranges => 'physnet1:1000:2000',
:ovs_enable_tunneling => true,
:ovs_local_ip => '10.0.0.3',
:bridge_uplinks => ["br-ex:eth_27"],