diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-03-04 17:00:16 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-03-04 17:00:16 -0500 |
| commit | 068ee3d324350fd998e2a27e5be2991ea9bab52f (patch) | |
| tree | f7a1e0f8a2dc15e5555a3b97982c0475ec1e09dd /cloudinit/config/cc_grub_dpkg.py | |
| parent | c808b84f1f6cdfe090a18b759a602eb504f36026 (diff) | |
| parent | e7cce1a06429813b8d2acc87e6609671d39a3254 (diff) | |
| download | vyos-cloud-init-068ee3d324350fd998e2a27e5be2991ea9bab52f.tar.gz vyos-cloud-init-068ee3d324350fd998e2a27e5be2991ea9bab52f.zip | |
pull in 'snappy' support
This allows config to disable some of the config modules that were
failing and logging WARN on snapy. Also adds the snappy module
and changes the syslog perms to take a list of user:groups rather
than just a single.
LP: #1428139
Diffstat (limited to 'cloudinit/config/cc_grub_dpkg.py')
| -rw-r--r-- | cloudinit/config/cc_grub_dpkg.py | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/cloudinit/config/cc_grub_dpkg.py b/cloudinit/config/cc_grub_dpkg.py index e3219e81..456597af 100644 --- a/cloudinit/config/cc_grub_dpkg.py +++ b/cloudinit/config/cc_grub_dpkg.py @@ -25,15 +25,20 @@ from cloudinit import util distros = ['ubuntu', 'debian'] -def handle(_name, cfg, _cloud, log, _args): - idevs = None - idevs_empty = None +def handle(name, cfg, _cloud, log, _args): - if "grub-dpkg" in cfg: - idevs = util.get_cfg_option_str(cfg["grub-dpkg"], - "grub-pc/install_devices", None) - idevs_empty = util.get_cfg_option_str(cfg["grub-dpkg"], - "grub-pc/install_devices_empty", None) + mycfg = cfg.get("grub_dpkg", cfg.get("grub-dpkg", {})) + if not mycfg: + mycfg = {} + + enabled = mycfg.get('enabled', True) + if util.is_false(enabled): + log.debug("%s disabled by config grub_dpkg/enabled=%s", name, enabled) + return + + idevs = util.get_cfg_option_str(mycfg, "grub-pc/install_devices", None) + idevs_empty = util.get_cfg_option_str(mycfg, + "grub-pc/install_devices_empty", None) if ((os.path.exists("/dev/sda1") and not os.path.exists("/dev/sda")) or (os.path.exists("/dev/xvda1") |