From 45783d1c643b7a47454207b3a90575f1ed8ab46d Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 14 Oct 2016 10:15:01 -0400 Subject: packages: run upgrade at 'setup' stage Instead of using an operator to make sure we upgrade package before any service, which causes dependency cycles with iptables puppet module, let's do another approach where we upgrade rpms in the 'setup' stage, which is a stage that runs before configure and running services. In that way, we'll remove dependency cycles and make sure packages are upgrades before configure and running TripleO services. Change-Id: I1be83f88be1959885c980ab4f428477d412751f7 --- spec/classes/tripleo_packages_spec.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'spec/classes/tripleo_packages_spec.rb') diff --git a/spec/classes/tripleo_packages_spec.rb b/spec/classes/tripleo_packages_spec.rb index 076d9cd..8db238a 100644 --- a/spec/classes/tripleo_packages_spec.rb +++ b/spec/classes/tripleo_packages_spec.rb @@ -29,9 +29,8 @@ describe 'tripleo::packages' do } end - it 'should contain correct upgrade ordering' do - 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') + it 'should contain upgrade exec' do + is_expected.to contain_exec('package-upgrade').with(:command => 'yum -y update') end end -- cgit 1.2.3-korg