From 9aafd6e78bb30c160d9cce5835314b67e86d0328 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 31 Jul 2014 13:59:12 -0400 Subject: fix for config, allow specifying target for cloud-init --single --- cloudinit/config/cc_ubuntu_init_switch.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cloudinit/config/cc_ubuntu_init_switch.py b/cloudinit/config/cc_ubuntu_init_switch.py index 3a2015e5..c476c51c 100644 --- a/cloudinit/config/cc_ubuntu_init_switch.py +++ b/cloudinit/config/cc_ubuntu_init_switch.py @@ -63,15 +63,19 @@ fi """ -def handle(name, cfg, cloud, log, _args): +def handle(name, cfg, cloud, log, args): if not isinstance(cloud.distro, ubuntu.Distro): log.debug("%s: distro is '%s', not ubuntu. returning", name, cloud.distro.__class__) return - cfg = util.mergemanydict(cfg, DEFAULT_CONFIG) + cfg = util.mergemanydict([cfg, DEFAULT_CONFIG]) target = cfg['init_switch']['target'] + + if len(args) != 0: + target = args[0] + if not target: log.debug("%s: target=%s. nothing to do", name, target) return -- cgit v1.2.3