diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-03-05 13:16:28 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-03-05 13:16:28 -0500 |
| commit | c501a37e94b9601740fd7b3dcbcc4cce9136d7f4 (patch) | |
| tree | 31130e9bf1fea5dbc78354a6f0d2495394ec3049 /cloudinit | |
| parent | d05f1b00e2498343c03ba2de543990fffde8a02f (diff) | |
| download | vyos-cloud-init-c501a37e94b9601740fd7b3dcbcc4cce9136d7f4.tar.gz vyos-cloud-init-c501a37e94b9601740fd7b3dcbcc4cce9136d7f4.zip | |
fixes from testing
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/config/cc_snappy.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cloudinit/config/cc_snappy.py b/cloudinit/config/cc_snappy.py index 8d73dca3..133336d4 100644 --- a/cloudinit/config/cc_snappy.py +++ b/cloudinit/config/cc_snappy.py @@ -96,9 +96,9 @@ def handle(name, cfg, cloud, log, args): cfgin = cfg.get('snappy') if not cfgin: cfgin = {} - mycfg = util.mergemanydict([BUILTIN_CFG, cfgin]) + mycfg = util.mergemanydict([cfgin, BUILTIN_CFG]) - sys_snappy = mycfg.get("system_snappy", "auto") + sys_snappy = str(mycfg.get("system_snappy", "auto")) if util.is_false(sys_snappy): LOG.debug("%s: System is not snappy. disabling", name) return @@ -107,7 +107,7 @@ def handle(name, cfg, cloud, log, args): LOG.debug("%s: 'auto' mode, and system not snappy", name) return - install_packages(ci_cfg['packages_dir'], - ci_cfg['packages']) + install_packages(mycfg['packages_dir'], + mycfg['packages']) - disable_enable_ssh(ci_cfg.get('ssh_enabled', False)) + disable_enable_ssh(mycfg.get('ssh_enabled', False)) |