diff --git a/etc/octavia.conf b/etc/octavia.conf index e05415f323..f2daf1801a 100644 --- a/etc/octavia.conf +++ b/etc/octavia.conf @@ -114,8 +114,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