playbook/ors: fix conflicts with configure-slapos and vifib playbook

playbook/roles/ors/files/configure-slapos.py

@@ -7,7 +7,6 @@ CONF_PATH = "/etc/opt/slapos/slapos.cfg"
 ors_config = {
     'slapformat': {
         'create_tun': 'True',
-        'create_tap': 'False',
         'partition_amount': '20',
     },
     'networkcache': {
@@ -17,28 +16,32 @@ https://lab.node.vifib.com/nexedi/slapos/raw/1.0.''',
     },
 }
 
-config = configparser.ConfigParser()
-config.read(CONF_PATH)
-
-def is_slapformat_valid():
-    for k in ors_config['slapformat']:
-        if ors_config['slapformat'][k] != \
-           config.setdefault('slapformat', {}).setdefault(k, ''):
-            return False
-    return True
-slapformat_valid = is_slapformat_valid()
-
-config['slapformat'].update(ors_config['slapformat'])
-config['networkcache'].update(ors_config['networkcache'])
-with open(CONF_PATH, 'w+') as f:
-    config.write(f)
-
-if not slapformat_valid:
-    # Delete routes
-    s = subprocess.run(['ip', 'route'], check=True, capture_output=True)
-    for r in s.stdout.decode().split('\n'):
-        if "slaptun" in r:
-            l = r.split(' ')
-            subprocess.run(['ip', 'route', 'del',] + l[:l.index('dev') + 2], check=True)
-    subprocess.run(['rm', '-f', '/opt/slapos/slapos.xml'], check=True)
-    subprocess.run(['slapos', 'node', 'format', '--now'], check=True, capture_output=True)
+with open('/opt/upgrader/configure-slapos.log', 'w+') as l:
+
+    l.write("[configure-slapos] Configuring slapos...\n")
+
+    config = configparser.ConfigParser()
+    config.read(CONF_PATH)
+
+    def is_slapformat_valid():
+        for k in ors_config['slapformat']:
+            if ors_config['slapformat'][k] != \
+               config.setdefault('slapformat', {}).setdefault(k, ''):
+                l.write("[configure-slapos] {} not valid ( {} != {} )\n".format(k, ors_config['slapformat'][k], config.setdefault('slapformat', {}).setdefault(k, '')))
+                return False
+        return True
+    slapformat_valid = is_slapformat_valid()
+
+    config['slapformat'].update(ors_config['slapformat'])
+    config['networkcache'].update(ors_config['networkcache'])
+    with open(CONF_PATH, 'w+') as f:
+        config.write(f)
+
+
+    if not slapformat_valid:
+        l.write("[configure-slapos] slapos.cfg not valid\n")
+        # Delete slaptun devices
+        for i in range(0,19):
+            subprocess.run(['ip', 'link', 'delete', 'slaptun'])
+        subprocess.run(['rm', '-f', '/opt/slapos/slapos.xml'], check=True)
+        subprocess.run(['slapos', 'node', 'format', '--now'], check=True, capture_output=True)