x/packstack
Code Issues Proposed changes

Don't ask L2 plugin question if Quantum is not isntalled.

Browse Source 
Change-Id: If4295545538be807524b37f768259d52ff62ac36
Fixes: rhbz#967307
This commit is contained in:
Martin Magr
2013-05-27 15:00:06 +02:00
parent 77b481a44c
commit 5dd2bc65e6
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packstack/plugins/quantum_350.py
View File

@@ -226,6 +226,14 @@ def initConfig(controllerObject):
], ],
} }
def use_linuxbridge(config):
return config['CONFIG_QUANTUM_INSTALL'] == 'y' and \
config['CONFIG_QUANTUM_L2_PLUGIN'] == 'linuxbridge'
def use_openvswitch(config):
return config['CONFIG_QUANTUM_INSTALL'] == 'y' and \
config['CONFIG_QUANTUM_L2_PLUGIN'] == 'openvswitch'
conf_groups = [ conf_groups = [
{ "GROUP_NAME" : "QUANTUM", { "GROUP_NAME" : "QUANTUM",
"DESCRIPTION" : "Quantum config", "DESCRIPTION" : "Quantum config",
@@ -235,14 +243,14 @@ def initConfig(controllerObject):
"POST_CONDITION_MATCH" : True }, "POST_CONDITION_MATCH" : True },
{ "GROUP_NAME" : "QUANTUM_LB_PLUGIN", { "GROUP_NAME" : "QUANTUM_LB_PLUGIN",
"DESCRIPTION" : "Quantum LB plugin config", "DESCRIPTION" : "Quantum LB plugin config",
"PRE_CONDITION" : "CONFIG_QUANTUM_L2_PLUGIN", "PRE_CONDITION" : use_linuxbridge,
"PRE_CONDITION_MATCH" : "linuxbridge", "PRE_CONDITION_MATCH" : True,
"POST_CONDITION" : False, "POST_CONDITION" : False,
"POST_CONDITION_MATCH" : True }, "POST_CONDITION_MATCH" : True },
{ "GROUP_NAME" : "QUANTUM_OVS_PLUGIN", { "GROUP_NAME" : "QUANTUM_OVS_PLUGIN",
"DESCRIPTION" : "Quantum OVS plugin config", "DESCRIPTION" : "Quantum OVS plugin config",
"PRE_CONDITION" : "CONFIG_QUANTUM_L2_PLUGIN", "PRE_CONDITION" : use_openvswitch,
"PRE_CONDITION_MATCH" : "openvswitch", "PRE_CONDITION_MATCH" : True,
"POST_CONDITION" : False, "POST_CONDITION" : False,
"POST_CONDITION_MATCH" : True }, "POST_CONDITION_MATCH" : True },
] ]