Add --no-keys-inject option

This skips key injection in nodes
Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>

snf-deploy/conf/deploy.conf

@@ -25,3 +25,9 @@ dns = /var/lib/snf-deploy/dnsmasq
 lib = /usr/lib/snf-deploy
 # dir to store executed commands (to enforce sequential execution)
 cmd = /var/run/snf-deploy/cmd
+
+[keys]
+# whether to create new keys
+keygen = False
+# whether to inject ssh keys found in templates/root/.ssh in nodes
+key_inject = True

snf-deploy/fabfile.py

@@ -226,7 +226,8 @@ def check_ssh():
 
 @roles("ips")
 def add_keys():
-    debug(env.host, "Adding rsa/dsa keys..")
+    if not ast.literal_eval(env.env.key_inject):
+      debug(env.host, "Skipping ssh keys injection..")
     try_run("mkdir -p /root/.ssh")
     cmd = """
 for f in $(ls /root/.ssh/*); do

snf-deploy/snfdeploy/__init__.py

@@ -380,6 +380,10 @@ def parse_options():
                       default=None,
                       help="Path of an existing ssh key to use")
 
+  parser.add_argument("--no-key-inject", dest="key_inject",
+                      default=True, action="store_false",
+                      help="Whether to inject ssh key pairs to hosts")
+
   # backend related options
   parser.add_argument("--cluster-name", dest="cluster_name",
                       default="ganeti1",

snf-deploy/snfdeploy/lib.py

@@ -128,7 +128,7 @@ class Conf(object):
 
     files = {
         "nodes": ["network", "info"],
-        "deploy": ["dirs", "packages"],
+        "deploy": ["dirs", "packages", "keys"],
         "vcluster": ["cluster", "image"],
         "synnefo": ["cred", "synnefo", "roles"],
         "packages": ["debian", "ganeti", "synnefo", "other"],