summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-01 14:38:00 +0000
committerGerrit Code Review <review@openstack.org>2015-10-01 14:38:00 +0000
commita003b3d97ebe8bd470717c419434851d60669bf7 (patch)
tree2f66c57aac9f8b29ed104674d712a72da871db48 /manifests
parent493c3375592f8ef571de13d5e1725b2fa569871e (diff)
parent624f236d6da548453279a88f1c49acdf026a7355 (diff)
Merge "Automatically install packages when upgrading"
Diffstat (limited to 'manifests')
-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' }
}