x
/
packstack
Code Issues Proposed changes

Merge "Add vxlan to linuxbridge agent when enabled"

This commit is contained in:
Jenkins 2016-09-21 20:30:30 +00:00 committed by Gerrit Code Review
parent 79f01347e5 1ca1b0268e
commit b11f8ba230
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packstack/plugins/neutron_350.py
View File

@ -715,6 +715,8 @@ def create_l3_manifests(config, messages):
config['CONFIG_NEUTRON_OVS_BRIDGE_CREATE'] = 'y'
else:
config['CONFIG_NEUTRON_OVS_BRIDGE_CREATE'] = 'n'
else:
config['CONFIG_NEUTRON_OVS_BRIDGE_CREATE'] = 'n'
def create_dhcp_manifests(config, messages):

20
packstack/puppet/modules/packstack/manifests/neutron/lb_agent.pp
View File

@ -1,5 +1,12 @@
class packstack::neutron::lb_agent ()
{
$bind_host = hiera('CONFIG_IP_VERSION') ? {
'ipv6' => '::0',
default => '0.0.0.0',
# TO-DO(mmagr): Add IPv6 support when hostnames are used
}
$neutron_lb_interface_mappings = hiera_array('CONFIG_NEUTRON_LB_INTERFACE_MAPPINGS')
$use_subnets_value = hiera('CONFIG_USE_SUBNETS')
@ -8,7 +15,16 @@ class packstack::neutron::lb_agent ()
default => false,
}
class { '::neutron::agents::ml2::linuxbridge':
physical_interface_mappings => force_interface($neutron_lb_interface_mappings, $use_subnets),
if ( 'vxlan' in hiera_array('CONFIG_NEUTRON_ML2_TYPE_DRIVERS') ){
class { '::neutron::agents::ml2::linuxbridge':
physical_interface_mappings => force_interface($neutron_lb_interface_mappings, $use_subnets),
tunnel_types => ['vxlan'],
local_ip => $bind_host,
}
}
else {
class { '::neutron::agents::ml2::linuxbridge':
physical_interface_mappings => force_interface($neutron_lb_interface_mappings, $use_subnets),
}
}
}

2
packstack/puppet/templates/compute.pp
View File

@ -45,7 +45,7 @@ if hiera('CONFIG_NEUTRON_INSTALL') == 'y' {
include '::packstack::neutron::rabbitmq'
case hiera('CONFIG_NEUTRON_L2_AGENT') {
'openvswitch': { include '::packstack::neutron::ovs_agent' }
'': { include '::packstack::neutron::lb_agent' }
'linuxbridge': { include '::packstack::neutron::lb_agent' }
default: { include '::packstack::neutron::ovs_agent' }
}
include '::packstack::neutron::bridge'

2
packstack/puppet/templates/network.pp
View File

@ -30,7 +30,7 @@ if hiera('CONFIG_NEUTRON_INSTALL') == 'y' {
case hiera('CONFIG_NEUTRON_L2_AGENT') {
'openvswitch': { include '::packstack::neutron::ovs_agent' }
'': { include '::packstack::neutron::lb_agent' }
'linuxbridge': { include '::packstack::neutron::lb_agent' }
default: { include '::packstack::neutron::ovs_agent' }
}
include '::packstack::neutron::bridge'