diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-02-12 14:56:55 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-02-12 14:56:55 -0500 |
| commit | 20305aea1eac724069e0bfaaf976ec5caa8c2439 (patch) | |
| tree | c631bbfc05dd9265b28dcff4bccdf9aa56148b79 /cloudinit/config | |
| parent | 8d117d37e2945369abaa66d1e30f153e483c3faf (diff) | |
| download | vyos-cloud-init-20305aea1eac724069e0bfaaf976ec5caa8c2439.tar.gz vyos-cloud-init-20305aea1eac724069e0bfaaf976ec5caa8c2439.zip | |
drop 'is_excluded'.
for now, this the mechanism just doesn't seem right.
I think i'd rather have the module declare supported distros than
have distros declare [un]supported modules.
Diffstat (limited to 'cloudinit/config')
| -rw-r--r-- | cloudinit/config/cc_apt_configure.py | 2 | ||||
| -rw-r--r-- | cloudinit/config/cc_apt_pipelining.py | 2 | ||||
| -rw-r--r-- | cloudinit/config/cc_grub_dpkg.py | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py index ccb45bb9..29c13a3d 100644 --- a/cloudinit/config/cc_apt_configure.py +++ b/cloudinit/config/cc_apt_configure.py @@ -51,8 +51,6 @@ EXPORT_GPG_KEYID = """ def handle(name, cfg, cloud, log, _args): - if cloud.distro.is_excluded(name): - return release = get_release() mirrors = find_apt_mirror_info(cloud, cfg) if not mirrors or "primary" not in mirrors: diff --git a/cloudinit/config/cc_apt_pipelining.py b/cloudinit/config/cc_apt_pipelining.py index bd180e82..503a1485 100644 --- a/cloudinit/config/cc_apt_pipelining.py +++ b/cloudinit/config/cc_apt_pipelining.py @@ -35,8 +35,6 @@ APT_PIPE_TPL = ("//Written by cloud-init per 'apt_pipelining'\n" def handle(_name, cfg, _cloud, log, _args): - if _cloud.distro.is_excluded(_name): - return apt_pipe_value = util.get_cfg_option_str(cfg, "apt_pipelining", False) apt_pipe_value_s = str(apt_pipe_value).lower().strip() diff --git a/cloudinit/config/cc_grub_dpkg.py b/cloudinit/config/cc_grub_dpkg.py index 03cdd98c..b3ce6fb6 100644 --- a/cloudinit/config/cc_grub_dpkg.py +++ b/cloudinit/config/cc_grub_dpkg.py @@ -29,8 +29,6 @@ def handle(_name, cfg, _cloud, log, _args): idevs = None idevs_empty = None - if _cloud.distro.is_excluded(_name): - return if "grub-dpkg" in cfg: idevs = util.get_cfg_option_str(cfg["grub-dpkg"], "grub-pc/install_devices", None) |