From 930328be289ec7ab243b50360a73dab10f17844a Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 26 Jan 2010 15:51:38 -0500 Subject: support reading keys from ssh_authorized_keys field of cloud-config --- ec2init/CloudConfig.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ec2init') diff --git a/ec2init/CloudConfig.py b/ec2init/CloudConfig.py index 84b00fd8..6c661260 100644 --- a/ec2init/CloudConfig.py +++ b/ec2init/CloudConfig.py @@ -162,6 +162,11 @@ class CloudConfig(): user = util.get_cfg_option_str(self.cfg,'user') disable_root = util.get_cfg_option_bool(self.cfg, "disable_root", True) keys = self.cloud.get_public_ssh_keys() + + if self.cfg.has_key("ssh_authorized_keys"): + cfgkeys = self.cfg["ssh_authorized_keys"] + keys.extend(cfgkeys) + apply_credentials(keys,user,disable_root) except: warn("applying credentials failed!\n") @@ -179,6 +184,7 @@ class CloudConfig(): def apply_credentials(keys, user, disable_root): + keys = set(keys) if user: setup_user_keys(keys, user, '') -- cgit v1.2.3