openstack/openstack-helm
Code Issues Proposed changes

title: Update oslo_messaging_RPCClient and get_rpc_transport in neutron

Browse Source 
oslo_messaging.RPCClient and get_transport is deprecated in antelop version (2023.1).This change moves the health prove to use get_rpc_client and get_rpc_transport instead.

story: 2010792
task: 48229
Change-Id: I870619626e1bfe6f40f293c01835dac6157947d7
This commit is contained in:
moontaek-rho 2023-06-14 13:49:40 +09:00
parent 962447dd5b
commit faf0998be7
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/Chart.yaml
View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Neutron description: OpenStack-Helm Neutron
name: neutron name: neutron
version: 0.3.11 version: 0.3.12
home: https://docs.openstack.org/neutron/latest/ home: https://docs.openstack.org/neutron/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
sources: sources:

13
neutron/templates/bin/_health-probe.py.tpl
View File

@ -68,9 +68,14 @@ def check_agent_status(transport):
target = oslo_messaging.Target( target = oslo_messaging.Target(
topic=cfg.CONF.agent_queue_name, topic=cfg.CONF.agent_queue_name,
server=_get_hostname(use_fqdn)) server=_get_hostname(use_fqdn))
client = oslo_messaging.RPCClient(transport, target, if hasattr(oslo_messaging, 'get_rpc_client'):
timeout=rpc_timeout, client = oslo_messaging.get_rpc_client(transport, target,
retry=rpc_retries) timeout=rpc_timeout,
retry=rpc_retries)
else:
client = oslo_messaging.RPCClient(transport, target,
timeout=rpc_timeout,
retry=rpc_retries)
client.call(context.RequestContext(), client.call(context.RequestContext(),
'pod_health_probe_method_ignore_errors') 'pod_health_probe_method_ignore_errors')
except oslo_messaging.exceptions.MessageDeliveryFailure: except oslo_messaging.exceptions.MessageDeliveryFailure:
@ -271,7 +276,7 @@ def test_rpc_liveness():
cfg.CONF(sys.argv[1:]) cfg.CONF(sys.argv[1:])
try: try:
transport = oslo_messaging.get_transport(cfg.CONF) transport = oslo_messaging.get_rpc_transport(cfg.CONF)
except Exception as ex: except Exception as ex:
message = getattr(ex, "message", str(ex)) message = getattr(ex, "message", str(ex))
sys.stderr.write("Message bus driver load error: %s" % message) sys.stderr.write("Message bus driver load error: %s" % message)

1
releasenotes/notes/neutron.yaml
View File

@ -53,4 +53,5 @@ neutron:
- 0.3.9 Extend neutron liveness probe with readiness probe - 0.3.9 Extend neutron liveness probe with readiness probe
- 0.3.10 Configure keystone authentication credentials for placement - 0.3.10 Configure keystone authentication credentials for placement
- 0.3.11 Add Zed overrides - 0.3.11 Add Zed overrides
- 0.3.12 Update oslo_messaging_RPCClient and get_rpc_transport
... ...