stackforge/kickstack
Code Issues Proposed changes

Improve Quantum related parameters

Browse Source
This commit is contained in:
Florian Haas 2013-07-15 01:40:05 +00:00
parent 530d67961b
commit a30615cf81
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/init.pp
View File

@ -41,6 +41,7 @@ class kickstack (
$cinder_rbd_user = $kickstack::params::cinder_rbd_user, $cinder_rbd_user = $kickstack::params::cinder_rbd_user,
$quantum_network_type = $kickstack::params::quantum_network_type, $quantum_network_type = $kickstack::params::quantum_network_type,
$quantum_plugin = $kickstack::params::quantum_plugin, $quantum_plugin = $kickstack::params::quantum_plugin,
$quantum_physnet = $kickstack::params::quantum_physnet,
$quantum_tenant_network_type = $kickstack::params::quantum_tenant_network_type, $quantum_tenant_network_type = $kickstack::params::quantum_tenant_network_type,
$quantum_network_vlan_ranges = $kickstack::params::quantum_network_vlan_ranges, $quantum_network_vlan_ranges = $kickstack::params::quantum_network_vlan_ranges,
$quantum_tunnel_id_ranges = $kickstack::params::quantum_tunnel_id_ranges, $quantum_tunnel_id_ranges = $kickstack::params::quantum_tunnel_id_ranges,

11
manifests/params.pp
View File

@ -111,13 +111,18 @@ class kickstack::params {
$quantum_plugin = pick(getvar("::${variable_prefix}quantum_plugin"),"ovs") $quantum_plugin = pick(getvar("::${variable_prefix}quantum_plugin"),"ovs")
# The tenant network type to use with the Quantum ovs and linuxbridge plugins # The tenant network type to use with the Quantum ovs and linuxbridge plugins
# Supported: vlan (default), gre # Supported: flat (default), vlan, gre
$quantum_tenant_network_type = pick(getvar("::${variable_prefix}quantum_tenant_network_type"),"vlan") $quantum_tenant_network_type = pick(getvar("::${variable_prefix}quantum_tenant_network_type"),'vlan')
# The Quantum physical network name to define
$quantum_physnet = pick(getvar("::${variable_prefix}quantum_physnet"),'physnet1')
# The network VLAN ranges to use with the Quantum ovs and linuxbridge plugins # The network VLAN ranges to use with the Quantum ovs and linuxbridge plugins
$quantum_network_vlan_ranges = pick(getvar("::${variable_prefix}quantum_network_vlan_ranges"),"default:2000:3999") # (ignored unless quantum_tenant_network_type == 'vlan')
$quantum_network_vlan_ranges = pick(getvar("::${variable_prefix}quantum_network_vlan_ranges"),"2000:3999")
# The tunnel ID ranges to use with the Quantum ovs plugin, when in gre mode # The tunnel ID ranges to use with the Quantum ovs plugin, when in gre mode
# (ignored unless quantum_tenant_network_type == 'gre')
$quantum_tunnel_id_ranges = pick(getvar("::${variable_prefix}quantum_tunnel_id_ranges"),"1:1000") $quantum_tunnel_id_ranges = pick(getvar("::${variable_prefix}quantum_tunnel_id_ranges"),"1:1000")
# The interface over which to run your nodes' management network traffic. # The interface over which to run your nodes' management network traffic.

4
manifests/quantum/agent/l2.pp
View File

@ -16,9 +16,9 @@ class kickstack::quantum::agent::l2 inherits kickstack {
tunnel_bridge => 'br-tun', tunnel_bridge => 'br-tun',
} }
} }
'vlan': { default: {
class { 'quantum::agents::ovs': class { 'quantum::agents::ovs':
bridge_mappings => ["default:br-${nic_data}"], bridge_mappings => ["${::kickstack::quantum_physnet}:br-${nic_data}"],
bridge_uplinks => ["br-${nic_data}:${nic_data}"], bridge_uplinks => ["br-${nic_data}:${nic_data}"],
integration_bridge => 'br-int', integration_bridge => 'br-int',
enable_tunneling => false, enable_tunneling => false,

8
manifests/quantum/plugin.pp
View File

@ -5,12 +5,12 @@ class kickstack::quantum::plugin inherits kickstack {
$sql_conn = getvar("${fact_prefix}quantum_sql_connection") $sql_conn = getvar("${fact_prefix}quantum_sql_connection")
$tenant_network_type = "$::kickstack::quantum_tenant_network_type" $tenant_network_type = "$::kickstack::quantum_tenant_network_type"
$network_vlan_ranges = $tenant_network_type ? { $network_vlan_ranges = $tenant_network_type ? {
'vlan' => "$::kickstack::quantum_network_vlan_ranges", 'gre' => '',
'gre' => '' default => "${::kickstack::quantum_physnet}:${::kickstack::quantum_network_vlan_ranges}",
} }
$tunnel_id_ranges = $tenant_network_type ? { $tunnel_id_ranges = $tenant_network_type ? {
'vlan' => '', 'gre' => $::kickstack::quantum_tunnel_id_ranges,
'gre' => "$::kickstack::quantum_tunnel_id_ranges" default => '',
} }
case "$::kickstack::quantum_plugin" { case "$::kickstack::quantum_plugin" {