summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_ssh.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-08-23 16:48:39 -0400
committerScott Moser <smoser@brickies.net>2016-08-23 16:48:39 -0400
commit90de5dfa9685a9585b651c38b21274a9aa05ec38 (patch)
tree238e33b0122e68154bc5773186b5938bac2fe34f /cloudinit/config/cc_ssh.py
parent0ec34747b61845bfce806065dd126dcb56fe4672 (diff)
parent5db46cfb68422b0c14d4a6c097553edd0016de3f (diff)
downloadvyos-cloud-init-90de5dfa9685a9585b651c38b21274a9aa05ec38.tar.gz
vyos-cloud-init-90de5dfa9685a9585b651c38b21274a9aa05ec38.zip
merge trunk at 0.7.7~bzr1176
Diffstat (limited to 'cloudinit/config/cc_ssh.py')
-rw-r--r--cloudinit/config/cc_ssh.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/cloudinit/config/cc_ssh.py b/cloudinit/config/cc_ssh.py
index 5bd2dec6..d24e43c0 100644
--- a/cloudinit/config/cc_ssh.py
+++ b/cloudinit/config/cc_ssh.py
@@ -30,9 +30,10 @@ from cloudinit import distros as ds
from cloudinit import ssh_util
from cloudinit import util
-DISABLE_ROOT_OPTS = ("no-port-forwarding,no-agent-forwarding,"
-"no-X11-forwarding,command=\"echo \'Please login as the user \\\"$USER\\\" "
-"rather than the user \\\"root\\\".\';echo;sleep 10\"")
+DISABLE_ROOT_OPTS = (
+ "no-port-forwarding,no-agent-forwarding,"
+ "no-X11-forwarding,command=\"echo \'Please login as the user \\\"$USER\\\""
+ " rather than the user \\\"root\\\".\';echo;sleep 10\"")
GENERATE_KEY_NAMES = ['rsa', 'dsa', 'ecdsa', 'ed25519']
KEY_FILE_TPL = '/etc/ssh/ssh_host_%s_key'