diff options
37 files changed, 80 insertions, 6 deletions
diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py index 29c13a3d..a1be7514 100644 --- a/cloudinit/config/cc_apt_configure.py +++ b/cloudinit/config/cc_apt_configure.py @@ -51,6 +51,8 @@ EXPORT_GPG_KEYID = """ def handle(name, cfg, cloud, log, _args): + if cloud.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 e5629175..15e509ac 100644 --- a/cloudinit/config/cc_apt_pipelining.py +++ b/cloudinit/config/cc_apt_pipelining.py @@ -35,7 +35,8 @@ APT_PIPE_TPL = ("//Written by cloud-init per 'apt_pipelining'\n" def handle(_name, cfg, _cloud, log, _args): - + if _cloud.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_byobu.py b/cloudinit/config/cc_byobu.py index 92d428b7..f708ca5f 100644 --- a/cloudinit/config/cc_byobu.py +++ b/cloudinit/config/cc_byobu.py @@ -29,6 +29,8 @@ distros = ['ubuntu', 'debian'] def handle(name, cfg, cloud, log, args): + if cloud.is_excluded(name): + return if len(args) != 0: value = args[0] else: diff --git a/cloudinit/config/cc_ca_certs.py b/cloudinit/config/cc_ca_certs.py index 4f2a46a1..97af3705 100644 --- a/cloudinit/config/cc_ca_certs.py +++ b/cloudinit/config/cc_ca_certs.py @@ -79,6 +79,8 @@ def handle(name, cfg, _cloud, log, _args): @param args: Any module arguments from cloud.cfg """ # If there isn't a ca-certs section in the configuration don't do anything + if _cloud.is_excluded(name): + return if "ca-certs" not in cfg: log.debug(("Skipping module named %s," " no 'ca-certs' key in configuration"), name) diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py index 727769cd..a74c4d27 100644 --- a/cloudinit/config/cc_chef.py +++ b/cloudinit/config/cc_chef.py @@ -40,7 +40,8 @@ OMNIBUS_URL = "https://www.opscode.com/chef/install.sh" def handle(name, cfg, cloud, log, _args): - + if cloud.is_excluded(name): + return # If there isn't a chef key in the configuration don't do anything if 'chef' not in cfg: log.debug(("Skipping module named %s," diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py index 0b970e4e..7b5e2f3d 100644 --- a/cloudinit/config/cc_disk_setup.py +++ b/cloudinit/config/cc_disk_setup.py @@ -40,6 +40,8 @@ def handle(_name, cfg, cloud, log, _args): See doc/examples/cloud-config_disk-setup.txt for documentation on the format. """ + if cloud.is_excluded(_name): + return disk_setup = cfg.get("disk_setup") if isinstance(disk_setup, dict): update_disk_setup_devices(disk_setup, cloud.device_name_to_device) diff --git a/cloudinit/config/cc_emit_upstart.py b/cloudinit/config/cc_emit_upstart.py index 6d376184..4392c1f5 100644 --- a/cloudinit/config/cc_emit_upstart.py +++ b/cloudinit/config/cc_emit_upstart.py @@ -29,6 +29,8 @@ distros = ['ubuntu', 'debian'] def handle(name, _cfg, cloud, log, args): + if cloud.is_excluded(name): + return event_names = args if not event_names: # Default to the 'cloud-config' diff --git a/cloudinit/config/cc_growpart.py b/cloudinit/config/cc_growpart.py index 6bddf847..91f472af 100644 --- a/cloudinit/config/cc_growpart.py +++ b/cloudinit/config/cc_growpart.py @@ -213,6 +213,8 @@ def resize_devices(resizer, devices): def handle(_name, cfg, _cloud, log, _args): + if _cloud.is_excluded(_name): + return if 'growpart' not in cfg: log.debug("No 'growpart' entry in cfg. Using default: %s" % DEFAULT_CONFIG) diff --git a/cloudinit/config/cc_grub_dpkg.py b/cloudinit/config/cc_grub_dpkg.py index b3ce6fb6..ada0f472 100644 --- a/cloudinit/config/cc_grub_dpkg.py +++ b/cloudinit/config/cc_grub_dpkg.py @@ -26,9 +26,12 @@ distros = ['ubuntu', 'debian'] def handle(_name, cfg, _cloud, log, _args): + idevs = None idevs_empty = None + if _cloud.is_excluded(_name): + return if "grub-dpkg" in cfg: idevs = util.get_cfg_option_str(cfg["grub-dpkg"], "grub-pc/install_devices", None) diff --git a/cloudinit/config/cc_keys_to_console.py b/cloudinit/config/cc_keys_to_console.py index ed7af690..ae47438a 100644 --- a/cloudinit/config/cc_keys_to_console.py +++ b/cloudinit/config/cc_keys_to_console.py @@ -30,6 +30,8 @@ HELPER_TOOL = '/usr/lib/cloud-init/write-ssh-key-fingerprints' def handle(name, cfg, _cloud, log, _args): + if _cloud.is_excluded(name): + return if not os.path.exists(HELPER_TOOL): log.warn(("Unable to activate module %s," " helper tool not found at %s"), name, HELPER_TOOL) diff --git a/cloudinit/config/cc_landscape.py b/cloudinit/config/cc_landscape.py index 8a709677..645b059d 100644 --- a/cloudinit/config/cc_landscape.py +++ b/cloudinit/config/cc_landscape.py @@ -56,6 +56,8 @@ def handle(_name, cfg, cloud, log, _args): ls_cloudcfg = cfg.get("landscape", {}) + if cloud.is_excluded(_name): + return if not isinstance(ls_cloudcfg, (dict)): raise RuntimeError(("'landscape' key existed in config," " but not a dictionary type," diff --git a/cloudinit/config/cc_locale.py b/cloudinit/config/cc_locale.py index 6feaae9d..a3f0933a 100644 --- a/cloudinit/config/cc_locale.py +++ b/cloudinit/config/cc_locale.py @@ -22,6 +22,8 @@ from cloudinit import util def handle(name, cfg, cloud, log, args): + if cloud.is_excluded(name): + return if len(args) != 0: locale = args[0] else: diff --git a/cloudinit/config/cc_mcollective.py b/cloudinit/config/cc_mcollective.py index b670390d..76e149f5 100644 --- a/cloudinit/config/cc_mcollective.py +++ b/cloudinit/config/cc_mcollective.py @@ -33,7 +33,8 @@ SERVER_CFG = '/etc/mcollective/server.cfg' def handle(name, cfg, cloud, log, _args): - + if cloud.is_excluded(name): + return # If there isn't a mcollective key in the configuration don't do anything if 'mcollective' not in cfg: log.debug(("Skipping module named %s, " diff --git a/cloudinit/config/cc_migrator.py b/cloudinit/config/cc_migrator.py index facaa538..b9a012f5 100644 --- a/cloudinit/config/cc_migrator.py +++ b/cloudinit/config/cc_migrator.py @@ -75,6 +75,8 @@ def _migrate_legacy_sems(cloud, log): def handle(name, cfg, cloud, log, _args): + if cloud.is_excluded(name): + return do_migrate = util.get_cfg_option_str(cfg, "migrate", True) if not util.translate_bool(do_migrate): log.debug("Skipping module named %s, migration disabled", name) diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py index 80590118..1476d19f 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -76,6 +76,8 @@ def sanitize_devname(startname, transformer, log): def handle(_name, cfg, cloud, log, _args): + if cloud.is_excluded(_name): + return # fs_spec, fs_file, fs_vfstype, fs_mntops, fs-freq, fs_passno defvals = [None, None, "auto", "defaults,nobootwait", "0", "2"] defvals = cfg.get("mount_default_fields", defvals) diff --git a/cloudinit/config/cc_package_update_upgrade_install.py b/cloudinit/config/cc_package_update_upgrade_install.py index 73b0e30d..86e1d25b 100644 --- a/cloudinit/config/cc_package_update_upgrade_install.py +++ b/cloudinit/config/cc_package_update_upgrade_install.py @@ -49,6 +49,8 @@ def _fire_reboot(log, wait_attempts=6, initial_sleep=1, backoff=2): def handle(_name, cfg, cloud, log, _args): + if cloud.is_excluded(_name): + return # Handle the old style + new config names update = _multi_cfg_bool_get(cfg, 'apt_update', 'package_update') upgrade = _multi_cfg_bool_get(cfg, 'package_upgrade', 'apt_upgrade') diff --git a/cloudinit/config/cc_phone_home.py b/cloudinit/config/cc_phone_home.py index 2e058ccd..b2246807 100644 --- a/cloudinit/config/cc_phone_home.py +++ b/cloudinit/config/cc_phone_home.py @@ -44,6 +44,8 @@ POST_LIST_ALL = [ # post: [ pub_key_dsa, pub_key_rsa, pub_key_ecdsa, instance_id # def handle(name, cfg, cloud, log, args): + if cloud.is_excluded(name): + return if len(args) != 0: ph_cfg = util.read_conf(args[0]) else: diff --git a/cloudinit/config/cc_power_state_change.py b/cloudinit/config/cc_power_state_change.py index e3150808..12ac2b92 100644 --- a/cloudinit/config/cc_power_state_change.py +++ b/cloudinit/config/cc_power_state_change.py @@ -31,7 +31,8 @@ EXIT_FAIL = 254 def handle(_name, cfg, _cloud, log, _args): - + if _cloud.is_excluded(_name): + return try: (args, timeout) = load_power_state(cfg) if args is None: diff --git a/cloudinit/config/cc_puppet.py b/cloudinit/config/cc_puppet.py index 471a1a8a..35fbb251 100644 --- a/cloudinit/config/cc_puppet.py +++ b/cloudinit/config/cc_puppet.py @@ -49,6 +49,8 @@ def _autostart_puppet(log): def handle(name, cfg, cloud, log, _args): + if cloud.is_excluded(name): + return # If there isn't a puppet key in the configuration don't do anything if 'puppet' not in cfg: log.debug(("Skipping module named %s," diff --git a/cloudinit/config/cc_resizefs.py b/cloudinit/config/cc_resizefs.py index 56040fdd..73a9217a 100644 --- a/cloudinit/config/cc_resizefs.py +++ b/cloudinit/config/cc_resizefs.py @@ -52,6 +52,8 @@ NOBLOCK = "noblock" def handle(name, cfg, _cloud, log, args): + if _cloud.is_excluded(name): + return if len(args) != 0: resize_root = args[0] else: diff --git a/cloudinit/config/cc_resolv_conf.py b/cloudinit/config/cc_resolv_conf.py index 879b62b1..707402b7 100644 --- a/cloudinit/config/cc_resolv_conf.py +++ b/cloudinit/config/cc_resolv_conf.py @@ -92,6 +92,8 @@ def handle(name, cfg, _cloud, log, _args): @param log: Pre-initialized Python logger object to use for logging. @param args: Any module arguments from cloud.cfg """ + if _cloud.is_excluded(name): + return if "manage_resolv_conf" not in cfg: log.debug(("Skipping module named %s," " no 'manage_resolv_conf' key in configuration"), name) diff --git a/cloudinit/config/cc_rightscale_userdata.py b/cloudinit/config/cc_rightscale_userdata.py index c771728d..b07e7a3e 100644 --- a/cloudinit/config/cc_rightscale_userdata.py +++ b/cloudinit/config/cc_rightscale_userdata.py @@ -50,6 +50,8 @@ MY_HOOKNAME = 'CLOUD_INIT_REMOTE_HOOK' def handle(name, _cfg, cloud, log, _args): + if cloud.is_excluded(name): + return try: ud = cloud.get_userdata_raw() except: diff --git a/cloudinit/config/cc_rsyslog.py b/cloudinit/config/cc_rsyslog.py index 0c2c6880..89587d9f 100644 --- a/cloudinit/config/cc_rsyslog.py +++ b/cloudinit/config/cc_rsyslog.py @@ -35,6 +35,8 @@ def handle(name, cfg, cloud, log, _args): # *.* @@syslogd.example.com # process 'rsyslog' + if cloud.is_excluded(name): + return if not 'rsyslog' in cfg: log.debug(("Skipping module named %s," " no 'rsyslog' key in configuration"), name) diff --git a/cloudinit/config/cc_salt_minion.py b/cloudinit/config/cc_salt_minion.py index 53013dcb..307e6a48 100644 --- a/cloudinit/config/cc_salt_minion.py +++ b/cloudinit/config/cc_salt_minion.py @@ -22,6 +22,8 @@ from cloudinit import util def handle(name, cfg, cloud, log, _args): + if cloud.is_excluded(name): + return # If there isn't a salt key in the configuration don't do anything if 'salt_minion' not in cfg: log.debug(("Skipping module named %s," diff --git a/cloudinit/config/cc_seed_random.py b/cloudinit/config/cc_seed_random.py index 22a31f29..2b695ee7 100644 --- a/cloudinit/config/cc_seed_random.py +++ b/cloudinit/config/cc_seed_random.py @@ -39,6 +39,8 @@ def _decode(data, encoding=None): def handle(name, cfg, cloud, log, _args): + if cloud.is_excluded(name): + return if not cfg or "random_seed" not in cfg: log.debug(("Skipping module named %s, " "no 'random_seed' configuration found"), name) diff --git a/cloudinit/config/cc_set_hostname.py b/cloudinit/config/cc_set_hostname.py index 5d7f4331..fe8e5e47 100644 --- a/cloudinit/config/cc_set_hostname.py +++ b/cloudinit/config/cc_set_hostname.py @@ -22,6 +22,8 @@ from cloudinit import util def handle(name, cfg, cloud, log, _args): + if cloud.is_excluded(name): + return if util.get_cfg_option_bool(cfg, "preserve_hostname", False): log.debug(("Configuration option 'preserve_hostname' is set," " not setting the hostname in module %s"), name) diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py index 579735ed..fc76edab 100644 --- a/cloudinit/config/cc_set_passwords.py +++ b/cloudinit/config/cc_set_passwords.py @@ -36,6 +36,8 @@ PW_SET = (letters.translate(None, 'loLOI') + def handle(_name, cfg, cloud, log, args): + if cloud.is_excluded(_name): + return if len(args) != 0: # if run from command line, and give args, wipe the chpasswd['list'] password = args[0] diff --git a/cloudinit/config/cc_ssh.py b/cloudinit/config/cc_ssh.py index 64a5e3cb..0dc1d15d 100644 --- a/cloudinit/config/cc_ssh.py +++ b/cloudinit/config/cc_ssh.py @@ -56,7 +56,8 @@ KEY_FILE_TPL = '/etc/ssh/ssh_host_%s_key' def handle(_name, cfg, cloud, log, _args): - + if cloud.is_excluded(_name): + return # remove the static keys from the pristine image if cfg.get("ssh_deletekeys", True): key_pth = os.path.join("/etc/ssh/", "ssh_host_*key*") diff --git a/cloudinit/config/cc_ssh_authkey_fingerprints.py b/cloudinit/config/cc_ssh_authkey_fingerprints.py index be8083db..948bbba0 100644 --- a/cloudinit/config/cc_ssh_authkey_fingerprints.py +++ b/cloudinit/config/cc_ssh_authkey_fingerprints.py @@ -92,6 +92,8 @@ def _pprint_key_entries(user, key_fn, key_entries, hash_meth='md5', def handle(name, cfg, cloud, log, _args): + if cloud.is_excluded(name): + return if 'no_ssh_fingerprints' in cfg: log.debug(("Skipping module named %s, " "logging of ssh fingerprints disabled"), name) diff --git a/cloudinit/config/cc_ssh_import_id.py b/cloudinit/config/cc_ssh_import_id.py index 50d96e15..51e0bc0b 100644 --- a/cloudinit/config/cc_ssh_import_id.py +++ b/cloudinit/config/cc_ssh_import_id.py @@ -32,7 +32,8 @@ distros = ['ubuntu'] def handle(_name, cfg, cloud, log, args): - + if cloud.is_excluded(_name): + return # import for "user: XXXXX" if len(args) != 0: user = args[0] diff --git a/cloudinit/config/cc_timezone.py b/cloudinit/config/cc_timezone.py index b9eb85b2..da195b0a 100644 --- a/cloudinit/config/cc_timezone.py +++ b/cloudinit/config/cc_timezone.py @@ -26,6 +26,8 @@ frequency = PER_INSTANCE def handle(name, cfg, cloud, log, args): + if cloud.is_excluded(name): + return if len(args) != 0: timezone = args[0] else: diff --git a/cloudinit/config/cc_update_etc_hosts.py b/cloudinit/config/cc_update_etc_hosts.py index d3dd1f32..ce0a3ae8 100644 --- a/cloudinit/config/cc_update_etc_hosts.py +++ b/cloudinit/config/cc_update_etc_hosts.py @@ -27,6 +27,8 @@ frequency = PER_ALWAYS def handle(name, cfg, cloud, log, _args): + if cloud.is_excluded(name): + return manage_hosts = util.get_cfg_option_str(cfg, "manage_etc_hosts", False) if util.translate_bool(manage_hosts, addons=['template']): (hostname, fqdn) = util.get_hostname_fqdn(cfg, cloud) diff --git a/cloudinit/config/cc_update_hostname.py b/cloudinit/config/cc_update_hostname.py index e396ba13..5ee38630 100644 --- a/cloudinit/config/cc_update_hostname.py +++ b/cloudinit/config/cc_update_hostname.py @@ -27,6 +27,8 @@ frequency = PER_ALWAYS def handle(name, cfg, cloud, log, _args): + if cloud.is_excluded(name): + return if util.get_cfg_option_bool(cfg, "preserve_hostname", False): log.debug(("Configuration option 'preserve_hostname' is set," " not updating the hostname in module %s"), name) diff --git a/cloudinit/config/cc_users_groups.py b/cloudinit/config/cc_users_groups.py index bf5b4581..7ddd9f2d 100644 --- a/cloudinit/config/cc_users_groups.py +++ b/cloudinit/config/cc_users_groups.py @@ -27,6 +27,8 @@ frequency = PER_INSTANCE def handle(name, cfg, cloud, _log, _args): + if cloud.is_excluded(name): + return (users, groups) = ds.normalize_users_groups(cfg, cloud.distro) for (name, members) in groups.items(): cloud.distro.create_group(name, members) diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py index 5c273825..93b570a0 100644 --- a/cloudinit/config/cc_yum_add_repo.py +++ b/cloudinit/config/cc_yum_add_repo.py @@ -58,6 +58,8 @@ def _format_repository_config(repo_id, repo_config): def handle(name, cfg, _cloud, log, _args): + if _cloud.is_excluded(name): + return repos = cfg.get('yum_repos') if not repos: log.debug(("Skipping module named %s," diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 9c9ac384..a6d1e6c6 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -54,12 +54,20 @@ 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.excluded_modules: + distro = getattr(self, name, None) or getattr(self, 'osfamily') + LOG.debug(("Skipping module named %s, distro excluded"), name, + distro) + return True + @abc.abstractmethod def install_packages(self, pkglist): raise NotImplementedError() diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py index 565c68ed..fbd96b36 100644 --- a/cloudinit/distros/gentoo.py +++ b/cloudinit/distros/gentoo.py @@ -38,6 +38,7 @@ class Distro(distros.Distro): tz_conf_fn = "/etc/timezone" tz_local_fn = "/etc/localtime" init_cmd = [''] + exclude_modules = ['grub_dpkg', 'apt_configure'] def __init__(self, name, cfg, paths): distros.Distro.__init__(self, name, cfg, paths) |