opendev/system-config
Code Issues Proposed changes

Use ansible_host instead of ansible_default_ip* for zk

Browse Source 
Our zk config is a little too brittle. Let's just use the inventory
vars instead of detected network facts.

Change-Id: I288990edf587bc8394c9473388a858f46efb0691
This commit is contained in:
Monty Taylor 2020-05-11 12:05:24 -05:00 committed by Jeremy Stanley
parent 2337c7e5c5
commit 15b662b37a
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
playbooks/roles/nodepool-base/library/make_nodepool_zk_hosts.py
View File

@ -29,17 +29,8 @@ def main():
zk_hosts = [] zk_hosts = []
try: try:
for host in p['zk_group']: for host in p['zk_group']:
hv = p['hostvars'][host]
if hv.get('ansible_default_ipv6'):
address=hv['ansible_default_ipv6']['address']
else:
if 'ansible_default_ipv4' not in hv:
module.fail_json(
msg="No network information facts found",
changed=False)
address=hv['ansible_default_ipv4']['address']
zk_hosts.append(dict( zk_hosts.append(dict(
host=address, host=p['hostvars'][host]['ansible_host'],
port=2181 port=2181
)) ))
module.exit_json(hosts=zk_hosts, changed=True) module.exit_json(hosts=zk_hosts, changed=True)

2
playbooks/roles/nodepool-base/tasks/main.yaml
View File

@ -49,6 +49,8 @@
# Have to run service-zookeeper before service-nodepool # Have to run service-zookeeper before service-nodepool
# because we need top populate the fact cache. # because we need top populate the fact cache.
# Also, we need IP addresses here because in the gate
# hostnames do not resolve.
- name: Get zk config - name: Get zk config
make_nodepool_zk_hosts: make_nodepool_zk_hosts:
hostvars: "{{ hostvars }}" hostvars: "{{ hostvars }}"