openstack
/
charm-heat
Code Issues Proposed changes

Hotfix charmhelpers sync for local_address() fix 

The network-get --primary-address juju-info fails on pre-2.8.?
versions of juju.  This results in a NoNetworkBinding error.
Fallback to unit_get() if that occurs for local_address().

Change-Id: I8e7f6a5c19daca65b0561a4ea2e85b8e8adbfff9
This commit is contained in:
Alex Kavanagh 2021-01-20 12:24:19 +00:00
parent c81858c248
commit 29be9de9ea
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hooks/charmhelpers/contrib/openstack/ip.py
View File

@ -130,6 +130,9 @@ def local_address(unit_get_fallback='public-address'):
from network-get. If this is running with an old version of Juju then
fallback to unit_get.
Note on juju < 2.9 the binding to juju-info may not exist, so fall back to
the unit-get.
:param unit_get_fallback: Either 'public-address' or 'private-address'.
Only used with old versions of Juju.
:type unit_get_fallback: str
@ -138,7 +141,7 @@ def local_address(unit_get_fallback='public-address'):
"""
try:
return network_get_primary_address('juju-info')
except NotImplementedError:
except (NotImplementedError, NoNetworkBinding):
return unit_get(unit_get_fallback)