Merge pull request #86 from kuleuven/groupinstall-options

Add optional parameters to groupinstall

Author: bastelfreak

README.md

@@ -303,13 +303,17 @@ yum::versionlock { '0:bash-4.1.2-9.el6_2.*':
 
 ### Install or remove *yum* package group
 
+Install yum [package groups](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/system_administrators_guide/sec-working_with_package_groups).  To list groups: `yum group list`. Then use that name in your puppet manifest. With support for install_options (e.g. enable repos if disabled by default).
+
 ```puppet
 yum::group { 'X Window System':
-  ensure  => present,
-  timeout => 600,
+  ensure          => present,
+  timeout         => 600,
+  install_options => ['--enablerepo=*'];
 }
 ```
 
+
 ### Install or remove packages via `yum install`
 
 This is a workaround for [PUP-3323](https://tickets.puppetlabs.com/browse/PUP-3323).  It enables the installation of packages from non-repo sources while still providing dependency resolution.  For example, say there is a package *foo* that requires the package *bar*.  *bar* is in a Yum repository and *foo* is stored on a stand-alone HTTP server.  Using the standard providers for the `Package` resource type, `rpm` and `yum`, the `rpm` provider would be required to install *foo*, because only it can install from a non-repo source, i.e., a URL.  However, since the `rpm` provider cannot do dependency resolution, it would fail on its own unless *bar* was already installed.  This workaround enables *foo* to be installed without having to define its dependencies in Puppet.

manifests/group.pp

@@ -6,6 +6,7 @@
 #   [*ensure*]   - specifies if package group should be
 #                  present (installed) or absent (purged)
 #   [*timeout*]  - exec timeout for yum groupinstall command
+#   [*install_options*]  - options provided to yum groupinstall command
 #
 # Actions:
 #
@@ -18,9 +19,11 @@
 #   }
 #
 define yum::group (
-  Enum['present', 'installed', 'absent', 'purged'] $ensure  = 'present',
-  Optional[Integer]                                $timeout = undef,
+  Array[String[1]]                                    $install_options = [],
+  Enum['present', 'installed', 'absent', 'purged'] $ensure             = 'present',
+  Optional[Integer] $timeout                                           = undef,
 ) {
+
   Exec {
     path        => '/bin:/usr/bin:/sbin:/usr/sbin',
     environment => 'LC_ALL=C',
@@ -29,7 +32,7 @@
   case $ensure {
     'present', 'installed', default: {
       exec { "yum-groupinstall-${name}":
-        command => "yum -y groupinstall '${name}'",
+        command => join(concat(["yum -y groupinstall '${name}'"], $install_options), ' '),
         unless  => "yum grouplist hidden '${name}' | egrep -i '^Installed.+Groups:$'",
         timeout => $timeout,
       }

spec/defines/group_spec.rb

@@ -23,4 +23,11 @@
     it { is_expected.to compile.with_all_deps }
     it { is_expected.to contain_exec("yum-groupinstall-#{title}").with_timeout(30) }
   end
+  context 'with an install option specified' do
+    let(:title) { 'Core' }
+    let(:params) { { install_options: ['--enablerepo=epel'] } }
+
+    it { is_expected.to compile.with_all_deps }
+    it { is_expected.to contain_exec("yum-groupinstall-#{title}").with_command("yum -y groupinstall 'Core' --enablerepo=epel") }
+  end
 end