x/packstack
Code Issues Proposed changes

Removing CONFIG_QUANTUM_USE_NAMESPACES option

Browse Source 
Avoiding non-netns deployments, the value of use_namespaces
options is True by default.

Change-Id: Iea777787e7d024bcfed9e1f4dfc8831f6e7deed3
This commit is contained in:
Rami Vaknin 2013-08-06 17:23:54 +03:00
parent dbb86c4a6e
commit 0718925e13
4 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packstack/plugins/provision_700.py
View File

@ -86,8 +86,7 @@ def initConfig(controllerObject):
# resources are implemented) and quantum with namespaces (due # resources are implemented) and quantum with namespaces (due
# to the provisioning manifest assuming this configuration). # to the provisioning manifest assuming this configuration).
return is_all_in_one(config) and \ return is_all_in_one(config) and \
config['CONFIG_QUANTUM_INSTALL'] == 'y' and \ config['CONFIG_QUANTUM_INSTALL'] == 'y'
config['CONFIG_QUANTUM_USE_NAMESPACES'] == 'y'
def allow_all_in_one_ovs_bridge(config): def allow_all_in_one_ovs_bridge(config):
return allow_provisioning(config) and \ return allow_provisioning(config) and \

16
packstack/plugins/quantum_350.py
View File

@ -40,18 +40,6 @@ def initConfig(controllerObject):
"USE_DEFAULT" : False, "USE_DEFAULT" : False,
"NEED_CONFIRM" : False, "NEED_CONFIRM" : False,
"CONDITION" : False }, "CONDITION" : False },
{"CMD_OPTION" : "quantum-use-namespaces",
"USAGE" : "Enable network namespaces for Quantum",
"PROMPT" : "Should Quantum use network namespaces?",
"OPTION_LIST" : ["y", "n"],
"VALIDATORS" : [validators.validate_options],
"DEFAULT_VALUE" : "y",
"MASK_INPUT" : False,
"LOOSE_VALIDATION": True,
"CONF_NAME" : "CONFIG_QUANTUM_USE_NAMESPACES",
"USE_DEFAULT" : False,
"NEED_CONFIRM" : False,
"CONDITION" : False },
{"CMD_OPTION" : "quantum-ks-password", {"CMD_OPTION" : "quantum-ks-password",
"USAGE" : "The password to use for Quantum to authenticate with Keystone", "USAGE" : "The password to use for Quantum to authenticate with Keystone",
"PROMPT" : "Enter the password for Quantum Keystone access", "PROMPT" : "Enter the password for Quantum Keystone access",
@ -283,10 +271,6 @@ def getInterfaceDriver():
def initSequences(controller): def initSequences(controller):
if controller.CONF['CONFIG_QUANTUM_INSTALL'] != 'y': if controller.CONF['CONFIG_QUANTUM_INSTALL'] != 'y':
return return
if controller.CONF['CONFIG_QUANTUM_USE_NAMESPACES'] == 'y':
controller.CONF['CONFIG_QUANTUM_USE_NAMESPACES'] = 'True'
else:
controller.CONF['CONFIG_QUANTUM_USE_NAMESPACES'] = 'False'
if controller.CONF["CONFIG_QUANTUM_L2_PLUGIN"] == "openvswitch": if controller.CONF["CONFIG_QUANTUM_L2_PLUGIN"] == "openvswitch":
controller.CONF['CONFIG_QUANTUM_L2_DBNAME'] = 'ovs_quantum' controller.CONF['CONFIG_QUANTUM_L2_DBNAME'] = 'ovs_quantum'

1
packstack/puppet/templates/quantum_dhcp.pp
View File

@ -1,4 +1,3 @@
class { 'quantum::agents::dhcp': class { 'quantum::agents::dhcp':
use_namespaces => '%(CONFIG_QUANTUM_USE_NAMESPACES)s',
interface_driver => '%(CONFIG_QUANTUM_DHCP_INTERFACE_DRIVER)s', interface_driver => '%(CONFIG_QUANTUM_DHCP_INTERFACE_DRIVER)s',
} }

1
packstack/puppet/templates/quantum_l3.pp
View File

@ -1,5 +1,4 @@
class { 'quantum::agents::l3': class { 'quantum::agents::l3':
use_namespaces => '%(CONFIG_QUANTUM_USE_NAMESPACES)s',
interface_driver => '%(CONFIG_QUANTUM_L3_INTERFACE_DRIVER)s', interface_driver => '%(CONFIG_QUANTUM_L3_INTERFACE_DRIVER)s',
external_network_bridge => '%(CONFIG_QUANTUM_L3_EXT_BRIDGE)s', external_network_bridge => '%(CONFIG_QUANTUM_L3_EXT_BRIDGE)s',
} }