aboutsummaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-01-15 19:25:17 -0500
committerJames Slagle <jslagle@redhat.com>2016-01-20 19:56:53 +0000
commit0543b4de44c36fcb351b127fa0c0d0c35d17965f (patch)
tree9fd5933155253bdf1ea9fe31b83c8bafd51ae7fe /spec
parent69d44747ecd9f8fb0c171a7b533f8c3a81d89c5d (diff)
packages: secure upgrade workflow from dependency cycles
Change the workflow to be: Upgrade all packages before any services that is notified & managed by Puppet. It also disable the Exec timeout so we rely on Heat timeout and not on the 300s that are the default in Puppet [1] Example: we upgrade and OpenStack config will change (obviously). Puppet catalog will contain 3 important things: * config resources * service resources * package-upgrade Exec resource with that patch, what will happen: * puppet will update config first or second and notify services * puppet will run package-upgrade first or second but before the package-upgrade Exec resource * at the very end, puppet will restart services That way, we avoid complications with Puppet dependency cycle issues. [1] https://docs.puppetlabs.com/references/latest/type.html#exec-attribute-timeout Closes-Bug: 1536349 Change-Id: I07310bdfc5b07b03ac9fa5f8c13e87eaa2bfef4d
Diffstat (limited to 'spec')
-rw-r--r--spec/classes/tripleo_packages_spec.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/spec/classes/tripleo_packages_spec.rb b/spec/classes/tripleo_packages_spec.rb
index 55a135b..80e5d7e 100644
--- a/spec/classes/tripleo_packages_spec.rb
+++ b/spec/classes/tripleo_packages_spec.rb
@@ -20,10 +20,7 @@ describe 'tripleo::packages' do
shared_examples_for 'Red Hat distributions' do
let :pre_condition do
- "
- package{'nova-compute': ensure => present}
- service{'nova-compute': ensure => 'running'}
- "
+ "service{'nova-compute': ensure => 'running'}"
end
let :facts do
@@ -40,7 +37,6 @@ describe 'tripleo::packages' do
end
it 'should contain correct upgrade ordering' do
- is_expected.to contain_package('nova-compute').that_comes_before('Exec[package-upgrade]')
is_expected.to contain_exec('package-upgrade').that_comes_before('Service[nova-compute]')
is_expected.to contain_exec('package-upgrade').with(:command => 'yum -y update')
end