Merge lp:~darkmuggle-deactivatedaccount/cloud-init/1494816 into lp:~cloud-init-dev/cloud-init/trunk

[Ben Howard]

Conditional enablement for SSH on Snappy.

[lp:~darkmuggle-deactivatedaccount/cloud-init/1494816]

1145. By Ben Howard on 2015-09-11

Refinements on SSH enablement

=== modified file 'cloudinit/config/cc_snappy.py'
--- cloudinit/config/cc_snappy.py	2015-05-01 09:38:56 +0000
+++ cloudinit/config/cc_snappy.py	2015-09-11 20:05:05 +0000
@@ -274,7 +274,22 @@
             LOG.warn("'%s' failed for '%s': %s",
                      pkg_op['op'], pkg_op['name'], e)
 
-    disable_enable_ssh(mycfg.get('ssh_enabled', False))
+    # Default to disabling SSH
+    ssh_enabled = mycfg.get('ssh_enabled', False)
+
+    # If the user has not explicitly enabled or disabled SSH, then enable it
+    # when password SSH authentication is requested or there are SSH keys
+    if mycfg.get('ssh_enabled', None) is not False:
+        user_ssh_keys = cloud.get_public_ssh_keys() or None
+        password_auth_enabled = cfg.get('ssh_pwauth', False)
+        if user_ssh_keys:
+            LOG.debug("Enabling SSH, user SSH keys provided")
+            ssh_enabled = True
+        elif password_auth_enabled:
+            LOG.debug("Enabling SSH, password authentication requested")
+            ssh_enabled = True
+
+    disable_enable_ssh(ssh_enabled)
 
     if fails:
         raise Exception("failed to install/configure snaps")