From 07ae3593c32cbbe01f24955fb59047eaaa66e6c8 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 24 Mar 2021 17:33:26 -0400 Subject: [PATCH] Syncfiles fixes --- confluent_server/confluent/syncfiles.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/confluent_server/confluent/syncfiles.py b/confluent_server/confluent/syncfiles.py index 77996b9a..ef291ffd 100644 --- a/confluent_server/confluent/syncfiles.py +++ b/confluent_server/confluent/syncfiles.py @@ -56,6 +56,7 @@ class SyncList(object): else: raise Exception( 'Section "{}" is not currently supported in syncfiles'.format(ent[:-1])) + continue if '->' in ent: k, v = ent.split('->') k = k.strip() @@ -82,9 +83,9 @@ def sync_list_to_node(synclist, node, suffixes): if 'merge' in suffixes: while suffixes['merge'] and suffixes['merge'][0] == '/': suffixes['merge'] = suffixes['merge'][1:] - for ent in sl.appendmap: - stage_ent(sl.appendmap, ent, - os.path.join(targdir, suffixes['append'])) + for ent in sl.mergemap: + stage_ent(sl.mergemap, ent, + os.path.join(targdir, suffixes['merge'])) sshutil.prep_ssh_key('/etc/confluent/ssh/automation') output = subprocess.check_output( ['rsync', '-aL', targdir + '/', 'root@{}:/'.format(node)])