xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-02-04 13:02:25 +00:00
Code Issues Projects Releases Wiki Activity

Fixes for confluent2hosts

Browse Source 
python2 compatibility and various scenarios not handled.
This commit is contained in:
Jarrod Johnson 2021-10-22 16:07:20 -04:00
parent 9c0ec25b6e
commit 219ad8f56b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
confluent_client/bin/confluent2hosts
View File

@ -23,7 +23,7 @@ def partitionhostsline(line):
line = line[:cmdidx].strip()
if not line.strip():
return '', [], comment
ipaddr, names = line.split(maxsplit=1)
ipaddr, names = line.split(None, 1)
names = names.split()
return ipaddr, names, comment
@ -66,9 +66,11 @@ class HostMerger(object):
def read_target(self, targetfile):
if not os.path.exists(targetfile):
return
with open(targetfile, 'r') as hfile:
lines = hfile.read().split('\n')
while not lines[-1]:
while lines and not lines[-1]:
lines = lines[:-1]
for y in range(len(lines)):
line = lines[y]
@ -96,9 +98,9 @@ class HostMerger(object):
self.targlines.append(line)
def write_out(self, targetfile):
while not self.targlines[-1]:
while self.targlines and not self.targlines[-1]:
self.targlines = self.targlines[:-1]
while not self.sourcelines[-1]:
while self.sourcelines and not self.sourcelines[-1]:
self.sourcelines = self.sourcelines[:-1]
if not self.sourcelines:
break
@ -135,8 +137,9 @@ def main():
merger = HostMerger()
for node in ipbynode:
merger.add_entry(ipbynode[node], namesbynode[node])
merger.read_target('/etc/hosts')
os.rename('/etc/hosts', '/etc/hosts.confluentbkup')
if os.path.exists('/etc/hosts'):
merger.read_target('/etc/hosts')
os.rename('/etc/hosts', '/etc/hosts.confluentbkup')
merger.write_out('/etc/hosts')
@ -154,4 +157,4 @@ def expand_expression(c, namesbynode, expurl, expression):
if __name__ == '__main__':
main()
main()