diff options
| -rw-r--r-- | manifests/loadbalancer.pp | 2 | ||||
| -rw-r--r-- | manifests/packages.pp | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp index fe76083..24d12b5 100644 --- a/manifests/loadbalancer.pp +++ b/manifests/loadbalancer.pp @@ -723,7 +723,7 @@ class tripleo::loadbalancer ( } } - if manila { + if $manila { haproxy::listen { 'manila': bind => $manila_bind_opts, collect_exported => false, 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' } } |