openstack/octavia
Code Issues Proposed changes

Remove deprecated [haproxy_amphora] use_upstart

Browse Source 
The option was deprecated in Train release[1] and has been unused by
amphora agent since then.

[1] c4408c4c78

Change-Id: I1dfbe2d1db21959b007818c6dee7458d117968b9
This commit is contained in:
Takashi Kajinami
2024-05-05 16:00:13 +09:00
parent fc7c61993e
commit 85c12eb7eb
5 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
octavia/amphorae/backends/agent/agent_jinja_cfg.py
View File

@@ -52,7 +52,6 @@ class AgentJinjaTemplater:
'haproxy_cmd': CONF.haproxy_amphora.haproxy_cmd,
'heartbeat_interval': CONF.health_manager.heartbeat_interval,
'heartbeat_key': CONF.health_manager.heartbeat_key,
'use_upstart': CONF.haproxy_amphora.use_upstart,
'respawn_count': CONF.haproxy_amphora.respawn_count,
'respawn_interval': CONF.haproxy_amphora.respawn_interval,
'amphora_udp_driver': CONF.amphora_agent.amphora_udp_driver,

1
octavia/amphorae/backends/agent/templates/amphora_agent_conf.template
View File

@@ -25,7 +25,6 @@ bind_port = {{ bind_port }}
haproxy_cmd = {{ haproxy_cmd }}
respawn_count = {{ respawn_count }}
respawn_interval = {{ respawn_interval }}
use_upstart = {{ use_upstart }}
user_log_facility = {{ user_log_facility }}
administrative_log_facility = {{ administrative_log_facility }}

5
octavia/common/config.py
View File

@@ -407,11 +407,6 @@ haproxy_amphora_opts = [
help=_("The client certificate to talk to the agent")),
cfg.StrOpt('server_ca', default='/etc/octavia/certs/server_ca.pem',
help=_("The ca which signed the server certificates")),
cfg.BoolOpt('use_upstart', default=True,
deprecated_for_removal=True,
deprecated_reason='This is now automatically discovered '
' and configured.',
help=_("If False, use sysvinit.")),
cfg.IntOpt('api_db_commit_retry_attempts', default=15,
help=_('The number of times the database action will be '
'attempted.')),

5
octavia/tests/unit/amphorae/backends/agent/test_agent_jinja_cfg.py
View File

@@ -39,7 +39,6 @@ class AgentJinjaTestCase(base.TestCase):
amphora_udp_driver='keepalived_lvs'),
self.conf.config(group="haproxy_amphora",
base_cert_dir='/var/lib/octavia/certs')
self.conf.config(group="haproxy_amphora", use_upstart='True')
self.conf.config(group="haproxy_amphora", base_path='/var/lib/octavia')
self.conf.config(group="haproxy_amphora", bind_host='0.0.0.0')
self.conf.config(group="haproxy_amphora", bind_port=9443)
@@ -70,7 +69,6 @@ class AgentJinjaTestCase(base.TestCase):
'haproxy_cmd = /usr/sbin/haproxy\n'
'respawn_count = 2\n'
'respawn_interval = 2\n'
'use_upstart = True\n'
'user_log_facility = 0\n'
'administrative_log_facility = 1\n\n'
'[health_manager]\n'
@@ -96,7 +94,6 @@ class AgentJinjaTestCase(base.TestCase):
def test_build_agent_config_with_interfaces_file(self):
ajc = agent_jinja_cfg.AgentJinjaTemplater()
self.conf.config(group="haproxy_amphora", use_upstart='False')
self.conf.config(group="amphora_agent",
administrative_log_facility=1)
self.conf.config(group="amphora_agent", user_log_facility=0)
@@ -112,7 +109,6 @@ class AgentJinjaTestCase(base.TestCase):
'haproxy_cmd = /usr/sbin/haproxy\n'
'respawn_count = 2\n'
'respawn_interval = 2\n'
'use_upstart = False\n'
'user_log_facility = 0\n'
'administrative_log_facility = 1\n\n'
'[health_manager]\n'
@@ -156,7 +152,6 @@ class AgentJinjaTestCase(base.TestCase):
'haproxy_cmd = /usr/sbin/haproxy\n'
'respawn_count = 2\n'
'respawn_interval = 2\n'
'use_upstart = True\n'
'user_log_facility = 0\n'
'administrative_log_facility = 1\n\n'
'[health_manager]\n'

4
releasenotes/notes/remove-use_upstart-448eaf86a7a46c54.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
upgrade:
- |
The deprecated ``[haproxy_amphora] use_upstart`` option has been removed.