1 files changed, 0 insertions, 79 deletions
diff --git a/ec2init/util.py b/ec2init/util.py
deleted file mode 100644
index 9b9f6f4d..00000000
--- a/ec2init/util.py
+++ /dev/null
@@ -1,79 +0,0 @@
-import yaml
-import os
-import errno
-import subprocess
-from Cheetah.Template import Template
-
-def read_conf(fname):
-	stream = file(fname)
-	conf = yaml.load(stream)
-	stream.close()
-	return conf
-
-def get_cfg_option_bool(yobj, key, default=False):
-    if not yobj.has_key(key): return default
-    val = yobj[key]
-    if yobj[key] in [ True, '1', 'on', 'yes', 'true']:
-        return True
-    return False
-
-def get_cfg_option_str(yobj, key, default=None):
-    if not yobj.has_key(key): return default
-    return yobj[key]
-
-# merge values from src into cand.
-# if src has a key, cand will not override
-def mergedict(src,cand):
-    if isinstance(src,dict) and isinstance(cand,dict):
-        for k,v in cand.iteritems():
-            if k not in src:
-                src[k] = v
-            else:
-                src[k] = mergedict(src[k],v)
-    return src
-
-def write_file(file,content,mode=0644):
-        try:
-            os.makedirs(os.path.dirname(file))
-        except OSError as e:
-            if e.errno != errno.EEXIST:
-                raise e
-
-        f=open(file,"wb")
-        os.chmod(file,mode)
-        f.write(content)
-        f.close()
-
-# get keyid from keyserver
-def getkeybyid(keyid,keyserver):
-   shcmd="""
-   k=${1} ks=${2};
-   exec 2>/dev/null
-   [ -n "$k" ] || exit 1;
-   armour=$(gpg --list-keys --armour "${k}")
-   if [ -z "${armour}" ]; then
-      gpg --keyserver ${ks} --recv $k >/dev/null &&
-         armour=$(gpg --export --armour "${k}") &&
-         gpg --batch --yes --delete-keys "${k}"
-   fi
-   [ -n "${armour}" ] && echo "${armour}"
-   """
-   args=['sh', '-c', shcmd, "export-gpg-keyid", keyid, keyserver]
-   return(subp(args)[0])
-
-def subp(args, input=None):
-    s_in = None
-    if input is not None:
-        s_in = subprocess.PIPE
-    sp = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=s_in)
-    out,err = sp.communicate(input)
-    if sp.returncode is not 0:
-        raise subprocess.CalledProcessError(sp.returncode,args)
-    return(out,err)
-
-def render_to_file(template, outfile, searchList):
-    t = Template(file='/etc/cloud/templates/%s.tmpl' % template, searchList=[searchList])
-    f = open(outfile, 'w')
-    f.write(t.respond())
-    f.close()
-