Fix package update cases

This change addresses two issues with the existing
puppet-stack-config. The first being if run on a non-RedHat osfamily,
the existing code will fail with a non-helpful message. The second issue
being that if update_packages is disabled, the resource dependency will
fail because Exec['package-upgrade] is not defined.

Change-Id: I682167d10828280a031f6f84c1de11b9bd840db5
Closes-Bug: #1639868
This commit is contained in:
Alex Schultz 2016-11-22 13:40:42 -07:00
parent 7d020ac266
commit 0a316cb503
1 changed files with 3 additions and 2 deletions

View File

@ -26,7 +26,8 @@ if hiera('update_packages') {
$pkg_upgrade_cmd = 'yum -y update'
}
default: {
warning('Please specify a package upgrade command for distribution.')
fail("Unsupported OS. Set undercloud_update_packages to false to bypass \
this error on ${::operatingsystem}.")
}
}
exec { 'package-upgrade':
@ -40,7 +41,7 @@ if hiera('update_packages') {
Package<| tag == 'openstack' |> { ensure => latest }
# Ensure we upgrade all packages after managing OpenStack packages, so Puppet
# can notify services and db_sync commands.
Package<| tag == 'openstack' |> -> Exec['package-upgrade']
Package<| tag == 'openstack' |> -> Exec<| title == 'package-upgrade' |>
# Run OpenStack db-sync at every puppet run, in any case.
Exec<| title == 'neutron-db-sync' |> { refreshonly => false }