glance: stop using healthcheck endpoint

The healthcheck endpoint currently is not configured by us, which
means that it's pretty much a no-op right now.

It also causes issues with IPv6 addresses, where it fails to parse
the IP correctly and raises an exception.

    ValueError: invalid literal for int() with
    base 10: 'xxxxx::xx]:9292'

This patch goes back to monitoring the root of the endpoint as that
probably delivers just as accurate of information in the current
state that we're in.

Change-Id: I859795307b88508dc1b894b39526f4289b33c1af
This commit is contained in:
Mohammed Naser 2019-03-31 13:48:18 -04:00
parent d9395fec09
commit 6520d0bb2c

View File

@ -78,7 +78,7 @@ haproxy_default_services:
haproxy_port: 9292 haproxy_port: 9292
haproxy_balance_type: http haproxy_balance_type: http
haproxy_backend_options: haproxy_backend_options:
- "httpchk GET /healthcheck HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck" - "httpchk GET / HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck"
haproxy_service_enabled: "{{ groups['glance_api'] is defined and groups['glance_api'] | length > 0 }}" haproxy_service_enabled: "{{ groups['glance_api'] is defined and groups['glance_api'] | length > 0 }}"
- service: - service:
haproxy_service_name: glance_registry haproxy_service_name: glance_registry
@ -87,7 +87,7 @@ haproxy_default_services:
haproxy_port: 9191 haproxy_port: 9191
haproxy_balance_type: http haproxy_balance_type: http
haproxy_backend_options: haproxy_backend_options:
- "httpchk GET /healthcheck HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck" - "httpchk GET / HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck"
haproxy_whitelist_networks: "{{ haproxy_glance_registry_whitelist_networks }}" haproxy_whitelist_networks: "{{ haproxy_glance_registry_whitelist_networks }}"
haproxy_service_enabled: >- haproxy_service_enabled: >-
{{ groups['glance_registry'] is defined and {{ groups['glance_registry'] is defined and