From 4fe439b9e137e0b59d00e919dc16aea9da35082a Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Wed, 15 Jan 2014 17:18:32 -0700 Subject: Fix for race condition where 'captured' Windows Azure instances identify as the previous instance (LP: #1269626). --- cloudinit/sources/DataSourceAzure.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'cloudinit') diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index 97f151d6..448915d7 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -93,6 +93,12 @@ class DataSourceAzureNet(sources.DataSource): try: if cdev.startswith("/dev/"): ret = util.mount_cb(cdev, load_azure_ds_dir) + + # If we load the OVF from a device, it means that a + # new ovf-env.xml has been found. (LP: #1269626) + if os.path.exists(ddir): + LOG.info("removing old agent directory %s" % ddir) + util.del_dir(ddir) else: ret = load_azure_ds_dir(cdev) -- cgit v1.2.3 From 7e2d084eabbabd035e56a65c52b277a0732b09d5 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Thu, 23 Jan 2014 16:51:49 -0600 Subject: Initial add Gentoo distro --- cloudinit/distros/__init__.py | 3 +- cloudinit/distros/gentoo.py | 169 +++++++++++++++++++++++++++++++++++++++ setup.py | 6 +- sysvinit/gentoo/cloud-config | 14 ++++ sysvinit/gentoo/cloud-final | 11 +++ sysvinit/gentoo/cloud-init | 12 +++ sysvinit/gentoo/cloud-init-local | 13 +++ 7 files changed, 225 insertions(+), 3 deletions(-) create mode 100644 cloudinit/distros/gentoo.py create mode 100644 sysvinit/gentoo/cloud-config create mode 100644 sysvinit/gentoo/cloud-final create mode 100644 sysvinit/gentoo/cloud-init create mode 100644 sysvinit/gentoo/cloud-init-local (limited to 'cloudinit') diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 74e95797..2b821926 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -39,7 +39,8 @@ from cloudinit.distros.parsers import hosts OSFAMILIES = { 'debian': ['debian', 'ubuntu'], 'redhat': ['fedora', 'rhel'], - 'suse': ['sles'] + 'suse': ['sles'], + 'gentoo': ['gentoo'], } LOG = logging.getLogger(__name__) diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py new file mode 100644 index 00000000..b6291dc6 --- /dev/null +++ b/cloudinit/distros/gentoo.py @@ -0,0 +1,169 @@ +# vi: ts=4 expandtab +# +# Copyright (C) 2012 Canonical Ltd. +# Copyright (C) 2012 Hewlett-Packard Development Company, L.P. +# Copyright (C) 2012 Yahoo! Inc. +# +# Author: Scott Moser +# Author: Juerg Haefliger +# Author: Joshua Harlow +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3, as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from cloudinit import distros +from cloudinit import helpers +from cloudinit import log as logging +from cloudinit import util + +from cloudinit.distros.parsers.hostname import HostnameConf + +from cloudinit.settings import PER_INSTANCE + +LOG = logging.getLogger(__name__) + + +class Distro(distros.Distro): + locale_conf_fn = "/etc/locale.gen" + network_conf_fn = "/etc/conf.d/net" + tz_conf_fn = "/etc/timezone" + tz_local_fn = "/etc/localtime" + + def __init__(self, name, cfg, paths): + distros.Distro.__init__(self, name, cfg, paths) + # This will be used to restrict certain + # calls from repeatly happening (when they + # should only happen say once per instance...) + self._runner = helpers.Runners(paths) + self.osfamily = 'gentoo' + + def apply_locale(self, locale, out_fn=None): + if not out_fn: + out_fn = self.locale_conf_fn + util.subp(['locale-gen', '-G', locale], capture=False) + # "" provides trailing newline during join + lines = [ + util.make_header(), + 'LANG="%s"' % (locale), + "", + ] + util.write_file(out_fn, "\n".join(lines)) + + def install_packages(self, pkglist): + self.update_package_sources() + self.package_command('install', pkgs=pkglist) + + def _write_network(self, settings): + util.write_file(self.network_conf_fn, settings) + return ['all'] + + # TODO(NateH): Update to use init scripts + def _bring_up_interface(self, device_name): + cmd = ['ifup', device_name] + LOG.debug("Attempting to run bring up interface %s using command %s", + device_name, cmd) + try: + (_out, err) = util.subp(cmd) + if len(err): + LOG.warn("Running %s resulted in stderr output: %s", cmd, err) + return True + except util.ProcessExecutionError: + util.logexc(LOG, "Running interface command %s failed", cmd) + return False + + # TODO(NateH): Refactor for gentoo net init scripts + def _bring_up_interfaces(self, device_names): + use_all = False + for d in device_names: + if d == 'all': + use_all = True + if use_all: + return distros.Distro._bring_up_interface(self, '--all') + else: + return distros.Distro._bring_up_interfaces(self, device_names) + + def _select_hostname(self, hostname, fqdn): + # Prefer the short hostname over the long + # fully qualified domain name + if not hostname: + return fqdn + return hostname + + def _write_hostname(self, your_hostname, out_fn): + conf = None + try: + # Try to update the previous one + # so lets see if we can read it first. + conf = self._read_hostname_conf(out_fn) + except IOError: + pass + if not conf: + conf = HostnameConf('') + conf.set_hostname(your_hostname) + util.write_file(out_fn, str(conf), 0644) + + def _read_system_hostname(self): + sys_hostname = self._read_hostname(self.hostname_conf_fn) + return (self.hostname_conf_fn, sys_hostname) + + def _read_hostname_conf(self, filename): + conf = HostnameConf(util.load_file(filename)) + conf.parse() + return conf + + def _read_hostname(self, filename, default=None): + hostname = None + try: + conf = self._read_hostname_conf(filename) + hostname = conf.hostname + except IOError: + pass + if not hostname: + return default + return hostname + + def set_timezone(self, tz): + tz_file = self._find_tz_file(tz) + # Note: "" provides trailing newline during join + tz_lines = [ + util.make_header(), + str(tz), + "", + ] + util.write_file(self.tz_conf_fn, "\n".join(tz_lines)) + # This ensures that the correct tz will be used for the system + util.copy(tz_file, self.tz_local_fn) + + def package_command(self, command, args=None, pkgs=None): + if pkgs is None: + pkgs = [] + + cmd = ['emerge'] + # Redirect output + cmd.append("--quiet") + + if args and isinstance(args, str): + cmd.append(args) + elif args and isinstance(args, list): + cmd.extend(args) + + cmd.append(command) + + pkglist = util.expand_package_list('%s-%s', pkgs) + cmd.extend(pkglist) + + # Allow the output of this to flow outwards (ie not be captured) + util.subp(cmd, capture=False) + + def update_package_sources(self): + self._runner.run("update-sources", self.package_command, + ["-u", "world", "--quiet"], freq=PER_INSTANCE) diff --git a/setup.py b/setup.py index 8d18b97e..08a8d771 100755 --- a/setup.py +++ b/setup.py @@ -39,12 +39,14 @@ def is_f(p): INITSYS_FILES = { 'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)], 'sysvinit_deb': [f for f in glob('sysvinit/debian/*') if is_f(f)], + 'sysvinit_gentoo': [f for f in glob('sysvinit/gentoo/*') if is_f(f)], 'systemd': [f for f in glob('systemd/*') if is_f(f)], 'upstart': [f for f in glob('upstart/*') if is_f(f)], } INITSYS_ROOTS = { 'sysvinit': '/etc/rc.d/init.d', 'sysvinit_deb': '/etc/init.d', + 'sysvinit_gentoo': '/etc/init.d', 'systemd': '/etc/systemd/system/', 'upstart': '/etc/init/', } @@ -63,7 +65,7 @@ def tiny_p(cmd, capture=True): (out, err) = sp.communicate() ret = sp.returncode # pylint: disable=E1101 if ret not in [0]: - raise RuntimeError("Failed running %s [rc=%s] (%s, %s)" + raise RuntimeError("Failed running %s [rc=%s] (%s, %s)" % (cmd, ret, out, err)) return (out, err) @@ -102,7 +104,7 @@ class InitsysInstallData(install): " specifying a init system!") % (", ".join(INITSYS_TYPES))) elif self.init_system: self.distribution.data_files.append( - (INITSYS_ROOTS[self.init_system], + (INITSYS_ROOTS[self.init_system], INITSYS_FILES[self.init_system])) # Force that command to reinitalize (with new file list) self.distribution.reinitialize_command('install_data', True) diff --git a/sysvinit/gentoo/cloud-config b/sysvinit/gentoo/cloud-config new file mode 100644 index 00000000..affd0cb3 --- /dev/null +++ b/sysvinit/gentoo/cloud-config @@ -0,0 +1,14 @@ +#!/sbin/runscript + +depend() { + after net # remove after nova-agent fix + before cloud-init-local + before cloud-init + before cloud-final + provide cloud-config +} + +start() { + cloud-init modules --mode config + eend 0 +} diff --git a/sysvinit/gentoo/cloud-final b/sysvinit/gentoo/cloud-final new file mode 100644 index 00000000..140c0f8e --- /dev/null +++ b/sysvinit/gentoo/cloud-final @@ -0,0 +1,11 @@ +#!/sbin/runscript +# add depends for network, dns, fs etc +depend() { + after cloud-init + provide cloud-final +} + +start() { + cloud-init modules --mode final + eend 0 +} diff --git a/sysvinit/gentoo/cloud-init b/sysvinit/gentoo/cloud-init new file mode 100644 index 00000000..6f3ff8ed --- /dev/null +++ b/sysvinit/gentoo/cloud-init @@ -0,0 +1,12 @@ +#!/sbin/runscript +# add depends for network, dns, fs etc +depend() { + after cloud-init-local + before cloud-final + provide cloud-init +} + +start() { + cloud-init init + eend 0 +} diff --git a/sysvinit/gentoo/cloud-init-local b/sysvinit/gentoo/cloud-init-local new file mode 100644 index 00000000..7c39ff78 --- /dev/null +++ b/sysvinit/gentoo/cloud-init-local @@ -0,0 +1,13 @@ +#!/sbin/runscript + +depend() { + after cloud-config + before cloud-init + before cloud-final + provide cloud-init-local +} + +start() { + cloud-init init --local + eend 0 +} -- cgit v1.2.3 From f64cd3d53fb09fb41104f600ead60eefe9dbd4ab Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Thu, 23 Jan 2014 21:31:53 -0600 Subject: Package manager install / update fixes and service restart foo --- cloudinit/config/cc_set_passwords.py | 2 +- cloudinit/distros/debian.py | 1 + cloudinit/distros/gentoo.py | 2 +- cloudinit/distros/rhel.py | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py index 56a36906..06974248 100644 --- a/cloudinit/config/cc_set_passwords.py +++ b/cloudinit/config/cc_set_passwords.py @@ -136,7 +136,7 @@ def handle(_name, cfg, cloud, log, args): util.write_file(ssh_util.DEF_SSHD_CFG, "\n".join(lines)) try: - cmd = ['service'] + cmd = cloud.distro.init_cmd or ['service'] cmd.append(cloud.distro.get_option('ssh_svcname', 'ssh')) cmd.append('restart') util.subp(cmd) diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py index 1ae232fd..3b912728 100644 --- a/cloudinit/distros/debian.py +++ b/cloudinit/distros/debian.py @@ -48,6 +48,7 @@ class Distro(distros.Distro): network_conf_fn = "/etc/network/interfaces" tz_conf_fn = "/etc/timezone" tz_local_fn = "/etc/localtime" + init_cmd = ['service'] 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 b6291dc6..82d49fc3 100644 --- a/cloudinit/distros/gentoo.py +++ b/cloudinit/distros/gentoo.py @@ -60,7 +60,7 @@ class Distro(distros.Distro): def install_packages(self, pkglist): self.update_package_sources() - self.package_command('install', pkgs=pkglist) + self.package_command('', pkgs=pkglist) def _write_network(self, settings): util.write_file(self.network_conf_fn, settings) diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py index 30195384..7cc7a813 100644 --- a/cloudinit/distros/rhel.py +++ b/cloudinit/distros/rhel.py @@ -49,6 +49,7 @@ class Distro(distros.Distro): network_script_tpl = '/etc/sysconfig/network-scripts/ifcfg-%s' resolve_conf_fn = "/etc/resolv.conf" tz_local_fn = "/etc/localtime" + init_cmd = ['service'] def __init__(self, name, cfg, paths): distros.Distro.__init__(self, name, cfg, paths) -- cgit v1.2.3 From 29780092f57931d7c22bfbf3af37dea00edc76c9 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Fri, 24 Jan 2014 13:14:12 -0600 Subject: init_cmd distro unique supports gentoo init scripts --- cloudinit/config/cc_set_passwords.py | 2 +- cloudinit/distros/__init__.py | 1 + cloudinit/distros/gentoo.py | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py index 06974248..579735ed 100644 --- a/cloudinit/config/cc_set_passwords.py +++ b/cloudinit/config/cc_set_passwords.py @@ -136,7 +136,7 @@ def handle(_name, cfg, cloud, log, args): util.write_file(ssh_util.DEF_SSHD_CFG, "\n".join(lines)) try: - cmd = cloud.distro.init_cmd or ['service'] + cmd = cloud.distro.init_cmd cmd.append(cloud.distro.get_option('ssh_svcname', 'ssh')) cmd.append('restart') util.subp(cmd) diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 2b821926..61904b6f 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -53,6 +53,7 @@ class Distro(object): ci_sudoers_fn = "/etc/sudoers.d/90-cloud-init-users" hostname_conf_fn = "/etc/hostname" tz_zone_dir = "/usr/share/zoneinfo" + init_cmd = [] # Not implemented def __init__(self, name, cfg, paths): self._paths = paths diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py index 82d49fc3..ede40bff 100644 --- a/cloudinit/distros/gentoo.py +++ b/cloudinit/distros/gentoo.py @@ -156,7 +156,8 @@ class Distro(distros.Distro): elif args and isinstance(args, list): cmd.extend(args) - cmd.append(command) + if command: + cmd.append(command) pkglist = util.expand_package_list('%s-%s', pkgs) cmd.extend(pkglist) -- cgit v1.2.3 From 8f6c9ff5ed7e301db2efa9ffa9a4bf454eb819e9 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Mon, 27 Jan 2014 11:43:13 -0600 Subject: init_cmd inheritance fixes --- cloudinit/distros/__init__.py | 2 +- cloudinit/distros/debian.py | 1 - cloudinit/distros/gentoo.py | 1 + cloudinit/distros/rhel.py | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 61904b6f..9c9ac384 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -53,7 +53,7 @@ class Distro(object): ci_sudoers_fn = "/etc/sudoers.d/90-cloud-init-users" hostname_conf_fn = "/etc/hostname" tz_zone_dir = "/usr/share/zoneinfo" - init_cmd = [] # Not implemented + init_cmd = ['service'] # systemctl, service etc def __init__(self, name, cfg, paths): self._paths = paths diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py index 3b912728..1ae232fd 100644 --- a/cloudinit/distros/debian.py +++ b/cloudinit/distros/debian.py @@ -48,7 +48,6 @@ class Distro(distros.Distro): network_conf_fn = "/etc/network/interfaces" tz_conf_fn = "/etc/timezone" tz_local_fn = "/etc/localtime" - init_cmd = ['service'] 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 ede40bff..565c68ed 100644 --- a/cloudinit/distros/gentoo.py +++ b/cloudinit/distros/gentoo.py @@ -37,6 +37,7 @@ class Distro(distros.Distro): network_conf_fn = "/etc/conf.d/net" tz_conf_fn = "/etc/timezone" tz_local_fn = "/etc/localtime" + init_cmd = [''] def __init__(self, name, cfg, paths): distros.Distro.__init__(self, name, cfg, paths) diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py index 7cc7a813..30195384 100644 --- a/cloudinit/distros/rhel.py +++ b/cloudinit/distros/rhel.py @@ -49,7 +49,6 @@ class Distro(distros.Distro): network_script_tpl = '/etc/sysconfig/network-scripts/ifcfg-%s' resolve_conf_fn = "/etc/resolv.conf" tz_local_fn = "/etc/localtime" - init_cmd = ['service'] def __init__(self, name, cfg, paths): distros.Distro.__init__(self, name, cfg, paths) -- cgit v1.2.3 From 309457a96a84132d2e570bf902c464b2a1aa9d0b Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Mon, 27 Jan 2014 12:22:21 -0600 Subject: Adds distro module exclude support --- cloudinit/config/cc_apt_configure.py | 2 ++ cloudinit/config/cc_apt_pipelining.py | 3 ++- cloudinit/config/cc_byobu.py | 2 ++ cloudinit/config/cc_ca_certs.py | 2 ++ cloudinit/config/cc_chef.py | 3 ++- cloudinit/config/cc_disk_setup.py | 2 ++ cloudinit/config/cc_emit_upstart.py | 2 ++ cloudinit/config/cc_growpart.py | 2 ++ cloudinit/config/cc_grub_dpkg.py | 3 +++ cloudinit/config/cc_keys_to_console.py | 2 ++ cloudinit/config/cc_landscape.py | 2 ++ cloudinit/config/cc_locale.py | 2 ++ cloudinit/config/cc_mcollective.py | 3 ++- cloudinit/config/cc_migrator.py | 2 ++ cloudinit/config/cc_mounts.py | 2 ++ cloudinit/config/cc_package_update_upgrade_install.py | 2 ++ cloudinit/config/cc_phone_home.py | 2 ++ cloudinit/config/cc_power_state_change.py | 3 ++- cloudinit/config/cc_puppet.py | 2 ++ cloudinit/config/cc_resizefs.py | 2 ++ cloudinit/config/cc_resolv_conf.py | 2 ++ cloudinit/config/cc_rightscale_userdata.py | 2 ++ cloudinit/config/cc_rsyslog.py | 2 ++ cloudinit/config/cc_salt_minion.py | 2 ++ cloudinit/config/cc_seed_random.py | 2 ++ cloudinit/config/cc_set_hostname.py | 2 ++ cloudinit/config/cc_set_passwords.py | 2 ++ cloudinit/config/cc_ssh.py | 3 ++- cloudinit/config/cc_ssh_authkey_fingerprints.py | 2 ++ cloudinit/config/cc_ssh_import_id.py | 3 ++- cloudinit/config/cc_timezone.py | 2 ++ cloudinit/config/cc_update_etc_hosts.py | 2 ++ cloudinit/config/cc_update_hostname.py | 2 ++ cloudinit/config/cc_users_groups.py | 2 ++ cloudinit/config/cc_yum_add_repo.py | 2 ++ cloudinit/distros/__init__.py | 8 ++++++++ cloudinit/distros/gentoo.py | 1 + 37 files changed, 80 insertions(+), 6 deletions(-) (limited to 'cloudinit') 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) -- cgit v1.2.3 From 79d1eccc9fa751325fcb574fd9385a14bf2bbba6 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Mon, 27 Jan 2014 16:34:35 -0600 Subject: Removed excessive is_excluded module calls --- cloudinit/config/cc_apt_configure.py | 2 +- cloudinit/config/cc_apt_pipelining.py | 2 +- cloudinit/config/cc_byobu.py | 3 +-- cloudinit/config/cc_ca_certs.py | 3 +-- cloudinit/config/cc_chef.py | 3 +-- cloudinit/config/cc_emit_upstart.py | 2 +- cloudinit/config/cc_grub_dpkg.py | 2 +- cloudinit/config/cc_keys_to_console.py | 2 +- cloudinit/config/cc_landscape.py | 2 -- cloudinit/config/cc_locale.py | 3 +-- cloudinit/config/cc_mcollective.py | 3 +-- cloudinit/config/cc_migrator.py | 3 +-- cloudinit/config/cc_mounts.py | 3 +-- cloudinit/config/cc_package_update_upgrade_install.py | 3 +-- cloudinit/config/cc_phone_home.py | 3 +-- cloudinit/config/cc_power_state_change.py | 3 +-- cloudinit/config/cc_resizefs.py | 3 +-- cloudinit/config/cc_resolv_conf.py | 3 +-- cloudinit/config/cc_rightscale_userdata.py | 3 +-- cloudinit/config/cc_rsyslog.py | 3 +-- cloudinit/config/cc_salt_minion.py | 3 +-- cloudinit/config/cc_yum_add_repo.py | 2 +- 22 files changed, 21 insertions(+), 38 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py index a1be7514..ccb45bb9 100644 --- a/cloudinit/config/cc_apt_configure.py +++ b/cloudinit/config/cc_apt_configure.py @@ -51,7 +51,7 @@ EXPORT_GPG_KEYID = """ def handle(name, cfg, cloud, log, _args): - if cloud.is_excluded(name): + if cloud.distro.is_excluded(name): return release = get_release() mirrors = find_apt_mirror_info(cloud, cfg) diff --git a/cloudinit/config/cc_apt_pipelining.py b/cloudinit/config/cc_apt_pipelining.py index 15e509ac..bd180e82 100644 --- a/cloudinit/config/cc_apt_pipelining.py +++ b/cloudinit/config/cc_apt_pipelining.py @@ -35,7 +35,7 @@ APT_PIPE_TPL = ("//Written by cloud-init per 'apt_pipelining'\n" def handle(_name, cfg, _cloud, log, _args): - if _cloud.is_excluded(_name): + 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_byobu.py b/cloudinit/config/cc_byobu.py index f708ca5f..4821693b 100644 --- a/cloudinit/config/cc_byobu.py +++ b/cloudinit/config/cc_byobu.py @@ -29,8 +29,7 @@ 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 97af3705..7b339274 100644 --- a/cloudinit/config/cc_ca_certs.py +++ b/cloudinit/config/cc_ca_certs.py @@ -79,8 +79,7 @@ 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 a74c4d27..727769cd 100644 --- a/cloudinit/config/cc_chef.py +++ b/cloudinit/config/cc_chef.py @@ -40,8 +40,7 @@ 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_emit_upstart.py b/cloudinit/config/cc_emit_upstart.py index 4392c1f5..5c2f6a31 100644 --- a/cloudinit/config/cc_emit_upstart.py +++ b/cloudinit/config/cc_emit_upstart.py @@ -29,7 +29,7 @@ distros = ['ubuntu', 'debian'] def handle(name, _cfg, cloud, log, args): - if cloud.is_excluded(name): + if cloud.distro.is_excluded(name): return event_names = args if not event_names: diff --git a/cloudinit/config/cc_grub_dpkg.py b/cloudinit/config/cc_grub_dpkg.py index ada0f472..3fd92426 100644 --- a/cloudinit/config/cc_grub_dpkg.py +++ b/cloudinit/config/cc_grub_dpkg.py @@ -30,7 +30,7 @@ def handle(_name, cfg, _cloud, log, _args): idevs = None idevs_empty = None - if _cloud.is_excluded(_name): + if _cloud.distro.is_excluded(_name): return if "grub-dpkg" in cfg: idevs = util.get_cfg_option_str(cfg["grub-dpkg"], diff --git a/cloudinit/config/cc_keys_to_console.py b/cloudinit/config/cc_keys_to_console.py index ae47438a..c9563e25 100644 --- a/cloudinit/config/cc_keys_to_console.py +++ b/cloudinit/config/cc_keys_to_console.py @@ -30,7 +30,7 @@ HELPER_TOOL = '/usr/lib/cloud-init/write-ssh-key-fingerprints' def handle(name, cfg, _cloud, log, _args): - if _cloud.is_excluded(name): + if _cloud.distro.is_excluded(name): return if not os.path.exists(HELPER_TOOL): log.warn(("Unable to activate module %s," diff --git a/cloudinit/config/cc_landscape.py b/cloudinit/config/cc_landscape.py index 645b059d..8a709677 100644 --- a/cloudinit/config/cc_landscape.py +++ b/cloudinit/config/cc_landscape.py @@ -56,8 +56,6 @@ 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 a3f0933a..68399993 100644 --- a/cloudinit/config/cc_locale.py +++ b/cloudinit/config/cc_locale.py @@ -22,8 +22,7 @@ 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 76e149f5..b670390d 100644 --- a/cloudinit/config/cc_mcollective.py +++ b/cloudinit/config/cc_mcollective.py @@ -33,8 +33,7 @@ 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 b9a012f5..f7b2211a 100644 --- a/cloudinit/config/cc_migrator.py +++ b/cloudinit/config/cc_migrator.py @@ -75,8 +75,7 @@ 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 1476d19f..c1ac76d4 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -76,8 +76,7 @@ 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 86e1d25b..85bc0240 100644 --- a/cloudinit/config/cc_package_update_upgrade_install.py +++ b/cloudinit/config/cc_package_update_upgrade_install.py @@ -49,8 +49,7 @@ 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 b2246807..360fd83e 100644 --- a/cloudinit/config/cc_phone_home.py +++ b/cloudinit/config/cc_phone_home.py @@ -44,8 +44,7 @@ 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 12ac2b92..e3150808 100644 --- a/cloudinit/config/cc_power_state_change.py +++ b/cloudinit/config/cc_power_state_change.py @@ -31,8 +31,7 @@ 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_resizefs.py b/cloudinit/config/cc_resizefs.py index 73a9217a..43cc9307 100644 --- a/cloudinit/config/cc_resizefs.py +++ b/cloudinit/config/cc_resizefs.py @@ -52,8 +52,7 @@ 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 707402b7..feacebcd 100644 --- a/cloudinit/config/cc_resolv_conf.py +++ b/cloudinit/config/cc_resolv_conf.py @@ -92,8 +92,7 @@ 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 b07e7a3e..f99524d1 100644 --- a/cloudinit/config/cc_rightscale_userdata.py +++ b/cloudinit/config/cc_rightscale_userdata.py @@ -50,8 +50,7 @@ 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 89587d9f..7f70167e 100644 --- a/cloudinit/config/cc_rsyslog.py +++ b/cloudinit/config/cc_rsyslog.py @@ -35,8 +35,7 @@ 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 307e6a48..b48762c8 100644 --- a/cloudinit/config/cc_salt_minion.py +++ b/cloudinit/config/cc_salt_minion.py @@ -22,8 +22,7 @@ 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_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py index 93b570a0..f63e3e08 100644 --- a/cloudinit/config/cc_yum_add_repo.py +++ b/cloudinit/config/cc_yum_add_repo.py @@ -58,7 +58,7 @@ def _format_repository_config(repo_id, repo_config): def handle(name, cfg, _cloud, log, _args): - if _cloud.is_excluded(name): + if _cloud.distro.is_excluded(name): return repos = cfg.get('yum_repos') if not repos: -- cgit v1.2.3 From dd95d5e0a90031f19a68b255510476fb176126a6 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Tue, 28 Jan 2014 08:48:47 -0600 Subject: exclude modules fix 1 --- cloudinit/config/cc_disk_setup.py | 3 +-- cloudinit/config/cc_growpart.py | 3 +-- cloudinit/config/cc_puppet.py | 3 +-- cloudinit/config/cc_seed_random.py | 3 +-- cloudinit/config/cc_set_hostname.py | 3 +-- cloudinit/config/cc_set_passwords.py | 3 +-- cloudinit/config/cc_ssh.py | 3 +-- cloudinit/config/cc_ssh_authkey_fingerprints.py | 3 +-- cloudinit/config/cc_ssh_import_id.py | 3 +-- cloudinit/config/cc_timezone.py | 3 +-- cloudinit/config/cc_update_etc_hosts.py | 3 +-- cloudinit/config/cc_update_hostname.py | 3 +-- cloudinit/config/cc_users_groups.py | 3 +-- cloudinit/distros/__init__.py | 2 +- 14 files changed, 14 insertions(+), 27 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py index 7b5e2f3d..d0274ba6 100644 --- a/cloudinit/config/cc_disk_setup.py +++ b/cloudinit/config/cc_disk_setup.py @@ -40,8 +40,7 @@ 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_growpart.py b/cloudinit/config/cc_growpart.py index 91f472af..03b53a3c 100644 --- a/cloudinit/config/cc_growpart.py +++ b/cloudinit/config/cc_growpart.py @@ -213,8 +213,7 @@ 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_puppet.py b/cloudinit/config/cc_puppet.py index 35fbb251..717734d1 100644 --- a/cloudinit/config/cc_puppet.py +++ b/cloudinit/config/cc_puppet.py @@ -49,8 +49,7 @@ 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_seed_random.py b/cloudinit/config/cc_seed_random.py index 2b695ee7..1676dd0a 100644 --- a/cloudinit/config/cc_seed_random.py +++ b/cloudinit/config/cc_seed_random.py @@ -39,8 +39,7 @@ 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 fe8e5e47..38246b57 100644 --- a/cloudinit/config/cc_set_hostname.py +++ b/cloudinit/config/cc_set_hostname.py @@ -22,8 +22,7 @@ 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 fc76edab..b9dc0cc0 100644 --- a/cloudinit/config/cc_set_passwords.py +++ b/cloudinit/config/cc_set_passwords.py @@ -36,8 +36,7 @@ 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 0dc1d15d..64a5e3cb 100644 --- a/cloudinit/config/cc_ssh.py +++ b/cloudinit/config/cc_ssh.py @@ -56,8 +56,7 @@ 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 948bbba0..8b2708b1 100644 --- a/cloudinit/config/cc_ssh_authkey_fingerprints.py +++ b/cloudinit/config/cc_ssh_authkey_fingerprints.py @@ -92,8 +92,7 @@ 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 51e0bc0b..50d96e15 100644 --- a/cloudinit/config/cc_ssh_import_id.py +++ b/cloudinit/config/cc_ssh_import_id.py @@ -32,8 +32,7 @@ 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 da195b0a..bddcd0e9 100644 --- a/cloudinit/config/cc_timezone.py +++ b/cloudinit/config/cc_timezone.py @@ -26,8 +26,7 @@ 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 ce0a3ae8..3e3b4228 100644 --- a/cloudinit/config/cc_update_etc_hosts.py +++ b/cloudinit/config/cc_update_etc_hosts.py @@ -27,8 +27,7 @@ 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 5ee38630..56f6ebb7 100644 --- a/cloudinit/config/cc_update_hostname.py +++ b/cloudinit/config/cc_update_hostname.py @@ -27,8 +27,7 @@ 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 7ddd9f2d..30bf455d 100644 --- a/cloudinit/config/cc_users_groups.py +++ b/cloudinit/config/cc_users_groups.py @@ -27,8 +27,7 @@ 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/distros/__init__.py b/cloudinit/distros/__init__.py index a6d1e6c6..674c7293 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -62,7 +62,7 @@ class Distro(object): self.name = name def is_excluded(self, name): - if name in self.excluded_modules: + if name in self.exclude_modules: distro = getattr(self, name, None) or getattr(self, 'osfamily') LOG.debug(("Skipping module named %s, distro excluded"), name, distro) -- cgit v1.2.3 From 8a49ce7dd2b628291e6eef8a826308ddbe4f0520 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Tue, 28 Jan 2014 15:04:22 -0600 Subject: Updated exclude modules for gentoo distro. --- cloudinit/distros/__init__.py | 2 +- cloudinit/distros/gentoo.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 674c7293..e364080f 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -64,7 +64,7 @@ class Distro(object): 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 excluded"), name, + LOG.debug(("Skipping module named %s, distro %s excluded"), name, distro) return True diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py index fbd96b36..8b0355be 100644 --- a/cloudinit/distros/gentoo.py +++ b/cloudinit/distros/gentoo.py @@ -38,7 +38,7 @@ class Distro(distros.Distro): tz_conf_fn = "/etc/timezone" tz_local_fn = "/etc/localtime" init_cmd = [''] - exclude_modules = ['grub_dpkg', 'apt_configure'] + exclude_modules = ['grub-dpkg', 'apt-configure', 'apt-pipelining'] def __init__(self, name, cfg, paths): distros.Distro.__init__(self, name, cfg, paths) -- cgit v1.2.3 From c8bcf80d4153512450efa72b5ac2d1644a7904bd Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Sat, 1 Feb 2014 12:03:32 -0800 Subject: Fix incorrect return get_url_settings should return a pair of max wait and timeout and not false, fix this bug by checking the max_wait <= 0 in the calling function and returning correctly from there instead. --- cloudinit/sources/DataSourceEc2.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py index f010e640..1b20ecf3 100644 --- a/cloudinit/sources/DataSourceEc2.py +++ b/cloudinit/sources/DataSourceEc2.py @@ -92,12 +92,9 @@ class DataSourceEc2(sources.DataSource): except Exception: util.logexc(LOG, "Failed to get max wait. using %s", max_wait) - if max_wait == 0: - return False - timeout = 50 try: - timeout = int(mcfg.get("timeout", timeout)) + timeout = max(0, int(mcfg.get("timeout", timeout))) except Exception: util.logexc(LOG, "Failed to get timeout, using %s", timeout) @@ -109,6 +106,8 @@ class DataSourceEc2(sources.DataSource): mcfg = {} (max_wait, timeout) = self._get_url_settings() + if max_wait <= 0: + return False # Remove addresses from the list that wont resolve. mdurls = mcfg.get("metadata_urls", DEF_MD_URLS) -- cgit v1.2.3 From bc77232588dd587849e8b3b7fc599387b6c905fa Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Sun, 2 Feb 2014 17:11:59 -0600 Subject: Net interface up updates and override ssh_svcname to init scripts --- cloudinit/distros/gentoo.py | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py index 8b0355be..74431bf6 100644 --- a/cloudinit/distros/gentoo.py +++ b/cloudinit/distros/gentoo.py @@ -37,8 +37,13 @@ class Distro(distros.Distro): network_conf_fn = "/etc/conf.d/net" tz_conf_fn = "/etc/timezone" tz_local_fn = "/etc/localtime" - init_cmd = [''] - exclude_modules = ['grub-dpkg', 'apt-configure', 'apt-pipelining'] + init_cmd = [''] # 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) @@ -47,6 +52,8 @@ class Distro(distros.Distro): # should only happen say once per instance...) self._runner = helpers.Runners(paths) self.osfamily = 'gentoo' + # Fix sshd restarts + cfg['system_info']['ssh_svcname'] = '/etc/init.d/sshd' def apply_locale(self, locale, out_fn=None): if not out_fn: @@ -68,9 +75,8 @@ class Distro(distros.Distro): util.write_file(self.network_conf_fn, settings) return ['all'] - # TODO(NateH): Update to use init scripts def _bring_up_interface(self, device_name): - cmd = ['ifup', device_name] + cmd = ['/etc/init.d/net.%s' % device_name, 'restart'] LOG.debug("Attempting to run bring up interface %s using command %s", device_name, cmd) try: @@ -82,14 +88,24 @@ class Distro(distros.Distro): util.logexc(LOG, "Running interface command %s failed", cmd) return False - # TODO(NateH): Refactor for gentoo net init scripts def _bring_up_interfaces(self, device_names): use_all = False for d in device_names: if d == 'all': use_all = True if use_all: - return distros.Distro._bring_up_interface(self, '--all') + # Grab device names from init scripts + cmd = ['ls', '/etc/init.d/net.*'] + try: + (_out, err) = util.subp(cmd) + if len(err): + LOG.warn("Running %s resulted in stderr output: %s", cmd, + err) + except util.ProcessExecutionError: + util.logexc(LOG, "Running interface command %s failed", cmd) + return False + devices = [x.split('.')[2] for x in _out.split(' ')] + return distros.Distro._bring_up_interfaces(self, devices) else: return distros.Distro._bring_up_interfaces(self, device_names) -- cgit v1.2.3 From b997a8cab8b3b10f9be7e915a5ab4c2cc91effb8 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Mon, 3 Feb 2014 11:37:36 -0600 Subject: Fix sshd restart --- cloudinit/distros/gentoo.py | 10 +++------- cloudinit/util.py | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py index 74431bf6..e8778e15 100644 --- a/cloudinit/distros/gentoo.py +++ b/cloudinit/distros/gentoo.py @@ -1,12 +1,8 @@ # vi: ts=4 expandtab # -# Copyright (C) 2012 Canonical Ltd. -# Copyright (C) 2012 Hewlett-Packard Development Company, L.P. -# Copyright (C) 2012 Yahoo! Inc. +# Copyright (C) 2014 Rackspace, US Inc. # -# Author: Scott Moser -# Author: Juerg Haefliger -# Author: Joshua Harlow +# Author: Nate House # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License version 3, as @@ -53,7 +49,7 @@ class Distro(distros.Distro): self._runner = helpers.Runners(paths) self.osfamily = 'gentoo' # Fix sshd restarts - cfg['system_info']['ssh_svcname'] = '/etc/init.d/sshd' + cfg['ssh_svcname'] = '/etc/init.d/sshd' def apply_locale(self, locale, out_fn=None): if not out_fn: diff --git a/cloudinit/util.py b/cloudinit/util.py index 3ce54f28..54fdad20 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -1483,6 +1483,7 @@ def subp(args, data=None, rcs=None, env=None, capture=True, shell=False, logstring=False): if rcs is None: rcs = [0] + args = filter(None, args) # Remove empty arguments try: if not logstring: -- cgit v1.2.3 From 4a0e460f18d8cbf2651286565efec1f00cbb20cd Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Mon, 3 Feb 2014 15:58:43 -0600 Subject: Update yum unittest --- cloudinit/config/cc_set_passwords.py | 3 ++- cloudinit/util.py | 1 - tests/unittests/test_handler/test_handler_yum_add_repo.py | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py index b9dc0cc0..ab0ed5ad 100644 --- a/cloudinit/config/cc_set_passwords.py +++ b/cloudinit/config/cc_set_passwords.py @@ -137,9 +137,10 @@ def handle(_name, cfg, cloud, log, args): util.write_file(ssh_util.DEF_SSHD_CFG, "\n".join(lines)) try: - cmd = cloud.distro.init_cmd + cmd = cloud.distro.init_cmd # Default service cmd.append(cloud.distro.get_option('ssh_svcname', 'ssh')) cmd.append('restart') + cmd = filter(None, cmd) # Remove empty arguments util.subp(cmd) log.debug("Restarted the ssh daemon") except: diff --git a/cloudinit/util.py b/cloudinit/util.py index 54fdad20..3ce54f28 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -1483,7 +1483,6 @@ def subp(args, data=None, rcs=None, env=None, capture=True, shell=False, logstring=False): if rcs is None: rcs = [0] - args = filter(None, args) # Remove empty arguments try: if not logstring: diff --git a/tests/unittests/test_handler/test_handler_yum_add_repo.py b/tests/unittests/test_handler/test_handler_yum_add_repo.py index 8df592f9..ddf0ef9c 100644 --- a/tests/unittests/test_handler/test_handler_yum_add_repo.py +++ b/tests/unittests/test_handler/test_handler_yum_add_repo.py @@ -2,6 +2,7 @@ from cloudinit import helpers from cloudinit import util from cloudinit.config import cc_yum_add_repo +from cloudinit.distros import rhel from tests.unittests import helpers @@ -18,6 +19,8 @@ class TestConfig(helpers.FilesystemMockingTestCase): def setUp(self): super(TestConfig, self).setUp() self.tmp = self.makeDir(prefix="unittest_") + self.cloud = type('', (), {})() + self.cloud.distro = rhel.Distro('test', {}, None) def test_bad_config(self): cfg = { @@ -34,7 +37,7 @@ class TestConfig(helpers.FilesystemMockingTestCase): }, } self.patchUtils(self.tmp) - cc_yum_add_repo.handle('yum_add_repo', cfg, None, LOG, []) + cc_yum_add_repo.handle('yum_add_repo', cfg, self.cloud, LOG, []) self.assertRaises(IOError, util.load_file, "/etc/yum.repos.d/epel_testing.repo") @@ -52,7 +55,7 @@ class TestConfig(helpers.FilesystemMockingTestCase): }, } self.patchUtils(self.tmp) - cc_yum_add_repo.handle('yum_add_repo', cfg, None, LOG, []) + cc_yum_add_repo.handle('yum_add_repo', cfg, self.cloud, LOG, []) contents = util.load_file("/etc/yum.repos.d/epel_testing.repo") contents = configobj.ConfigObj(StringIO(contents)) expected = { -- cgit v1.2.3 From 79741c91372c1101dac30b0c1fee32f6dabaff51 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Tue, 4 Feb 2014 12:32:57 -0600 Subject: Initial arch distro add. --- cloudinit/distros/__init__.py | 3 +- cloudinit/distros/arch.py | 186 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 188 insertions(+), 1 deletion(-) create mode 100644 cloudinit/distros/arch.py (limited to 'cloudinit') diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 46b67fa3..b58c8460 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -40,7 +40,8 @@ OSFAMILIES = { 'debian': ['debian', 'ubuntu'], 'redhat': ['fedora', 'rhel'], 'freebsd': ['freebsd'], - 'suse': ['sles'] + 'suse': ['sles'], + 'arch': ['arch'], } LOG = logging.getLogger(__name__) diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py new file mode 100644 index 00000000..808f9c14 --- /dev/null +++ b/cloudinit/distros/arch.py @@ -0,0 +1,186 @@ +# vi: ts=4 expandtab +# +# Copyright (C) 2014 Rackspace, US Inc. +# +# Author: Nate House +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3, as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from cloudinit import distros +from cloudinit import helpers +from cloudinit import log as logging +from cloudinit import util + +from cloudinit.distros.parsers.hostname import HostnameConf + +from cloudinit.settings import PER_INSTANCE + +LOG = logging.getLogger(__name__) + + +class Distro(distros.Distro): + locale_conf_fn = "/etc/locale.gen" + network_conf_dir = "/etc/netctl" + tz_conf_fn = "/etc/timezone" + tz_local_fn = "/etc/localtime" + 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) + # This will be used to restrict certain + # calls from repeatly happening (when they + # should only happen say once per instance...) + self._runner = helpers.Runners(paths) + self.osfamily = 'arch' + + def apply_locale(self, locale, out_fn=None): + if not out_fn: + out_fn = self.locale_conf_fn + util.subp(['locale-gen', '-G', locale], capture=False) + # "" provides trailing newline during join + lines = [ + util.make_header(), + 'LANG="%s"' % (locale), + "", + ] + util.write_file(out_fn, "\n".join(lines)) + + def install_packages(self, pkglist): + self.update_package_sources() + self.package_command('', pkgs=pkglist) + + def _write_network(self, settings): + util.write_file(self.network_conf_fn, settings) + return ['all'] + + # TODO(NateH): Fix for Arch's multi-file net config + def _bring_up_interface(self, device_name): + cmd = ['/etc/init.d/net.%s' % device_name, 'restart'] + LOG.debug("Attempting to run bring up interface %s using command %s", + device_name, cmd) + try: + (_out, err) = util.subp(cmd) + if len(err): + LOG.warn("Running %s resulted in stderr output: %s", cmd, err) + return True + except util.ProcessExecutionError: + util.logexc(LOG, "Running interface command %s failed", cmd) + return False + + # TODO(NateH): Fix for Arch's multi-file net config + def _bring_up_interfaces(self, device_names): + use_all = False + for d in device_names: + if d == 'all': + use_all = True + if use_all: + # Grab device names from init scripts + cmd = ['ls', '/etc/init.d/net.*'] + try: + (_out, err) = util.subp(cmd) + if len(err): + LOG.warn("Running %s resulted in stderr output: %s", cmd, + err) + except util.ProcessExecutionError: + util.logexc(LOG, "Running interface command %s failed", cmd) + return False + devices = [x.split('.')[2] for x in _out.split(' ')] + return distros.Distro._bring_up_interfaces(self, devices) + else: + return distros.Distro._bring_up_interfaces(self, device_names) + + def _select_hostname(self, hostname, fqdn): + # Prefer the short hostname over the long + # fully qualified domain name + if not hostname: + return fqdn + return hostname + + def _write_hostname(self, your_hostname, out_fn): + conf = None + try: + # Try to update the previous one + # so lets see if we can read it first. + conf = self._read_hostname_conf(out_fn) + except IOError: + pass + if not conf: + conf = HostnameConf('') + conf.set_hostname(your_hostname) + util.write_file(out_fn, str(conf), 0644) + + def _read_system_hostname(self): + sys_hostname = self._read_hostname(self.hostname_conf_fn) + return (self.hostname_conf_fn, sys_hostname) + + def _read_hostname_conf(self, filename): + conf = HostnameConf(util.load_file(filename)) + conf.parse() + return conf + + def _read_hostname(self, filename, default=None): + hostname = None + try: + conf = self._read_hostname_conf(filename) + hostname = conf.hostname + except IOError: + pass + if not hostname: + return default + return hostname + + def set_timezone(self, tz): + tz_file = self._find_tz_file(tz) + # Note: "" provides trailing newline during join + tz_lines = [ + util.make_header(), + str(tz), + "", + ] + util.write_file(self.tz_conf_fn, "\n".join(tz_lines)) + # This ensures that the correct tz will be used for the system + util.copy(tz_file, self.tz_local_fn) + + def package_command(self, command, args=None, pkgs=None): + if pkgs is None: + pkgs = [] + + cmd = ['pacman'] + # Redirect output + cmd.append("-Sy") + cmd.append("--quiet") + cmd.append("--noconfirm") + + if args and isinstance(args, str): + cmd.append(args) + elif args and isinstance(args, list): + cmd.extend(args) + + if command: + cmd.append(command) + + pkglist = util.expand_package_list('%s-%s', pkgs) + cmd.extend(pkglist) + + # Allow the output of this to flow outwards (ie not be captured) + util.subp(cmd, capture=False) + + def update_package_sources(self): + self._runner.run("update-sources", self.package_command, + ["-y"], freq=PER_INSTANCE) -- cgit v1.2.3 From 6922fc8294e38ee0780e9d74da7d3ec010a3cd3c Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Tue, 4 Feb 2014 15:59:44 -0600 Subject: Update ssh_svcname in init --- cloudinit/distros/arch.py | 1 + 1 file changed, 1 insertion(+) (limited to 'cloudinit') diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py index 808f9c14..d67a7bde 100644 --- a/cloudinit/distros/arch.py +++ b/cloudinit/distros/arch.py @@ -48,6 +48,7 @@ class Distro(distros.Distro): # should only happen say once per instance...) self._runner = helpers.Runners(paths) self.osfamily = 'arch' + cfg['ssh_svcname'] = 'sshd' def apply_locale(self, locale, out_fn=None): if not out_fn: -- cgit v1.2.3 From b541b4edf648e4ef0c5f66344459a0287ba36c60 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Wed, 5 Feb 2014 09:36:47 -0600 Subject: Cleanup and cloud-init-local local/net mount dep fix --- cloudinit/config/cc_byobu.py | 1 - cloudinit/config/cc_ca_certs.py | 1 - cloudinit/config/cc_disk_setup.py | 1 - cloudinit/config/cc_growpart.py | 1 - cloudinit/config/cc_grub_dpkg.py | 1 - cloudinit/config/cc_locale.py | 1 - cloudinit/config/cc_migrator.py | 1 - cloudinit/config/cc_mounts.py | 1 - cloudinit/config/cc_package_update_upgrade_install.py | 1 - cloudinit/config/cc_phone_home.py | 1 - cloudinit/config/cc_puppet.py | 1 - cloudinit/config/cc_resizefs.py | 1 - cloudinit/config/cc_resolv_conf.py | 1 - cloudinit/config/cc_rightscale_userdata.py | 1 - cloudinit/config/cc_rsyslog.py | 1 - cloudinit/config/cc_salt_minion.py | 1 - cloudinit/config/cc_seed_random.py | 1 - cloudinit/config/cc_set_hostname.py | 1 - cloudinit/config/cc_set_passwords.py | 1 - cloudinit/config/cc_ssh_authkey_fingerprints.py | 1 - cloudinit/config/cc_timezone.py | 1 - cloudinit/config/cc_update_etc_hosts.py | 1 - cloudinit/config/cc_update_hostname.py | 1 - cloudinit/config/cc_users_groups.py | 1 - sysvinit/gentoo/cloud-init-local | 1 + 25 files changed, 1 insertion(+), 24 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/config/cc_byobu.py b/cloudinit/config/cc_byobu.py index 4821693b..92d428b7 100644 --- a/cloudinit/config/cc_byobu.py +++ b/cloudinit/config/cc_byobu.py @@ -29,7 +29,6 @@ distros = ['ubuntu', 'debian'] def handle(name, cfg, cloud, log, args): - 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 7b339274..4f2a46a1 100644 --- a/cloudinit/config/cc_ca_certs.py +++ b/cloudinit/config/cc_ca_certs.py @@ -79,7 +79,6 @@ 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 "ca-certs" not in cfg: log.debug(("Skipping module named %s," " no 'ca-certs' key in configuration"), name) diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py index d0274ba6..0b970e4e 100644 --- a/cloudinit/config/cc_disk_setup.py +++ b/cloudinit/config/cc_disk_setup.py @@ -40,7 +40,6 @@ def handle(_name, cfg, cloud, log, _args): See doc/examples/cloud-config_disk-setup.txt for documentation on the format. """ - 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_growpart.py b/cloudinit/config/cc_growpart.py index 4c5997fa..f52c41f0 100644 --- a/cloudinit/config/cc_growpart.py +++ b/cloudinit/config/cc_growpart.py @@ -255,7 +255,6 @@ def resize_devices(resizer, devices): def handle(_name, cfg, _cloud, log, _args): - 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 3fd92426..03cdd98c 100644 --- a/cloudinit/config/cc_grub_dpkg.py +++ b/cloudinit/config/cc_grub_dpkg.py @@ -26,7 +26,6 @@ distros = ['ubuntu', 'debian'] def handle(_name, cfg, _cloud, log, _args): - idevs = None idevs_empty = None diff --git a/cloudinit/config/cc_locale.py b/cloudinit/config/cc_locale.py index 68399993..6feaae9d 100644 --- a/cloudinit/config/cc_locale.py +++ b/cloudinit/config/cc_locale.py @@ -22,7 +22,6 @@ from cloudinit import util def handle(name, cfg, cloud, log, args): - if len(args) != 0: locale = args[0] else: diff --git a/cloudinit/config/cc_migrator.py b/cloudinit/config/cc_migrator.py index f7b2211a..facaa538 100644 --- a/cloudinit/config/cc_migrator.py +++ b/cloudinit/config/cc_migrator.py @@ -75,7 +75,6 @@ def _migrate_legacy_sems(cloud, log): def handle(name, cfg, cloud, log, _args): - 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 c1ac76d4..80590118 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -76,7 +76,6 @@ def sanitize_devname(startname, transformer, log): def handle(_name, cfg, cloud, log, _args): - # 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 85bc0240..73b0e30d 100644 --- a/cloudinit/config/cc_package_update_upgrade_install.py +++ b/cloudinit/config/cc_package_update_upgrade_install.py @@ -49,7 +49,6 @@ def _fire_reboot(log, wait_attempts=6, initial_sleep=1, backoff=2): def handle(_name, cfg, cloud, log, _args): - # 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 360fd83e..2e058ccd 100644 --- a/cloudinit/config/cc_phone_home.py +++ b/cloudinit/config/cc_phone_home.py @@ -44,7 +44,6 @@ POST_LIST_ALL = [ # post: [ pub_key_dsa, pub_key_rsa, pub_key_ecdsa, instance_id # def handle(name, cfg, cloud, log, args): - if len(args) != 0: ph_cfg = util.read_conf(args[0]) else: diff --git a/cloudinit/config/cc_puppet.py b/cloudinit/config/cc_puppet.py index 717734d1..471a1a8a 100644 --- a/cloudinit/config/cc_puppet.py +++ b/cloudinit/config/cc_puppet.py @@ -49,7 +49,6 @@ def _autostart_puppet(log): def handle(name, cfg, cloud, log, _args): - # 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 9d767873..be406034 100644 --- a/cloudinit/config/cc_resizefs.py +++ b/cloudinit/config/cc_resizefs.py @@ -76,7 +76,6 @@ def rootdev_from_cmdline(cmdline): def handle(name, cfg, _cloud, log, args): - 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 feacebcd..879b62b1 100644 --- a/cloudinit/config/cc_resolv_conf.py +++ b/cloudinit/config/cc_resolv_conf.py @@ -92,7 +92,6 @@ 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 "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 f99524d1..c771728d 100644 --- a/cloudinit/config/cc_rightscale_userdata.py +++ b/cloudinit/config/cc_rightscale_userdata.py @@ -50,7 +50,6 @@ MY_HOOKNAME = 'CLOUD_INIT_REMOTE_HOOK' def handle(name, _cfg, cloud, log, _args): - try: ud = cloud.get_userdata_raw() except: diff --git a/cloudinit/config/cc_rsyslog.py b/cloudinit/config/cc_rsyslog.py index 7f70167e..0c2c6880 100644 --- a/cloudinit/config/cc_rsyslog.py +++ b/cloudinit/config/cc_rsyslog.py @@ -35,7 +35,6 @@ def handle(name, cfg, cloud, log, _args): # *.* @@syslogd.example.com # process 'rsyslog' - 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 b48762c8..53013dcb 100644 --- a/cloudinit/config/cc_salt_minion.py +++ b/cloudinit/config/cc_salt_minion.py @@ -22,7 +22,6 @@ from cloudinit import util def handle(name, cfg, cloud, log, _args): - # 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 1676dd0a..22a31f29 100644 --- a/cloudinit/config/cc_seed_random.py +++ b/cloudinit/config/cc_seed_random.py @@ -39,7 +39,6 @@ def _decode(data, encoding=None): def handle(name, cfg, cloud, log, _args): - 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 38246b57..5d7f4331 100644 --- a/cloudinit/config/cc_set_hostname.py +++ b/cloudinit/config/cc_set_hostname.py @@ -22,7 +22,6 @@ from cloudinit import util def handle(name, cfg, cloud, log, _args): - 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 ab0ed5ad..646c3f8b 100644 --- a/cloudinit/config/cc_set_passwords.py +++ b/cloudinit/config/cc_set_passwords.py @@ -36,7 +36,6 @@ PW_SET = (letters.translate(None, 'loLOI') + def handle(_name, cfg, cloud, log, args): - 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_authkey_fingerprints.py b/cloudinit/config/cc_ssh_authkey_fingerprints.py index 8b2708b1..be8083db 100644 --- a/cloudinit/config/cc_ssh_authkey_fingerprints.py +++ b/cloudinit/config/cc_ssh_authkey_fingerprints.py @@ -92,7 +92,6 @@ def _pprint_key_entries(user, key_fn, key_entries, hash_meth='md5', def handle(name, cfg, cloud, log, _args): - if 'no_ssh_fingerprints' in cfg: log.debug(("Skipping module named %s, " "logging of ssh fingerprints disabled"), name) diff --git a/cloudinit/config/cc_timezone.py b/cloudinit/config/cc_timezone.py index bddcd0e9..b9eb85b2 100644 --- a/cloudinit/config/cc_timezone.py +++ b/cloudinit/config/cc_timezone.py @@ -26,7 +26,6 @@ frequency = PER_INSTANCE def handle(name, cfg, cloud, log, args): - 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 3e3b4228..d3dd1f32 100644 --- a/cloudinit/config/cc_update_etc_hosts.py +++ b/cloudinit/config/cc_update_etc_hosts.py @@ -27,7 +27,6 @@ frequency = PER_ALWAYS def handle(name, cfg, cloud, log, _args): - 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 56f6ebb7..e396ba13 100644 --- a/cloudinit/config/cc_update_hostname.py +++ b/cloudinit/config/cc_update_hostname.py @@ -27,7 +27,6 @@ frequency = PER_ALWAYS def handle(name, cfg, cloud, log, _args): - 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 30bf455d..bf5b4581 100644 --- a/cloudinit/config/cc_users_groups.py +++ b/cloudinit/config/cc_users_groups.py @@ -27,7 +27,6 @@ frequency = PER_INSTANCE def handle(name, cfg, cloud, _log, _args): - (users, groups) = ds.normalize_users_groups(cfg, cloud.distro) for (name, members) in groups.items(): cloud.distro.create_group(name, members) diff --git a/sysvinit/gentoo/cloud-init-local b/sysvinit/gentoo/cloud-init-local index 8c9968d8..fef2cbb9 100644 --- a/sysvinit/gentoo/cloud-init-local +++ b/sysvinit/gentoo/cloud-init-local @@ -1,6 +1,7 @@ #!/sbin/runscript depend() { + after localmount netmount before cloud-init provide cloud-init-local } -- cgit v1.2.3 From 805ac503531d27651f0ad4b1a590a488545a0887 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Thu, 6 Feb 2014 09:59:04 -0600 Subject: Removed exclude bits from yum module as its not a default --- cloudinit/config/cc_yum_add_repo.py | 2 -- cloudinit/distros/gentoo.py | 2 +- tests/unittests/test_handler/test_handler_yum_add_repo.py | 7 ++----- 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py index f63e3e08..5c273825 100644 --- a/cloudinit/config/cc_yum_add_repo.py +++ b/cloudinit/config/cc_yum_add_repo.py @@ -58,8 +58,6 @@ def _format_repository_config(repo_id, repo_config): def handle(name, cfg, _cloud, log, _args): - if _cloud.distro.is_excluded(name): - return repos = cfg.get('yum_repos') if not repos: log.debug(("Skipping module named %s," diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py index e8778e15..0087908a 100644 --- a/cloudinit/distros/gentoo.py +++ b/cloudinit/distros/gentoo.py @@ -181,4 +181,4 @@ class Distro(distros.Distro): def update_package_sources(self): self._runner.run("update-sources", self.package_command, - ["-u", "world", "--quiet"], freq=PER_INSTANCE) + ["-u", "world"], freq=PER_INSTANCE) diff --git a/tests/unittests/test_handler/test_handler_yum_add_repo.py b/tests/unittests/test_handler/test_handler_yum_add_repo.py index ddf0ef9c..8df592f9 100644 --- a/tests/unittests/test_handler/test_handler_yum_add_repo.py +++ b/tests/unittests/test_handler/test_handler_yum_add_repo.py @@ -2,7 +2,6 @@ from cloudinit import helpers from cloudinit import util from cloudinit.config import cc_yum_add_repo -from cloudinit.distros import rhel from tests.unittests import helpers @@ -19,8 +18,6 @@ class TestConfig(helpers.FilesystemMockingTestCase): def setUp(self): super(TestConfig, self).setUp() self.tmp = self.makeDir(prefix="unittest_") - self.cloud = type('', (), {})() - self.cloud.distro = rhel.Distro('test', {}, None) def test_bad_config(self): cfg = { @@ -37,7 +34,7 @@ class TestConfig(helpers.FilesystemMockingTestCase): }, } self.patchUtils(self.tmp) - cc_yum_add_repo.handle('yum_add_repo', cfg, self.cloud, LOG, []) + cc_yum_add_repo.handle('yum_add_repo', cfg, None, LOG, []) self.assertRaises(IOError, util.load_file, "/etc/yum.repos.d/epel_testing.repo") @@ -55,7 +52,7 @@ class TestConfig(helpers.FilesystemMockingTestCase): }, } self.patchUtils(self.tmp) - cc_yum_add_repo.handle('yum_add_repo', cfg, self.cloud, LOG, []) + cc_yum_add_repo.handle('yum_add_repo', cfg, None, LOG, []) contents = util.load_file("/etc/yum.repos.d/epel_testing.repo") contents = configobj.ConfigObj(StringIO(contents)) expected = { -- cgit v1.2.3 From 122085edf26508d7f9cdf930c8a31f089159ccf5 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Thu, 6 Feb 2014 15:35:34 -0600 Subject: Added arch network config --- cloudinit/distros/arch.py | 82 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 22 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py index d67a7bde..fc5eee66 100644 --- a/cloudinit/distros/arch.py +++ b/cloudinit/distros/arch.py @@ -21,6 +21,7 @@ from cloudinit import helpers from cloudinit import log as logging from cloudinit import util +from cloudinit.distros import net_util from cloudinit.distros.parsers.hostname import HostnameConf from cloudinit.settings import PER_INSTANCE @@ -33,6 +34,7 @@ class Distro(distros.Distro): network_conf_dir = "/etc/netctl" tz_conf_fn = "/etc/timezone" tz_local_fn = "/etc/localtime" + resolv_conf_fn = "/etc/resolv.conf" init_cmd = ['systemctl'] # init scripts exclude_modules = [ 'grub-dpkg', @@ -67,12 +69,46 @@ class Distro(distros.Distro): self.package_command('', pkgs=pkglist) def _write_network(self, settings): - util.write_file(self.network_conf_fn, settings) - return ['all'] + entries = net_util.translate_network(settings) + LOG.debug("Translated ubuntu style network settings %s into %s", + settings, entries) + dev_names = entries.keys() + # Format for netctl + for (dev, info) in entries.iteritems(): + nameservers = [] + net_fn = self.network_conf_dir + dev + net_cfg = { + 'Connection': 'ethernet', + 'Interface': dev, + 'IP': info.get('bootproto'), + 'Address': "('%s/%s')" % (info.get('address'), + info.get('netmask')), + 'Gateway': info.get('gateway'), + 'DNS': str(tuple(info.get('dns-nameservers'))).replace(',', '') + } + util.write_file(net_fn, convert_netctl(net_cfg)) + if info.get('auto'): + self._enable_interface(dev) + if 'dns-nameservers' in info: + nameservers.extend(info['dns-nameservers']) + + if nameservers: + util.write_file(self.resolve_conf_fn, + convert_resolv_conf(nameservers)) + + return dev_names + + def _enable_interface(self, device_name): + cmd = ['netctl', 'reenable', device_name] + try: + (_out, err) = util.subp(cmd) + if len(err): + LOG.warn("Running %s resulted in stderr output: %s", cmd, err) + except util.ProcessExecutionError: + util.logexc(LOG, "Running interface command %s failed", cmd) - # TODO(NateH): Fix for Arch's multi-file net config def _bring_up_interface(self, device_name): - cmd = ['/etc/init.d/net.%s' % device_name, 'restart'] + cmd = ['netctl', 'restart', device_name] LOG.debug("Attempting to run bring up interface %s using command %s", device_name, cmd) try: @@ -84,27 +120,11 @@ class Distro(distros.Distro): util.logexc(LOG, "Running interface command %s failed", cmd) return False - # TODO(NateH): Fix for Arch's multi-file net config def _bring_up_interfaces(self, device_names): - use_all = False for d in device_names: - if d == 'all': - use_all = True - if use_all: - # Grab device names from init scripts - cmd = ['ls', '/etc/init.d/net.*'] - try: - (_out, err) = util.subp(cmd) - if len(err): - LOG.warn("Running %s resulted in stderr output: %s", cmd, - err) - except util.ProcessExecutionError: - util.logexc(LOG, "Running interface command %s failed", cmd) + if not self._bring_up_interface(d): return False - devices = [x.split('.')[2] for x in _out.split(' ')] - return distros.Distro._bring_up_interfaces(self, devices) - else: - return distros.Distro._bring_up_interfaces(self, device_names) + return True def _select_hostname(self, hostname, fqdn): # Prefer the short hostname over the long @@ -185,3 +205,21 @@ class Distro(distros.Distro): def update_package_sources(self): self._runner.run("update-sources", self.package_command, ["-y"], freq=PER_INSTANCE) + + +def convert_netctl(settings): + """Returns a settings string formatted for netctl.""" + result = '' + if isinstance(settings, dict): + for k, v in settings.items(): + result = result + '%s=%s\n' % (k, v) + return result + + +def convert_resolv_conf(settings): + """Returns a settings string formatted for resolv.conf.""" + result = '' + if isinstance(settings, list): + for ns in list: + result = result + 'nameserver %s\n' % ns + return result -- cgit v1.2.3 From 003d3903dcd2c023a37f99ca74a7ecc56243b449 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Thu, 6 Feb 2014 15:42:51 -0600 Subject: Removed exclude conditional on keys-to-console --- cloudinit/config/cc_keys_to_console.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/config/cc_keys_to_console.py b/cloudinit/config/cc_keys_to_console.py index c9563e25..ed7af690 100644 --- a/cloudinit/config/cc_keys_to_console.py +++ b/cloudinit/config/cc_keys_to_console.py @@ -30,8 +30,6 @@ HELPER_TOOL = '/usr/lib/cloud-init/write-ssh-key-fingerprints' def handle(name, cfg, _cloud, log, _args): - if _cloud.distro.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) -- cgit v1.2.3 From 65da76341796a00b7bbdca514167b89f99d5a599 Mon Sep 17 00:00:00 2001 From: "Nate House nathan.house@rackspace.com" <> Date: Thu, 6 Feb 2014 15:49:23 -0600 Subject: Removed yum exclude module entry from gentoo distro --- cloudinit/distros/gentoo.py | 1 - 1 file changed, 1 deletion(-) (limited to 'cloudinit') diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py index 0087908a..0a95fa23 100644 --- a/cloudinit/distros/gentoo.py +++ b/cloudinit/distros/gentoo.py @@ -38,7 +38,6 @@ class Distro(distros.Distro): 'grub-dpkg', 'apt-configure', 'apt-pipelining', - 'yum-add-repo', ] def __init__(self, name, cfg, paths): -- cgit v1.2.3 From ceffb35a2ddfb5f309417aaa68e7ff70199690fa Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Fri, 7 Feb 2014 13:49:03 +0200 Subject: Made new ovf-env.xml handling more robust. Test cases included --- cloudinit/sources/DataSourceAzure.py | 16 ++++++----- tests/unittests/test_datasource/test_azure.py | 38 +++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 6 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index 448915d7..eee36d22 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -84,21 +84,20 @@ class DataSourceAzureNet(sources.DataSource): candidates = [self.seed_dir] candidates.extend(list_possible_azure_ds_devs()) + previous_ovf_cfg = None if ddir: candidates.append(ddir) + previous_ovf_cfg = None + if os.path.exists("%s/ovf-env.xml" % ddir): + previous_ovf_cfg = load_azure_ds_dir(ddir) + found = None for cdev in candidates: try: if cdev.startswith("/dev/"): ret = util.mount_cb(cdev, load_azure_ds_dir) - - # If we load the OVF from a device, it means that a - # new ovf-env.xml has been found. (LP: #1269626) - if os.path.exists(ddir): - LOG.info("removing old agent directory %s" % ddir) - util.del_dir(ddir) else: ret = load_azure_ds_dir(cdev) @@ -110,6 +109,11 @@ class DataSourceAzureNet(sources.DataSource): LOG.warn("%s was not mountable" % cdev) continue + if ret != previous_ovf_cfg: + LOG.info(("instance configuration has changed, " + "removing old agent directory")) + util.del_dir(ddir) + (md, self.userdata_raw, cfg, files) = ret self.seed = cdev self.metadata = util.mergemanydict([md, DEFAULT_METADATA]) diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py index aad84206..aa541a18 100644 --- a/tests/unittests/test_datasource/test_azure.py +++ b/tests/unittests/test_datasource/test_azure.py @@ -119,6 +119,10 @@ class TestAzureDataSource(MockerTestCase): {'ovf-env.xml': data['ovfcontent']}) mod = DataSourceAzure + ddir = "%s/var/lib/waagent" % self.tmp + mod.BUILTIN_DS_CONFIG['data_dir'] = ddir + if not os.path.isdir(ddir): + os.makedirs(ddir) self.apply_patches([(mod, 'list_possible_azure_ds_devs', dsdevs)]) @@ -338,6 +342,40 @@ class TestAzureDataSource(MockerTestCase): self.assertEqual(userdata, dsrc.userdata_raw) + def test_existing_ovf_same(self): + mydata = "FOOBAR" + odata = {'UserData': base64.b64encode(mydata)} + data = {'ovfcontent': construct_valid_ovf_env(data=odata)} + + with open("%s/ovf-env.xml" % self.tmp, 'w') as fp: + fp.write(construct_valid_ovf_env(data=odata)) + with open("%s/sem" % self.tmp, 'w') as fp: + fp.write("test") + + dsrc = self._get_ds(data) + ret = dsrc.get_data() + self.assertTrue(ret) + self.assertEqual(dsrc.userdata_raw, mydata) + self.assertTrue(os.path.exists("%s/sem" % self.tmp)) + + def test_existing_ovf_diff(self): + mydata = "FOOBAR" + odata = {'UserData': base64.b64encode(mydata)} + data = {'ovfcontent': construct_valid_ovf_env(data=odata)} + + data_dir = "%s/var/lib/waagent" % self.tmp + os.makedirs(data_dir) + with open("%s/ovf-env.xml" % data_dir, 'w') as fp: + fp.write(construct_valid_ovf_env()) + with open("%s/sem" % data_dir, 'w') as fp: + fp.write("test") + + dsrc = self._get_ds(data) + ret = dsrc.get_data() + self.assertTrue(ret) + self.assertEqual(dsrc.userdata_raw, mydata) + self.assertFalse(os.path.exists("%s/sem" % data_dir)) + class TestReadAzureOvf(MockerTestCase): def test_invalid_xml_raises_non_azure_ds(self): -- cgit v1.2.3 From c09e8cd6e81e478dd5276275418b70d5d946f479 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 10 Feb 2014 15:05:41 -0500 Subject: change behavior to only delete SharedConfig.xml. --- cloudinit/sources/DataSourceAzure.py | 33 ++++++---- tests/unittests/test_datasource/test_azure.py | 93 +++++++++++++++++---------- 2 files changed, 79 insertions(+), 47 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index eee36d22..6b48a340 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -84,14 +84,9 @@ class DataSourceAzureNet(sources.DataSource): candidates = [self.seed_dir] candidates.extend(list_possible_azure_ds_devs()) - previous_ovf_cfg = None if ddir: candidates.append(ddir) - previous_ovf_cfg = None - if os.path.exists("%s/ovf-env.xml" % ddir): - previous_ovf_cfg = load_azure_ds_dir(ddir) - found = None for cdev in candidates: @@ -109,11 +104,6 @@ class DataSourceAzureNet(sources.DataSource): LOG.warn("%s was not mountable" % cdev) continue - if ret != previous_ovf_cfg: - LOG.info(("instance configuration has changed, " - "removing old agent directory")) - util.del_dir(ddir) - (md, self.userdata_raw, cfg, files) = ret self.seed = cdev self.metadata = util.mergemanydict([md, DEFAULT_METADATA]) @@ -138,10 +128,27 @@ class DataSourceAzureNet(sources.DataSource): user_ds_cfg = util.get_cfg_by_path(self.cfg, DS_CFG_PATH, {}) self.ds_cfg = util.mergemanydict([user_ds_cfg, self.ds_cfg]) mycfg = self.ds_cfg + ddir = mycfg['data_dir'] + + if found != ddir: + cached_ovfenv = util.load_file( + os.path.join(ddir, 'ovf-env.xml'), quiet=True) + if cached_ovfenv != files['ovf-env.xml']: + # source was not walinux-agent's datadir, so we have to clean + # up so 'wait_for_files' doesn't return early due to stale data + toclean = ['SharedConfig.xml'] + cleaned = [] + for f in [os.path.join(ddir, f) for f in toclean]: + if os.path.exists(f): + util.del_file(f) + cleaned.append(f) + if cleaned: + LOG.info("removed stale file(s) in '%s': %s", + ddir, str(cleaned)) # walinux agent writes files world readable, but expects # the directory to be protected. - write_files(mycfg['data_dir'], files, dirmode=0700) + write_files(ddir, files, dirmode=0700) # handle the hostname 'publishing' try: @@ -159,13 +166,13 @@ class DataSourceAzureNet(sources.DataSource): util.logexc(LOG, "agent command '%s' failed.", mycfg['agent_command']) - shcfgxml = os.path.join(mycfg['data_dir'], "SharedConfig.xml") + shcfgxml = os.path.join(ddir, "SharedConfig.xml") wait_for = [shcfgxml] fp_files = [] for pk in self.cfg.get('_pubkeys', []): bname = str(pk['fingerprint'] + ".crt") - fp_files += [os.path.join(mycfg['data_dir'], bname)] + fp_files += [os.path.join(ddir, bname)] missing = util.log_time(logfunc=LOG.debug, msg="waiting for files", func=wait_for_files, diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py index aa541a18..44c537f4 100644 --- a/tests/unittests/test_datasource/test_azure.py +++ b/tests/unittests/test_datasource/test_azure.py @@ -1,4 +1,5 @@ from cloudinit import helpers +from cloudinit.util import load_file from cloudinit.sources import DataSourceAzure from tests.unittests.helpers import populate_dir @@ -6,6 +7,7 @@ import base64 import crypt from mocker import MockerTestCase import os +import stat import yaml @@ -72,6 +74,7 @@ class TestAzureDataSource(MockerTestCase): # patch cloud_dir, so our 'seed_dir' is guaranteed empty self.paths = helpers.Paths({'cloud_dir': self.tmp}) + self.waagent_d = os.path.join(self.tmp, 'var', 'lib', 'waagent') self.unapply = [] super(TestAzureDataSource, self).setUp() @@ -92,13 +95,6 @@ class TestAzureDataSource(MockerTestCase): def _invoke_agent(cmd): data['agent_invoked'] = cmd - def _write_files(datadir, files, dirmode): - data['files'] = {} - data['datadir'] = datadir - data['datadir_mode'] = dirmode - for (fname, content) in files.items(): - data['files'][fname] = content - def _wait_for_files(flist, _maxwait=None, _naplen=None): data['waited'] = flist return [] @@ -119,15 +115,11 @@ class TestAzureDataSource(MockerTestCase): {'ovf-env.xml': data['ovfcontent']}) mod = DataSourceAzure - ddir = "%s/var/lib/waagent" % self.tmp - mod.BUILTIN_DS_CONFIG['data_dir'] = ddir - if not os.path.isdir(ddir): - os.makedirs(ddir) + mod.BUILTIN_DS_CONFIG['data_dir'] = self.waagent_d self.apply_patches([(mod, 'list_possible_azure_ds_devs', dsdevs)]) self.apply_patches([(mod, 'invoke_agent', _invoke_agent), - (mod, 'write_files', _write_files), (mod, 'wait_for_files', _wait_for_files), (mod, 'pubkeys_from_crt_files', _pubkeys_from_crt_files), @@ -151,10 +143,18 @@ class TestAzureDataSource(MockerTestCase): self.assertTrue(ret) self.assertEqual(dsrc.userdata_raw, "") self.assertEqual(dsrc.metadata['local-hostname'], odata['HostName']) - self.assertTrue('ovf-env.xml' in data['files']) - self.assertEqual(0700, data['datadir_mode']) + self.assertTrue(os.path.isfile( + os.path.join(self.waagent_d, 'ovf-env.xml'))) self.assertEqual(dsrc.metadata['instance-id'], 'i-my-azure-id') + def test_waagent_d_has_0700_perms(self): + # we expect /var/lib/waagent to be created 0700 + dsrc = self._get_ds({'ovfcontent': construct_valid_ovf_env()}) + ret = dsrc.get_data() + self.assertTrue(ret) + self.assertTrue(os.path.isdir(self.waagent_d)) + self.assertEqual(stat.S_IMODE(os.stat(self.waagent_d).st_mode), 0700) + def test_user_cfg_set_agent_command_plain(self): # set dscfg in via plaintext # we must have friendly-to-xml formatted plaintext in yaml_cfg @@ -342,39 +342,64 @@ class TestAzureDataSource(MockerTestCase): self.assertEqual(userdata, dsrc.userdata_raw) + def test_ovf_env_arrives_in_waagent_dir(self): + xml = construct_valid_ovf_env(data={}, userdata="FOODATA") + dsrc = self._get_ds({'ovfcontent': xml}) + dsrc.get_data() + + # 'data_dir' is '/var/lib/waagent' (walinux-agent's state dir) + # we expect that the ovf-env.xml file is copied there. + ovf_env_path = os.path.join(self.waagent_d, 'ovf-env.xml') + self.assertTrue(os.path.exists(ovf_env_path)) + self.assertEqual(xml, load_file(ovf_env_path)) + def test_existing_ovf_same(self): - mydata = "FOOBAR" - odata = {'UserData': base64.b64encode(mydata)} + # waagent/SharedConfig left alone if found ovf-env.xml same as cached + odata = {'UserData': base64.b64encode("SOMEUSERDATA")} data = {'ovfcontent': construct_valid_ovf_env(data=odata)} - with open("%s/ovf-env.xml" % self.tmp, 'w') as fp: - fp.write(construct_valid_ovf_env(data=odata)) - with open("%s/sem" % self.tmp, 'w') as fp: - fp.write("test") + populate_dir(self.waagent_d, + {'ovf-env.xml': data['ovfcontent'], + 'otherfile': 'otherfile-content', + 'SharedConfig.xml': 'mysharedconfig'}) dsrc = self._get_ds(data) ret = dsrc.get_data() self.assertTrue(ret) - self.assertEqual(dsrc.userdata_raw, mydata) - self.assertTrue(os.path.exists("%s/sem" % self.tmp)) + self.assertTrue(os.path.exists( + os.path.join(self.waagent_d, 'ovf-env.xml'))) + self.assertTrue(os.path.exists( + os.path.join(self.waagent_d, 'otherfile'))) + self.assertTrue(os.path.exists( + os.path.join(self.waagent_d, 'SharedConfig.xml'))) def test_existing_ovf_diff(self): - mydata = "FOOBAR" - odata = {'UserData': base64.b64encode(mydata)} - data = {'ovfcontent': construct_valid_ovf_env(data=odata)} + # waagent/SharedConfig must be removed if ovfenv is found elsewhere - data_dir = "%s/var/lib/waagent" % self.tmp - os.makedirs(data_dir) - with open("%s/ovf-env.xml" % data_dir, 'w') as fp: - fp.write(construct_valid_ovf_env()) - with open("%s/sem" % data_dir, 'w') as fp: - fp.write("test") + # 'get_data' should remove SharedConfig.xml in /var/lib/waagent + # if ovf-env.xml differs. + cached_ovfenv = construct_valid_ovf_env( + {'userdata': base64.b64encode("FOO_USERDATA")}) + new_ovfenv = construct_valid_ovf_env( + {'userdata': base64.b64encode("NEW_USERDATA")}) - dsrc = self._get_ds(data) + populate_dir(self.waagent_d, + {'ovf-env.xml': cached_ovfenv, + 'SharedConfig.xml': "mysharedconfigxml", + 'otherfile': 'otherfilecontent'}) + + dsrc = self._get_ds({'ovfcontent': new_ovfenv}) ret = dsrc.get_data() self.assertTrue(ret) - self.assertEqual(dsrc.userdata_raw, mydata) - self.assertFalse(os.path.exists("%s/sem" % data_dir)) + self.assertEqual(dsrc.userdata_raw, "NEW_USERDATA") + self.assertTrue(os.path.exists( + os.path.join(self.waagent_d, 'otherfile'))) + self.assertFalse( + os.path.exists(os.path.join(self.waagent_d, 'SharedConfig.xml'))) + self.assertTrue( + os.path.exists(os.path.join(self.waagent_d, 'ovf-env.xml'))) + self.assertEqual(new_ovfenv, + load_file(os.path.join(self.waagent_d, 'ovf-env.xml'))) class TestReadAzureOvf(MockerTestCase): -- cgit v1.2.3 From 5021612482c918c43651a2b93778df05dcabda95 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 10 Feb 2014 15:11:45 -0500 Subject: make a defined var of DATA_DIR_CLEAN_LIST, some pylint cleanups --- cloudinit/sources/DataSourceAzure.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index 6b48a340..c7331da5 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -34,6 +34,7 @@ DEFAULT_METADATA = {"instance-id": "iid-AZURE-NODE"} AGENT_START = ['service', 'walinuxagent', 'start'] BOUNCE_COMMAND = ['sh', '-xc', "i=$interface; x=0; ifdown $i || x=$?; ifup $i || x=$?; exit $x"] +DATA_DIR_CLEAN_LIST = ['SharedConfig.xml'] BUILTIN_DS_CONFIG = { 'agent_command': AGENT_START, @@ -101,7 +102,7 @@ class DataSourceAzureNet(sources.DataSource): except BrokenAzureDataSource as exc: raise exc except util.MountFailedError: - LOG.warn("%s was not mountable" % cdev) + LOG.warn("%s was not mountable", cdev) continue (md, self.userdata_raw, cfg, files) = ret @@ -136,9 +137,8 @@ class DataSourceAzureNet(sources.DataSource): if cached_ovfenv != files['ovf-env.xml']: # source was not walinux-agent's datadir, so we have to clean # up so 'wait_for_files' doesn't return early due to stale data - toclean = ['SharedConfig.xml'] cleaned = [] - for f in [os.path.join(ddir, f) for f in toclean]: + for f in [os.path.join(ddir, f) for f in DATA_DIR_CLEAN_LIST]: if os.path.exists(f): util.del_file(f) cleaned.append(f) @@ -156,7 +156,7 @@ class DataSourceAzureNet(sources.DataSource): self.metadata.get('local-hostname'), mycfg['hostname_bounce']) except Exception as e: - LOG.warn("Failed publishing hostname: %s" % e) + LOG.warn("Failed publishing hostname: %s", e) util.logexc(LOG, "handling set_hostname failed") try: @@ -186,7 +186,7 @@ class DataSourceAzureNet(sources.DataSource): try: self.metadata['instance-id'] = iid_from_shared_config(shcfgxml) except ValueError as e: - LOG.warn("failed to get instance id in %s: %s" % (shcfgxml, e)) + LOG.warn("failed to get instance id in %s: %s", shcfgxml, e) pubkeys = pubkeys_from_crt_files(fp_files) @@ -267,7 +267,7 @@ def pubkeys_from_crt_files(flist): errors.append(fname) if errors: - LOG.warn("failed to convert the crt files to pubkey: %s" % errors) + LOG.warn("failed to convert the crt files to pubkey: %s", errors) return pubkeys @@ -298,7 +298,7 @@ def write_files(datadir, files, dirmode=None): def invoke_agent(cmd): # this is a function itself to simplify patching it for test if cmd: - LOG.debug("invoking agent: %s" % cmd) + LOG.debug("invoking agent: %s", cmd) util.subp(cmd, shell=(not isinstance(cmd, list))) else: LOG.debug("not invoking agent") @@ -345,7 +345,7 @@ def load_azure_ovf_pubkeys(sshnode): continue cur = {'fingerprint': "", 'path': ""} for child in pk_node.childNodes: - if (child.nodeType == text_node or not child.localName): + if child.nodeType == text_node or not child.localName: continue name = child.localName.lower() @@ -431,7 +431,7 @@ def read_azure_ovf(contents): # we accept either UserData or CustomData. If both are present # then behavior is undefined. - if (name == "userdata" or name == "customdata"): + if name == "userdata" or name == "customdata": if attrs.get('encoding') in (None, "base64"): ud = base64.b64decode(''.join(value.split())) else: -- cgit v1.2.3 From 09f392693efeacc7ac17cdab51c7299e928e394d Mon Sep 17 00:00:00 2001 From: Kiril Vladimiroff Date: Wed, 12 Feb 2014 12:14:49 +0200 Subject: Add CloudSigma data source --- cloudinit/cs_utils.py | 99 ++++++++++++++++++++++ cloudinit/settings.py | 1 + cloudinit/sources/DataSourceCloudSigma.py | 91 ++++++++++++++++++++ doc/sources/cloudsigma/README.rst | 34 ++++++++ requirements.txt | 4 +- tests/unittests/test_cs_util.py | 65 ++++++++++++++ tests/unittests/test_datasource/test_cloudsigma.py | 59 +++++++++++++ 7 files changed, 351 insertions(+), 2 deletions(-) create mode 100644 cloudinit/cs_utils.py create mode 100644 cloudinit/sources/DataSourceCloudSigma.py create mode 100644 doc/sources/cloudsigma/README.rst create mode 100644 tests/unittests/test_cs_util.py create mode 100644 tests/unittests/test_datasource/test_cloudsigma.py (limited to 'cloudinit') diff --git a/cloudinit/cs_utils.py b/cloudinit/cs_utils.py new file mode 100644 index 00000000..4e53c31a --- /dev/null +++ b/cloudinit/cs_utils.py @@ -0,0 +1,99 @@ +# vi: ts=4 expandtab +# +# Copyright (C) 2014 CloudSigma +# +# Author: Kiril Vladimiroff +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3, as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +""" +cepko implements easy-to-use communication with CloudSigma's VMs through +a virtual serial port without bothering with formatting the messages +properly nor parsing the output with the specific and sometimes +confusing shell tools for that purpose. + +Having the server definition accessible by the VM can ve useful in various +ways. For example it is possible to easily determine from within the VM, +which network interfaces are connected to public and which to private network. +Another use is to pass some data to initial VM setup scripts, like setting the +hostname to the VM name or passing ssh public keys through server meta. + +For more information take a look at the Server Context section of CloudSigma +API Docs: http://cloudsigma-docs.readthedocs.org/en/latest/server_context.html +""" +import json +import platform + +import serial + +SERIAL_PORT = '/dev/ttyS1' +if platform.system() == 'Windows': + SERIAL_PORT = 'COM2' + + +class Cepko(object): + """ + One instance of that object could be use for one or more + queries to the serial port. + """ + request_pattern = "<\n{}\n>" + + def get(self, key="", request_pattern=None): + if request_pattern is None: + request_pattern = self.request_pattern + return CepkoResult(request_pattern.format(key)) + + def all(self): + return self.get() + + def meta(self, key=""): + request_pattern = self.request_pattern.format("/meta/{}") + return self.get(key, request_pattern) + + def global_context(self, key=""): + request_pattern = self.request_pattern.format("/global_context/{}") + return self.get(key, request_pattern) + + +class CepkoResult(object): + """ + CepkoResult executes the request to the virtual serial port as soon + as the instance is initialized and stores the result in both raw and + marshalled format. + """ + def __init__(self, request): + self.request = request + self.raw_result = self._execute() + self.result = self._marshal(self.raw_result) + + def _execute(self): + connection = serial.Serial(SERIAL_PORT) + connection.write(self.request) + return connection.readline().strip('\x04\n') + + def _marshal(self, raw_result): + try: + return json.loads(raw_result) + except ValueError: + return raw_result + + def __len__(self): + return self.result.__len__() + + def __getitem__(self, key): + return self.result.__getitem__(key) + + def __contains__(self, item): + return self.result.__contains__(item) + + def __iter__(self): + return self.result.__iter__() diff --git a/cloudinit/settings.py b/cloudinit/settings.py index 7be2199a..7b0b18e7 100644 --- a/cloudinit/settings.py +++ b/cloudinit/settings.py @@ -37,6 +37,7 @@ CFG_BUILTIN = { 'OVF', 'MAAS', 'Ec2', + 'CloudSigma', 'CloudStack', 'SmartOS', # At the end to act as a 'catch' when none of the above work... diff --git a/cloudinit/sources/DataSourceCloudSigma.py b/cloudinit/sources/DataSourceCloudSigma.py new file mode 100644 index 00000000..78acd8a4 --- /dev/null +++ b/cloudinit/sources/DataSourceCloudSigma.py @@ -0,0 +1,91 @@ +# vi: ts=4 expandtab +# +# Copyright (C) 2014 CloudSigma +# +# Author: Kiril Vladimiroff +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3, as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +import re + +from cloudinit import log as logging +from cloudinit import sources +from cloudinit import util +from cloudinit.cs_utils import Cepko + +LOG = logging.getLogger(__name__) + +VALID_DSMODES = ("local", "net", "disabled") + + +class DataSourceCloudSigma(sources.DataSource): + """ + Uses cepko in order to gather the server context from the VM. + + For more information about CloudSigma's Server Context: + http://cloudsigma-docs.readthedocs.org/en/latest/server_context.html + """ + def __init__(self, sys_cfg, distro, paths): + self.dsmode = 'local' + self.cepko = Cepko() + self.ssh_public_key = '' + sources.DataSource.__init__(self, sys_cfg, distro, paths) + + def get_data(self): + """ + Metadata is the whole server context and /meta/cloud-config is used + as userdata. + """ + try: + server_context = self.cepko.all().result + server_meta = server_context['meta'] + self.userdata_raw = server_meta.get('cloudinit-user-data', "") + self.metadata = server_context + self.ssh_public_key = server_meta['ssh_public_key'] + + if server_meta.get('cloudinit-dsmode') in VALID_DSMODES: + self.dsmode = server_meta['cloudinit-dsmode'] + except: + util.logexc(LOG, "Failed reading from the serial port") + return False + return True + + def get_hostname(self, fqdn=False, resolve_ip=False): + """ + Cleans up and uses the server's name if the latter is set. Otherwise + the first part from uuid is being used. + """ + if re.match(r'^[A-Za-z0-9 -_\.]+$', self.metadata['name']): + return self.metadata['name'][:61] + else: + return self.metadata['uuid'].split('-')[0] + + def get_public_ssh_keys(self): + return [self.ssh_public_key] + + def get_instance_id(self): + return self.metadata['uuid'] + + +# Used to match classes to dependencies. Since this datasource uses the serial +# port network is not really required, so it's okay to load without it, too. +datasources = [ + (DataSourceCloudSigma, (sources.DEP_FILESYSTEM)), + (DataSourceCloudSigma, (sources.DEP_FILESYSTEM, sources.DEP_NETWORK)), +] + + +def get_datasource_list(depends): + """ + Return a list of data sources that match this set of dependencies + """ + return sources.list_from_depends(depends, datasources) diff --git a/doc/sources/cloudsigma/README.rst b/doc/sources/cloudsigma/README.rst new file mode 100644 index 00000000..8cb2b0fe --- /dev/null +++ b/doc/sources/cloudsigma/README.rst @@ -0,0 +1,34 @@ +===================== +CloudSigma Datasource +===================== + +This datasource finds metadata and user-data from the `CloudSigma`_ cloud platform. +Data transfer occurs through a virtual serial port of the `CloudSigma`_'s VM and the +presence of network adapter is **NOT** a requirement, + + See `server context`_ in the public documentation for more information. + + +Setting a hostname +~~~~~~~~~~~~~~~~~~ + +By default the name of the server will be applied as a hostname on the first boot. + + +Providing user-data +~~~~~~~~~~~~~~~~~~~ + +You can provide user-data to the VM using the dedicated `meta field`_ in the `server context`_ +``cloudinit-user-data``. By default *cloud-config* format is expected there and the ``#cloud-config`` +header could be omitted. However since this is a raw-text field you could provide any of the valid +`config formats`_. + +If your user-data needs an internet connection you have to create a `meta field`_ in the `server context`_ +``cloudinit-dsmode`` and set "net" as value. If this field does not exist the default value is "local". + + + +.. _CloudSigma: http://cloudsigma.com/ +.. _server context: http://cloudsigma-docs.readthedocs.org/en/latest/server_context.html +.. _meta field: http://cloudsigma-docs.readthedocs.org/en/latest/meta.html +.. _config formats: http://cloudinit.readthedocs.org/en/latest/topics/format.html diff --git a/requirements.txt b/requirements.txt index 8f695c68..fdcbd143 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,8 +10,8 @@ PrettyTable # datasource is removed, this is no longer needed oauth -# This one is currently used only by the SmartOS datasource. If that -# datasource is removed, this is no longer needed +# This one is currently used only by the CloudSigma and SmartOS datasources. +# If these datasources are removed, this is no longer needed pyserial # This is only needed for places where we need to support configs in a manner diff --git a/tests/unittests/test_cs_util.py b/tests/unittests/test_cs_util.py new file mode 100644 index 00000000..7d59222b --- /dev/null +++ b/tests/unittests/test_cs_util.py @@ -0,0 +1,65 @@ +from mocker import MockerTestCase + +from cloudinit.cs_utils import Cepko + + +SERVER_CONTEXT = { + "cpu": 1000, + "cpus_instead_of_cores": False, + "global_context": {"some_global_key": "some_global_val"}, + "mem": 1073741824, + "meta": {"ssh_public_key": "ssh-rsa AAAAB3NzaC1yc2E.../hQ5D5 john@doe"}, + "name": "test_server", + "requirements": [], + "smp": 1, + "tags": ["much server", "very performance"], + "uuid": "65b2fb23-8c03-4187-a3ba-8b7c919e889", + "vnc_password": "9e84d6cb49e46379" +} + + +class CepkoMock(Cepko): + def all(self): + return SERVER_CONTEXT + + def get(self, key="", request_pattern=None): + return SERVER_CONTEXT['tags'] + + +class CepkoResultTests(MockerTestCase): + def setUp(self): + self.mocked = self.mocker.replace("cloudinit.cs_utils.Cepko", + spec=CepkoMock, + count=False, + passthrough=False) + self.mocked() + self.mocker.result(CepkoMock()) + self.mocker.replay() + self.c = Cepko() + + def test_getitem(self): + result = self.c.all() + self.assertEqual("65b2fb23-8c03-4187-a3ba-8b7c919e889", result['uuid']) + self.assertEqual([], result['requirements']) + self.assertEqual("much server", result['tags'][0]) + self.assertEqual(1, result['smp']) + + def test_len(self): + self.assertEqual(len(SERVER_CONTEXT), len(self.c.all())) + + def test_contains(self): + result = self.c.all() + self.assertTrue('uuid' in result) + self.assertFalse('uid' in result) + self.assertTrue('meta' in result) + self.assertFalse('ssh_public_key' in result) + + def test_iter(self): + self.assertEqual(sorted(SERVER_CONTEXT.keys()), + sorted([key for key in self.c.all()])) + + def test_with_list_as_result(self): + result = self.c.get('tags') + self.assertEqual('much server', result[0]) + self.assertTrue('very performance' in result) + self.assertEqual(2, len(result)) diff --git a/tests/unittests/test_datasource/test_cloudsigma.py b/tests/unittests/test_datasource/test_cloudsigma.py new file mode 100644 index 00000000..3245aba1 --- /dev/null +++ b/tests/unittests/test_datasource/test_cloudsigma.py @@ -0,0 +1,59 @@ +# coding: utf-8 +from unittest import TestCase + +from cloudinit.cs_utils import Cepko +from cloudinit.sources import DataSourceCloudSigma + + +SERVER_CONTEXT = { + "cpu": 1000, + "cpus_instead_of_cores": False, + "global_context": {"some_global_key": "some_global_val"}, + "mem": 1073741824, + "meta": { + "ssh_public_key": "ssh-rsa AAAAB3NzaC1yc2E.../hQ5D5 john@doe", + "cloudinit-user-data": "#cloud-config\n\n...", + }, + "name": "test_server", + "requirements": [], + "smp": 1, + "tags": ["much server", "very performance"], + "uuid": "65b2fb23-8c03-4187-a3ba-8b7c919e8890", + "vnc_password": "9e84d6cb49e46379" +} + + +class CepkoMock(Cepko): + result = SERVER_CONTEXT + + def all(self): + return self + + +class DataSourceCloudSigmaTest(TestCase): + def setUp(self): + self.datasource = DataSourceCloudSigma.DataSourceCloudSigma("", "", "") + self.datasource.cepko = CepkoMock() + self.datasource.get_data() + + def test_get_hostname(self): + self.assertEqual("test_server", self.datasource.get_hostname()) + self.datasource.metadata['name'] = '' + self.assertEqual("65b2fb23", self.datasource.get_hostname()) + self.datasource.metadata['name'] = u'ั‚ะตัั‚' + self.assertEqual("65b2fb23", self.datasource.get_hostname()) + + def test_get_public_ssh_keys(self): + self.assertEqual([SERVER_CONTEXT['meta']['ssh_public_key']], + self.datasource.get_public_ssh_keys()) + + def test_get_instance_id(self): + self.assertEqual(SERVER_CONTEXT['uuid'], + self.datasource.get_instance_id()) + + def test_metadata(self): + self.assertEqual(self.datasource.metadata, SERVER_CONTEXT) + + def test_user_data(self): + self.assertEqual(self.datasource.userdata_raw, + SERVER_CONTEXT['meta']['cloudinit-user-data']) -- cgit v1.2.3 From 4ada54b39a852d0e4afea09b71ad248c90eb1501 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 12 Feb 2014 12:19:13 -0500 Subject: cc_emit_upstart: do not bother filtering this module should "work" everywhere, in that it will only do anything if /sbin/initctl exists (which is going to be upstart). --- cloudinit/config/cc_emit_upstart.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/config/cc_emit_upstart.py b/cloudinit/config/cc_emit_upstart.py index 5c2f6a31..6d376184 100644 --- a/cloudinit/config/cc_emit_upstart.py +++ b/cloudinit/config/cc_emit_upstart.py @@ -29,8 +29,6 @@ distros = ['ubuntu', 'debian'] def handle(name, _cfg, cloud, log, args): - if cloud.distro.is_excluded(name): - return event_names = args if not event_names: # Default to the 'cloud-config' -- cgit v1.2.3 From 8d117d37e2945369abaa66d1e30f153e483c3faf Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 12 Feb 2014 14:44:41 -0500 Subject: fix pylint warning (and real bug) in bad spelling of resolve_conf_fn --- cloudinit/distros/arch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cloudinit') diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py index fc5eee66..27dcaa88 100644 --- a/cloudinit/distros/arch.py +++ b/cloudinit/distros/arch.py @@ -34,7 +34,7 @@ class Distro(distros.Distro): network_conf_dir = "/etc/netctl" tz_conf_fn = "/etc/timezone" tz_local_fn = "/etc/localtime" - resolv_conf_fn = "/etc/resolv.conf" + resolve_conf_fn = "/etc/resolv.conf" init_cmd = ['systemctl'] # init scripts exclude_modules = [ 'grub-dpkg', -- cgit v1.2.3 From 20305aea1eac724069e0bfaaf976ec5caa8c2439 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 12 Feb 2014 14:56:55 -0500 Subject: 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. --- cloudinit/config/cc_apt_configure.py | 2 -- cloudinit/config/cc_apt_pipelining.py | 2 -- cloudinit/config/cc_grub_dpkg.py | 2 -- cloudinit/distros/__init__.py | 8 -------- cloudinit/distros/arch.py | 6 ------ cloudinit/distros/gentoo.py | 5 ----- tests/unittests/test_distros/test_is_excluded.py | 15 --------------- 7 files changed, 40 deletions(-) delete mode 100644 tests/unittests/test_distros/test_is_excluded.py (limited to 'cloudinit') 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) 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) diff --git a/tests/unittests/test_distros/test_is_excluded.py b/tests/unittests/test_distros/test_is_excluded.py deleted file mode 100644 index 53a4445c..00000000 --- a/tests/unittests/test_distros/test_is_excluded.py +++ /dev/null @@ -1,15 +0,0 @@ -from cloudinit.distros import gentoo -import unittest - - -class TestIsExcluded(unittest.TestCase): - - def setUp(self): - self.distro = gentoo.Distro('gentoo', {}, None) - self.distro.exclude_modules = ['test-module'] - - def test_is_excluded_success(self): - self.assertEqual(self.distro.is_excluded('test-module'), True) - - def test_is_excluded_fail(self): - self.assertEqual(self.distro.is_excluded('missing'), None) -- cgit v1.2.3 From 7204a820b561f23453820ff79a8228500bc754c9 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 12 Feb 2014 16:05:35 -0500 Subject: Add 'unverified_modules' config option and skip unverified modules Config modules are able to declare distros that they were verified to run on by setting 'distros' as a list in the config module. Previously, if a module was configured to run and the running distro was not listed as supported, it would run anyway, and a warning would be written. Now, we change the behavior to skip those modules. The distro (or user) can specify that a given list of modules should run anyway by declaring the 'unverified_modules' config variable. run_once modules will be run without this filter (ie, expecting that the user explicitly wanted to run it). --- ChangeLog | 2 ++ cloudinit/config/cc_ssh_import_id.py | 3 +-- cloudinit/stages.py | 36 ++++++++++++++++++++++++++---------- doc/examples/cloud-config.txt | 10 ++++++++++ 4 files changed, 39 insertions(+), 12 deletions(-) (limited to 'cloudinit') diff --git a/ChangeLog b/ChangeLog index fcc9e7cb..1e08491b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,8 @@ - initial freebsd support [Harm Weites] - fix in is_ipv4 to accept IP addresses with a '0' in them. - Azure: fix issue when stale data in /var/lib/waagent (LP: #1269626) + - skip config_modules that declare themselves only verified on a set of + distros. Add them to 'unverified_modules' list to run anyway. 0.7.4: - fix issue mounting 'ephemeral0' if ephemeral0 was an alias for a partitioned block device with target filesystem on ephemeral0.1. diff --git a/cloudinit/config/cc_ssh_import_id.py b/cloudinit/config/cc_ssh_import_id.py index 50d96e15..76c1663d 100644 --- a/cloudinit/config/cc_ssh_import_id.py +++ b/cloudinit/config/cc_ssh_import_id.py @@ -26,9 +26,8 @@ from cloudinit import distros as ds from cloudinit import util import pwd -# The ssh-import-id only seems to exist on ubuntu (for now) # https://launchpad.net/ssh-import-id -distros = ['ubuntu'] +distros = ['ubuntu', 'debian'] def handle(_name, cfg, cloud, log, args): diff --git a/cloudinit/stages.py b/cloudinit/stages.py index 593b72a2..7acd3355 100644 --- a/cloudinit/stages.py +++ b/cloudinit/stages.py @@ -632,7 +632,6 @@ class Modules(object): return mostly_mods def _run_modules(self, mostly_mods): - d_name = self.init.distro.name cc = self.init.cloudify() # Return which ones ran # and which ones failed + the exception of why it failed @@ -646,15 +645,6 @@ class Modules(object): if not freq in FREQUENCIES: freq = PER_INSTANCE - worked_distros = set(mod.distros) - worked_distros.update( - distros.Distro.expand_osfamily(mod.osfamilies)) - - if (worked_distros and d_name not in worked_distros): - LOG.warn(("Module %s is verified on %s distros" - " but not on %s distro. It may or may not work" - " correctly."), name, list(worked_distros), - d_name) # Use the configs logger and not our own # TODO(harlowja): possibly check the module # for having a LOG attr and just give it back @@ -686,6 +676,32 @@ class Modules(object): def run_section(self, section_name): raw_mods = self._read_modules(section_name) mostly_mods = self._fixup_modules(raw_mods) + d_name = self.init.distro.name + + skipped = [] + forced = [] + overridden = self.cfg.get('unverified_modules', []) + for (mod, name, _freq, _args) in mostly_mods: + worked_distros = set(mod.distros) + worked_distros.update( + distros.Distro.expand_osfamily(mod.osfamilies)) + + # module does not declare 'distros' or lists this distro + if not worked_distros or d_name in worked_distros: + continue + + if name in overridden: + forced.append(name) + else: + skipped.append(name) + + if skipped: + LOG.info("Skipping modules %s because they are not verified " + "on distro '%s'. To run anyway, add them to " + "'unverified_modules' in config.", skipped, d_name) + if forced: + LOG.info("running unverified_modules: %s", forced) + return self._run_modules(mostly_mods) diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt index 61fa6065..ed4eb7fc 100644 --- a/doc/examples/cloud-config.txt +++ b/doc/examples/cloud-config.txt @@ -319,6 +319,16 @@ cloud_config_modules: - runcmd - byobu +# unverified_modules: [] +# if a config module declares a set of distros as supported then it will be +# skipped if running on a different distro. to override this sanity check, +# provide a list of modules that should be run anyway in 'unverified_modules'. +# The default is an empty list (ie, trust modules). +# +# Example: +# unverified_modules: ['apt-update-upgrade'] +# default: [] + # ssh_import_id: [ user1, user2 ] # ssh_import_id will feed the list in that variable to # ssh-import-id, so that public keys stored in launchpad -- cgit v1.2.3