summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-09-28 12:28:08 -0400
committerDan Prince <dprince@redhat.com>2015-09-28 15:36:58 -0400
commit624f236d6da548453279a88f1c49acdf026a7355 (patch)
tree511d9427451ee4ead2bd67e5d2395f2540073713
parent7ca1bbf046abfd0cc5897fba49683c62e2c33dbe (diff)
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
-rw-r--r--manifests/packages.pp5
1 files changed, 1 insertions, 4 deletions
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' }
}