openstack/octavia
Code Issues Proposed changes

Merge "Remove lb_network_name from config (it was bogus)"

Browse Source
This commit is contained in:
Jenkins
2017-06-01 18:14:19 +00:00
committed by Gerrit Code Review
parent b16fa163a0 da81984492
commit 3c1b9ae360
3 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/octavia.conf
View File

@@ -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.

1
octavia/common/config.py
View File

@@ -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.')),

1
octavia/tests/unit/compute/drivers/test_nova_driver.py
View File

@@ -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