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/distros | |
| 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/distros')
| -rw-r--r-- | cloudinit/distros/__init__.py | 8 | ||||
| -rw-r--r-- | cloudinit/distros/arch.py | 6 | ||||
| -rw-r--r-- | cloudinit/distros/gentoo.py | 5 |
3 files changed, 0 insertions, 19 deletions
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 8fc0da9f..55d6bcbc 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -56,20 +56,12 @@ class Distro(object): hostname_conf_fn = "/etc/hostname" tz_zone_dir = "/usr/share/zoneinfo" init_cmd = ['service'] # systemctl, service etc - exclude_modules = [] def __init__(self, name, cfg, paths): self._paths = paths self._cfg = cfg self.name = name - def is_excluded(self, name): - if name in self.exclude_modules: - distro = getattr(self, name, None) or getattr(self, 'osfamily') - LOG.debug(("Skipping module named %s, distro %s excluded"), name, - distro) - return True - @abc.abstractmethod def install_packages(self, pkglist): raise NotImplementedError() diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py index 27dcaa88..310c3dff 100644 --- a/cloudinit/distros/arch.py +++ b/cloudinit/distros/arch.py @@ -36,12 +36,6 @@ class Distro(distros.Distro): tz_local_fn = "/etc/localtime" resolve_conf_fn = "/etc/resolv.conf" init_cmd = ['systemctl'] # init scripts - exclude_modules = [ - 'grub-dpkg', - 'apt-configure', - 'apt-pipelining', - 'yum-add-repo', - ] def __init__(self, name, cfg, paths): distros.Distro.__init__(self, name, cfg, paths) diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py index 0a95fa23..09f8d8ea 100644 --- a/cloudinit/distros/gentoo.py +++ b/cloudinit/distros/gentoo.py @@ -34,11 +34,6 @@ class Distro(distros.Distro): tz_conf_fn = "/etc/timezone" tz_local_fn = "/etc/localtime" init_cmd = [''] # init scripts - exclude_modules = [ - 'grub-dpkg', - 'apt-configure', - 'apt-pipelining', - ] def __init__(self, name, cfg, paths): distros.Distro.__init__(self, name, cfg, paths) |