bin/clone_formulas.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-set -Ceu
-
-FORMULASDIR='/srv/formulas'
-
-if [ ! -d "$FORMULASDIR" ]
-then
-        git clone --recurse-submodules --single-branch -b production https://git.com.de/LibertaCasa/salt-formulas.git "$FORMULASDIR"
-        exit "$?"
-fi
-
-git -C "$FORMULASDIR" pull --recurse-submodules

bin/prepare_minion.py

@@ -9,7 +9,6 @@ import socket
 roles = roles.get()
 grainsfile = '/etc/salt/grains'
 idfile = 'pillar/id/' + socket.gethostname() + '.sls'
-configfile = '/etc/salt/minion.d/local.conf'
 mypwd = os.getcwd()
 
 grainsdata = {'roles': roles}
@@ -20,13 +19,5 @@ with open(grainsfile, mode='w') as grainsfh:
 with open(idfile, mode='w') as idfh:
 	idfh.write('# empty')
 
-with open(configfile, mode='w') as configfh:
-    configfh.write('''# written by prepare_minion.py
-file_roots:
-  production:
-    - /srv/salt
-    - /srv/formulas/salt-formula
-''')
-
 os.symlink(mypwd + '/salt', '/srv/salt')
 os.symlink(mypwd + '/pillar', '/srv/pillar')

salt/role/salt/common.sls

@@ -1 +0,0 @@
-# empty