diff options
| author | Craig Tracey <craigtracey@gmail.com> | 2013-01-27 21:48:03 -0500 |
|---|---|---|
| committer | Craig Tracey <craigtracey@gmail.com> | 2013-01-27 21:48:03 -0500 |
| commit | dc3ebfe2416028b78b6a846e939201d894b2c9b6 (patch) | |
| tree | 2bb3ee3e3ffb6be44a66639934815fe6138c66e0 /cloudinit/config | |
| parent | cabd9653546586d2370d9c1d81f14e12dd28b94b (diff) | |
| download | vyos-cloud-init-dc3ebfe2416028b78b6a846e939201d894b2c9b6.tar.gz vyos-cloud-init-dc3ebfe2416028b78b6a846e939201d894b2c9b6.zip | |
Adding package versioning logic to package_command
This change adds the ability to provide specific package versions to
Distro.install_packages and subsequently Distro.package_command. In order
to effectively use Distro.install_packages, one is now able to pass a
variety of formats in order to easily manage package requirements. These
are examples of what can be passed:
- "package"
- ["package1","package2"]
- ("package",)
- ("package", "version")
- [("package1",)("package2",)]
- [("package1", "version1"),("package2","version2")]
This change also adds the option to install a specific version for the
puppet configuration module. This is especially important here as
successful puppet deployments are highly reliant on specific puppet
versions.
Diffstat (limited to 'cloudinit/config')
| -rw-r--r-- | cloudinit/config/cc_landscape.py | 2 | ||||
| -rw-r--r-- | cloudinit/config/cc_puppet.py | 10 | ||||
| -rw-r--r-- | cloudinit/config/cc_salt_minion.py | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/cloudinit/config/cc_landscape.py b/cloudinit/config/cc_landscape.py index 02610dd0..2efdff79 100644 --- a/cloudinit/config/cc_landscape.py +++ b/cloudinit/config/cc_landscape.py @@ -62,7 +62,7 @@ def handle(_name, cfg, cloud, log, _args): if not ls_cloudcfg: return - cloud.distro.install_packages(["landscape-client"]) + cloud.distro.install_packages(('landscape-client',)) merge_data = [ LSC_BUILTIN_CFG, diff --git a/cloudinit/config/cc_puppet.py b/cloudinit/config/cc_puppet.py index e9a0a0f4..471a1a8a 100644 --- a/cloudinit/config/cc_puppet.py +++ b/cloudinit/config/cc_puppet.py @@ -59,8 +59,14 @@ def handle(name, cfg, cloud, log, _args): # Start by installing the puppet package if necessary... install = util.get_cfg_option_bool(puppet_cfg, 'install', True) - if install: - cloud.distro.install_packages(["puppet"]) + version = util.get_cfg_option_str(puppet_cfg, 'version', None) + if not install and version: + log.warn(("Puppet install set false but version supplied," + " doing nothing.")) + elif install: + log.debug(("Attempting to install puppet %s,"), + version if version else 'latest') + cloud.distro.install_packages(('puppet', version)) # ... and then update the puppet configuration if 'conf' in puppet_cfg: diff --git a/cloudinit/config/cc_salt_minion.py b/cloudinit/config/cc_salt_minion.py index f3eede18..53013dcb 100644 --- a/cloudinit/config/cc_salt_minion.py +++ b/cloudinit/config/cc_salt_minion.py @@ -31,7 +31,7 @@ def handle(name, cfg, cloud, log, _args): salt_cfg = cfg['salt_minion'] # Start by installing the salt package ... - cloud.distro.install_packages(["salt-minion"]) + cloud.distro.install_packages(('salt-minion',)) # Ensure we can configure files at the right dir config_dir = salt_cfg.get("config_dir", '/etc/salt') |