x/packstack
Code Issues Proposed changes

Merge "Do not create OVS bridges in compute nodes"

Browse Source
This commit is contained in:
Jenkins
2015-11-10 21:57:57 +00:00
committed by Gerrit Code Review
parent bd98b0702e 51fb0c5200
commit 8474868098
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packstack/plugins/neutron_350.py
View File

@@ -784,6 +784,10 @@ def create_l2_agent_manifests(config, messages):
for host in network_hosts | compute_hosts: for host in network_hosts | compute_hosts:
manifestfile = "%s_neutron.pp" % (host,) manifestfile = "%s_neutron.pp" % (host,)
manifestdata = "$cfg_neutron_ovs_host = '%s'\n" % host manifestdata = "$cfg_neutron_ovs_host = '%s'\n" % host
if host in network_hosts:
manifestdata += "$create_bridges = true\n"
else:
manifestdata += "$create_bridges = false\n"
# neutron ovs port only on network hosts # neutron ovs port only on network hosts
if ( if (
agent == "openvswitch" and ( agent == "openvswitch" and (

12
packstack/puppet/templates/neutron_ovs_agent.pp
View File

@@ -13,9 +13,17 @@ if $ovs_agent_vxlan_cfg_neut_ovs_tun_if != '' {
$localip = $cfg_neutron_ovs_host $localip = $cfg_neutron_ovs_host
} }
if $create_bridges {
$bridge_uplinks = hiera_array('CONFIG_NEUTRON_OVS_BRIDGE_IFACES')
$bridge_mappings = hiera_array('CONFIG_NEUTRON_OVS_BRIDGE_MAPPINGS')
} else {
$bridge_uplinks = []
$bridge_mappings = []
}
class { '::neutron::agents::ml2::ovs': class { '::neutron::agents::ml2::ovs':
bridge_uplinks => hiera_array('CONFIG_NEUTRON_OVS_BRIDGE_IFACES'), bridge_uplinks => $bridge_uplinks,
bridge_mappings => hiera_array('CONFIG_NEUTRON_OVS_BRIDGE_MAPPINGS'), bridge_mappings => $bridge_mappings,
enable_tunneling => hiera('CONFIG_NEUTRON_OVS_TUNNELING'), enable_tunneling => hiera('CONFIG_NEUTRON_OVS_TUNNELING'),
tunnel_types => hiera_array('CONFIG_NEUTRON_OVS_TUNNEL_TYPES'), tunnel_types => hiera_array('CONFIG_NEUTRON_OVS_TUNNEL_TYPES'),
local_ip => force_ip($localip), local_ip => force_ip($localip),