From 0718925e13b3ed304288c764d951826e228c62c1 Mon Sep 17 00:00:00 2001 From: Rami Vaknin Date: Tue, 6 Aug 2013 17:23:54 +0300 Subject: [PATCH] Removing CONFIG_QUANTUM_USE_NAMESPACES option Avoiding non-netns deployments, the value of use_namespaces options is True by default. Change-Id: Iea777787e7d024bcfed9e1f4dfc8831f6e7deed3 --- packstack/plugins/provision_700.py | 3 +-- packstack/plugins/quantum_350.py | 16 ---------------- packstack/puppet/templates/quantum_dhcp.pp | 1 - packstack/puppet/templates/quantum_l3.pp | 1 - 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/packstack/plugins/provision_700.py b/packstack/plugins/provision_700.py index 15e641160..eec2208ff 100644 --- a/packstack/plugins/provision_700.py +++ b/packstack/plugins/provision_700.py @@ -86,8 +86,7 @@ def initConfig(controllerObject): # resources are implemented) and quantum with namespaces (due # to the provisioning manifest assuming this configuration). return is_all_in_one(config) and \ - config['CONFIG_QUANTUM_INSTALL'] == 'y' and \ - config['CONFIG_QUANTUM_USE_NAMESPACES'] == 'y' + config['CONFIG_QUANTUM_INSTALL'] == 'y' def allow_all_in_one_ovs_bridge(config): return allow_provisioning(config) and \ diff --git a/packstack/plugins/quantum_350.py b/packstack/plugins/quantum_350.py index 4075d642c..714298c71 100644 --- a/packstack/plugins/quantum_350.py +++ b/packstack/plugins/quantum_350.py @@ -40,18 +40,6 @@ def initConfig(controllerObject): "USE_DEFAULT" : False, "NEED_CONFIRM" : 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", "USAGE" : "The password to use for Quantum to authenticate with Keystone", "PROMPT" : "Enter the password for Quantum Keystone access", @@ -283,10 +271,6 @@ def getInterfaceDriver(): def initSequences(controller): if controller.CONF['CONFIG_QUANTUM_INSTALL'] != 'y': 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": controller.CONF['CONFIG_QUANTUM_L2_DBNAME'] = 'ovs_quantum' diff --git a/packstack/puppet/templates/quantum_dhcp.pp b/packstack/puppet/templates/quantum_dhcp.pp index fa0db1b59..9b83fb82f 100644 --- a/packstack/puppet/templates/quantum_dhcp.pp +++ b/packstack/puppet/templates/quantum_dhcp.pp @@ -1,4 +1,3 @@ class { 'quantum::agents::dhcp': - use_namespaces => '%(CONFIG_QUANTUM_USE_NAMESPACES)s', interface_driver => '%(CONFIG_QUANTUM_DHCP_INTERFACE_DRIVER)s', } diff --git a/packstack/puppet/templates/quantum_l3.pp b/packstack/puppet/templates/quantum_l3.pp index 905de070e..a7f94ff23 100644 --- a/packstack/puppet/templates/quantum_l3.pp +++ b/packstack/puppet/templates/quantum_l3.pp @@ -1,5 +1,4 @@ class { 'quantum::agents::l3': - use_namespaces => '%(CONFIG_QUANTUM_USE_NAMESPACES)s', interface_driver => '%(CONFIG_QUANTUM_L3_INTERFACE_DRIVER)s', external_network_bridge => '%(CONFIG_QUANTUM_L3_EXT_BRIDGE)s', }