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.

1 files changed, 12 insertions, 4 deletions

diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
index e65be8d7..2f91e386 100644
--- a/cloudinit/distros/rhel.py
+++ b/cloudinit/distros/rhel.py
@@ -63,7 +63,7 @@ class Distro(distros.Distro):
         self.osfamily = 'redhat'
 
     def install_packages(self, pkglist):
-        self.package_command('install', pkglist)
+        self.package_command('install', pkgs=pkglist)
 
     def _adjust_resolve(self, dns_servers, search_servers):
         try:
@@ -208,7 +208,7 @@ class Distro(distros.Distro):
         # 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):
+    def package_command(self, command, args=None, pkgs=[]):
         cmd = ['yum']
         # If enabled, then yum will be tolerant of errors on the command line
         # with regard to packages.
@@ -219,9 +219,17 @@ class Distro(distros.Distro):
         # Determines whether or not yum prompts for confirmation
         # of critical actions. We don't want to prompt...
         cmd.append("-y")
-        cmd.append(command)
-        if args:
+
+        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)