From: Dan Prince <dprince@redhat.com>
Date: Mon, 28 Sep 2015 16:28:08 +0000 (-0400)
Subject: Automatically install packages when upgrading
X-Git-Tag: opnfv-6.0.0~835^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=624f236d6da548453279a88f1c49acdf026a7355;p=apex-puppet-tripleo.git

Automatically install packages when upgrading

This simplifies use of tripleo::packages so that when
enable_upgrade is set to true you no longer have to enable_install
as well.

Change-Id: Ic3050a64530be9e2b6827ed8566f59d28547ae81
---

diff --git a/manifests/packages.pp b/manifests/packages.pp
index 6a5813a..ac11efd 100644
--- a/manifests/packages.pp
+++ b/manifests/packages.pp
@@ -32,7 +32,7 @@ class tripleo::packages (
   $enable_upgrade = false,
 ) {
 
-  if !$enable_install {
+  if !$enable_install and !$enable_upgrade {
     case $::osfamily {
       'RedHat': {
         Package <| |> { provider => 'norpm' }
@@ -44,9 +44,6 @@ class tripleo::packages (
   }
 
   if $enable_upgrade {
-    if !$enable_install {
-      fail('Package upgrades require that enable_install be set to true')
-    }
     Package <| |> { ensure => 'latest' }
   }