From dc3ebfe2416028b78b6a846e939201d894b2c9b6 Mon Sep 17 00:00:00 2001
From: Craig Tracey <craigtracey@gmail.com>
Date: Sun, 27 Jan 2013 21:48:03 -0500
Subject: 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.
---
 cloudinit/util.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'cloudinit/util.py')

diff --git a/cloudinit/util.py b/cloudinit/util.py
index c0ea8d91..c9c5f794 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -1560,3 +1560,26 @@ def is_partition(device):
         device = device[5:]
 
     return os.path.isfile("/sys/class/block/%s/partition" % device)
+
+
+def expand_package_list(version_fmt, pkgs):
+    # we will accept tuples, lists of tuples, or just plain lists
+    if not isinstance(pkgs, list):
+        pkgs = [pkgs]
+
+    pkglist = []
+    for pkg in pkgs:
+        if isinstance(pkg, str):
+            pkglist.append(pkg)
+            continue
+
+        if len(pkg) < 1 or len(pkg) > 2:
+            raise RuntimeError("Invalid package_command tuple.")
+
+        if len(pkg) == 2 and pkg[1]:
+            pkglist.append(version_fmt % pkg)
+            continue
+
+        pkglist.append(pkg[0])
+
+    return pkglist
-- 
cgit v1.2.3


From 9ced60371239eb961e9919f13bda8b496e077411 Mon Sep 17 00:00:00 2001
From: ctracey <ctracey@craigtracey.com>
Date: Wed, 30 Jan 2013 19:21:37 -0500
Subject: Support package versions for the generic package config module

Augmenting the package version support to be available when specifying
extra packages to be installed at boot via the 'packages:' yaml key. This
change also improves type checking and add a configuration example to the
docs.
---
 cloudinit/util.py                              | 23 +++++++++++++----------
 doc/examples/cloud-config-install-packages.txt |  4 ++++
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'cloudinit/util.py')

diff --git a/cloudinit/util.py b/cloudinit/util.py
index c9c5f794..ffe844b2 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -402,10 +402,9 @@ def get_cfg_option_list(yobj, key, default=None):
         return []
     val = yobj[key]
     if isinstance(val, (list)):
-        # Should we ensure they are all strings??
-        cval = [str(v) for v in val]
+        cval = [v for v in val]
         return cval
-    if not isinstance(val, (str, basestring)):
+    if not isinstance(val, (basestring)):
         val = str(val)
     return [val]
 
@@ -1569,17 +1568,21 @@ def expand_package_list(version_fmt, pkgs):
 
     pkglist = []
     for pkg in pkgs:
-        if isinstance(pkg, str):
+        if isinstance(pkg, basestring):
             pkglist.append(pkg)
             continue
 
-        if len(pkg) < 1 or len(pkg) > 2:
-            raise RuntimeError("Invalid package_command tuple.")
+        if isinstance(pkg, (tuple, list)):
+            if len(pkg) < 1 or len(pkg) > 2:
+                raise RuntimeError("Invalid package & version tuple.")
 
-        if len(pkg) == 2 and pkg[1]:
-            pkglist.append(version_fmt % pkg)
-            continue
+            if len(pkg) == 2 and pkg[1]:
+                pkglist.append(version_fmt % tuple(pkg))
+                continue
 
-        pkglist.append(pkg[0])
+            pkglist.append(pkg[0])
+
+        else:
+            raise RuntimeError("Invalid package type.")
 
     return pkglist
diff --git a/doc/examples/cloud-config-install-packages.txt b/doc/examples/cloud-config-install-packages.txt
index 4984818f..2edc63da 100644
--- a/doc/examples/cloud-config-install-packages.txt
+++ b/doc/examples/cloud-config-install-packages.txt
@@ -6,6 +6,10 @@
 #
 # if packages are specified, this apt_update will be set to true
 #
+# packages may be supplied as a single package name or as a list
+# with the format [<package>, <version>] wherein the specifc
+# package version will be installed.
 packages:
  - pwgen
  - pastebinit
+ - [libpython2.7, 2.7.3-0ubuntu3.1]
-- 
cgit v1.2.3