Merge "title: Update oslo_messaging_RPCClient and get_rpc_transport in neutron"
This commit is contained in:
commit
0a02cb8f4b
|
@ -14,7 +14,7 @@ apiVersion: v1
|
|||
appVersion: v1.0.0
|
||||
description: OpenStack-Helm Neutron
|
||||
name: neutron
|
||||
version: 0.3.11
|
||||
version: 0.3.12
|
||||
home: https://docs.openstack.org/neutron/latest/
|
||||
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
|
||||
sources:
|
||||
|
|
|
@ -68,9 +68,14 @@ def check_agent_status(transport):
|
|||
target = oslo_messaging.Target(
|
||||
topic=cfg.CONF.agent_queue_name,
|
||||
server=_get_hostname(use_fqdn))
|
||||
client = oslo_messaging.RPCClient(transport, target,
|
||||
timeout=rpc_timeout,
|
||||
retry=rpc_retries)
|
||||
if hasattr(oslo_messaging, 'get_rpc_client'):
|
||||
client = oslo_messaging.get_rpc_client(transport, target,
|
||||
timeout=rpc_timeout,
|
||||
retry=rpc_retries)
|
||||
else:
|
||||
client = oslo_messaging.RPCClient(transport, target,
|
||||
timeout=rpc_timeout,
|
||||
retry=rpc_retries)
|
||||
client.call(context.RequestContext(),
|
||||
'pod_health_probe_method_ignore_errors')
|
||||
except oslo_messaging.exceptions.MessageDeliveryFailure:
|
||||
|
@ -271,7 +276,7 @@ def test_rpc_liveness():
|
|||
cfg.CONF(sys.argv[1:])
|
||||
|
||||
try:
|
||||
transport = oslo_messaging.get_transport(cfg.CONF)
|
||||
transport = oslo_messaging.get_rpc_transport(cfg.CONF)
|
||||
except Exception as ex:
|
||||
message = getattr(ex, "message", str(ex))
|
||||
sys.stderr.write("Message bus driver load error: %s" % message)
|
||||
|
|
|
@ -53,4 +53,5 @@ neutron:
|
|||
- 0.3.9 Extend neutron liveness probe with readiness probe
|
||||
- 0.3.10 Configure keystone authentication credentials for placement
|
||||
- 0.3.11 Add Zed overrides
|
||||
- 0.3.12 Update oslo_messaging_RPCClient and get_rpc_transport
|
||||
...
|
||||
|
|
Loading…
Reference in New Issue