xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 09:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Correct ipv4/v6 handling in get_apikey

Browse Source
This commit is contained in:
Jarrod Johnson 2021-09-13 10:03:32 -04:00
parent cf097b153e
commit 7ba10e559e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
confluent_osdeploy/common/opt/confluent/bin/apiclient
View File

@ -19,14 +19,18 @@ def get_apikey(nodename, mgr, mgr6):
apikey = open('/etc/confluent/confluent.apikey').read().strip()
if apikey:
return apikey
hosts = []
for host in (mgr, mgr6):
if not host:
continue
hosts.append(host)
while not apikey:
try:
apikey = subprocess.check_output(['/opt/confluent/bin/clortho', nodename, mgr])
except subprocess.CalledProcessError:
for host in hosts:
try:
apikey = subprocess.check_output(['/opt/confluent/bin/clortho', nodename, mgr6])
apikey = subprocess.check_output(['/opt/confluent/bin/clortho', nodename, host])
except subprocess.CalledProcessError:
apikey = ''
continue
break
if not isinstance(apikey, str):
apikey = apikey.decode('utf8')
if apikey.startswith('SEALED:'):