x/packstack
Code Issues Proposed changes

Don't use ML2 parameters for other plugins

Browse Source 
CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS parameter must not be used
when monolithic Neutron plugins are being installed. This patch
is fixing installation failures for OVS and LB plugins.

Fixed Gerrit default branch for icehouse branch

Change-Id: Id6e7cdf2ab46a024fb78f74c77cff8f847ada038
Fixes: rhbz#1119473
(cherry picked from commit ec5cf0ef5c)
This commit is contained in:
Martin Magr
2014-07-15 17:03:58 +02:00
parent aca78e8ddd
commit 2497373cc7
6 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitreview
View File

@@ -2,3 +2,4 @@
host=review.openstack.org
port=29418
project=stackforge/packstack.git
defaultbranch=icehouse

9
packstack/plugins/neutron_350.py
View File

@@ -881,6 +881,15 @@ def create_l2_agent_manifests(config, messages):
plugin = config['CONFIG_NEUTRON_L2_PLUGIN']
agent = config["CONFIG_NEUTRON_L2_AGENT"]
# CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS will be available only for ML2
# plugin deployment, but we need CONFIG_NEUTRON_USE_L2POPULATION also
# for other plugin template generation
if ('l2population' in
config.get('CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS', [])):
config['CONFIG_NEUTRON_USE_L2POPULATION'] = 'true'
else:
config['CONFIG_NEUTRON_USE_L2POPULATION'] = 'false'
if agent == "openvswitch":
host_var = 'CONFIG_NEUTRON_OVS_HOST'
if plugin == agent:

7
packstack/puppet/templates/neutron_ovs_agent_gre.pp
View File

@@ -6,17 +6,12 @@ if "%(CONFIG_NEUTRON_OVS_TUNNEL_IF)s" {
}
if '%(CONFIG_NEUTRON_L2_PLUGIN)s' == 'ml2' {
if ('l2population' in %(CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS)s) {
$l2population = true
} else {
$l2population = false
}
class { 'neutron::agents::ml2::ovs':
bridge_mappings => %(CONFIG_NEUTRON_OVS_BRIDGE_MAPPINGS)s,
enable_tunneling => true,
tunnel_types => ['gre'],
local_ip => $localip,
l2_population => $l2population,
l2_population => %(CONFIG_NEUTRON_USE_L2POPULATION)s,
}
} else {
class { 'neutron::agents::ovs':

7
packstack/puppet/templates/neutron_ovs_agent_local.pp
View File

@@ -1,13 +1,8 @@
if '%(CONFIG_NEUTRON_L2_PLUGIN)s' == 'ml2' {
if ('l2population' in %(CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS)s) {
$l2population = true
} else {
$l2population = false
}
class { 'neutron::agents::ml2::ovs':
bridge_mappings => %(CONFIG_NEUTRON_OVS_BRIDGE_MAPPINGS)s,
l2_population => $l2population,
l2_population => %(CONFIG_NEUTRON_USE_L2POPULATION)s,
}
} else {
class { 'neutron::agents::ovs':

7
packstack/puppet/templates/neutron_ovs_agent_vlan.pp
View File

@@ -1,13 +1,8 @@
if '%(CONFIG_NEUTRON_L2_PLUGIN)s' == 'ml2' {
if ('l2population' in %(CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS)s) {
$l2population = true
} else {
$l2population = false
}
class { 'neutron::agents::ml2::ovs':
bridge_mappings => %(CONFIG_NEUTRON_OVS_BRIDGE_MAPPINGS)s,
l2_population => $l2population,
l2_population => %(CONFIG_NEUTRON_USE_L2POPULATION)s,
}
} else {
class { 'neutron::agents::ovs':

7
packstack/puppet/templates/neutron_ovs_agent_vxlan.pp
View File

@@ -7,18 +7,13 @@ if "%(CONFIG_NEUTRON_OVS_TUNNEL_IF)s" {
}
if '%(CONFIG_NEUTRON_L2_PLUGIN)s' == 'ml2' {
if ('l2population' in %(CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS)s) {
$l2population = true
} else {
$l2population = false
}
class { 'neutron::agents::ml2::ovs':
bridge_mappings => %(CONFIG_NEUTRON_OVS_BRIDGE_MAPPINGS)s,
enable_tunneling => true,
tunnel_types => ['vxlan'],
local_ip => $localip,
vxlan_udp_port => %(CONFIG_NEUTRON_OVS_VXLAN_UDP_PORT)s,
l2_population => $l2population,
l2_population => %(CONFIG_NEUTRON_USE_L2POPULATION)s,
}
} else {
class { 'neutron::agents::ovs':