From da81984492464f38857992ddecc82b4160dee1a1 Mon Sep 17 00:00:00 2001 From: Adam Harwell Date: Tue, 16 May 2017 14:49:29 -0700 Subject: [PATCH] Remove lb_network_name from config (it was bogus) This option was NEVER read, so there is no point in continuing to allow it to be configured (it is pointless). Change-Id: I147abdd8d3d95164168ec606f5b92401cb24d1fe Closes-Bug: #1691286 --- etc/octavia.conf | 2 -- octavia/common/config.py | 1 - octavia/tests/unit/compute/drivers/test_nova_driver.py | 1 - 3 files changed, 4 deletions(-) diff --git a/etc/octavia.conf b/etc/octavia.conf index a66822a4c1..ad324fa3ae 100644 --- a/etc/octavia.conf +++ b/etc/octavia.conf @@ -106,8 +106,6 @@ # password = [networking] -# Network to communicate with amphora -# lb_network_name = # The maximum attempts to retry an action with the networking service. # max_retries = 15 # Seconds to wait before retrying an action with the networking service. diff --git a/octavia/common/config.py b/octavia/common/config.py index 354bd97e3b..8ccbae9a25 100644 --- a/octavia/common/config.py +++ b/octavia/common/config.py @@ -83,7 +83,6 @@ amphora_agent_opts = [ ] networking_opts = [ - cfg.StrOpt('lb_network_name', help=_('Name of amphora internal network')), cfg.IntOpt('max_retries', default=15, help=_('The maximum attempts to retry an action with the ' 'networking service.')), diff --git a/octavia/tests/unit/compute/drivers/test_nova_driver.py b/octavia/tests/unit/compute/drivers/test_nova_driver.py index 0d57273502..c74ab952a9 100644 --- a/octavia/tests/unit/compute/drivers/test_nova_driver.py +++ b/octavia/tests/unit/compute/drivers/test_nova_driver.py @@ -93,7 +93,6 @@ class TestNovaClient(base.TestCase): conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) self.conf = conf self.net_name = "lb-mgmt-net" - conf.config(group="networking", lb_network_name=self.net_name) conf.config(group="controller_worker", amp_boot_network_list=['1', '2']) self.conf = conf