a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

consul_io: fixed service availability check (#34293) 

service is only up if the node publishing it is also available
pull/4420/head
Kristóf Havasi 2018-01-19 22:33:52 +01:00 committed by ansibot
parent a13958d273
commit 1c22d82c5e
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/inventory/consul_io.py
View File

@ -261,10 +261,7 @@ class ConsulInventory(object):
if self.config.has_config('availability'): if self.config.has_config('availability'):
for service_name, service in iteritems(node['Services']): for service_name, service in iteritems(node['Services']):
for node in self.consul_api.health.service(service_name)[1]: for node in self.consul_api.health.service(service_name)[1]:
for check in node['Checks']: if self.is_service_available(node, service_name):
if check['ServiceName'] == service_name:
ok = 'passing' == check['Status']
if ok:
suffix = self.config.get_availability_suffix( suffix = self.config.get_availability_suffix(
'available_suffix', '_available') 'available_suffix', '_available')
else: else:
@ -273,6 +270,17 @@ class ConsulInventory(object):
self.add_node_to_map(self.nodes_by_availability, self.add_node_to_map(self.nodes_by_availability,
service_name + suffix, node['Node']) service_name + suffix, node['Node'])
def is_service_available(self, node, service_name):
'''check the availability of the service on the node beside ensuring the
availability of the node itself'''
consul_ok = service_ok = False
for check in node['Checks']:
if check['CheckID'] == 'serfHealth':
consul_ok = check['Status'] == 'passing'
elif check['ServiceName'] == service_name:
service_ok = check['Status'] == 'passing'
return consul_ok and service_ok
def consul_get_kv_inmemory(self, key): def consul_get_kv_inmemory(self, key):
result = filter(lambda x: x['Key'] == key, self.inmemory_kv) result = filter(lambda x: x['Key'] == key, self.inmemory_kv)
return result.pop() if result else None return result.pop() if result else None