openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Charm-helpers sync

Browse Source 
Change-Id: I31b300973c64f6eb882a314e0d2135ff9f8a09a6
Closes-Bug: #2012108
This commit is contained in:
Felipe Reyes 2023-03-21 11:58:25 -03:00
parent 2459596ba7
commit b58b6bd940
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charmhelpers/contrib/network/ip.py
View File

@ -477,7 +477,7 @@ def ns_query(address):
try: try:
answers = dns.resolver.query(address, rtype) answers = dns.resolver.query(address, rtype)
except dns.resolver.NXDOMAIN: except (dns.resolver.NXDOMAIN, dns.resolver.NoNameservers):
return None return None
if answers: if answers:

4
charmhelpers/contrib/openstack/templates/haproxy.cfg
View File

@ -82,7 +82,11 @@ backend {{ service }}_{{ frontend }}
{% endif -%} {% endif -%}
{% endif -%} {% endif -%}
{% for unit, address in frontends[frontend]['backends'].items() -%} {% for unit, address in frontends[frontend]['backends'].items() -%}
{% if https -%}
server {{ unit }} {{ address }}:{{ ports[1] }} check check-ssl verify none
{% else -%}
server {{ unit }} {{ address }}:{{ ports[1] }} check server {{ unit }} {{ address }}:{{ ports[1] }} check
{% endif -%}
{% endfor %} {% endfor %}
{% endfor -%} {% endfor -%}
{% endfor -%} {% endfor -%}

7
charmhelpers/contrib/openstack/utils.py
View File

@ -1039,7 +1039,7 @@ def _determine_os_workload_status(
state, message, lambda: charm_func(configs)) state, message, lambda: charm_func(configs))
if state is None: if state is None:
state, message = _ows_check_services_running(services, ports) state, message = ows_check_services_running(services, ports)
if state is None: if state is None:
state = 'active' state = 'active'
@ -1213,7 +1213,12 @@ def _ows_check_charm_func(state, message, charm_func_with_configs):
return state, message return state, message
@deprecate("use ows_check_services_running() instead", "2022-05", log=juju_log)
def _ows_check_services_running(services, ports): def _ows_check_services_running(services, ports):
return ows_check_services_running(services, ports)
def ows_check_services_running(services, ports):
"""Check that the services that should be running are actually running """Check that the services that should be running are actually running
and that any ports specified are being listened to. and that any ports specified are being listened to.