Deploy WSGI apps at the same step (3)

So we avoid useless apache restart and save time during the deployment.

Note: the backport is not 100% clean as Heat API was not deployed in
WSGI during Ocata cycle, so now, it's only for Aodh.

Related-Bug: #1664418
Change-Id: Ie00b717a6741e215e59d219710154f0d2ce6b39e
(cherry picked from commit 2272bcabba8752cd1876f85b1f9b83b0c7592c94)

diff --git a/manifests/profile/base/aodh/api.pp b/manifests/profile/base/aodh/api.pp
index af4a5b3..1c03059 100644 (file)
--- a/manifests/profile/base/aodh/api.pp
+++ b/manifests/profile/base/aodh/api.pp
@@ -79,7 +79,7 @@ class tripleo::profile::base::aodh::api (
   }
 
 
-  if $step >= 4 {
+  if $step >= 3 {
     include ::aodh::api
     class { '::aodh::wsgi::apache':
       ssl_cert => $tls_certfile,

diff --git a/spec/classes/tripleo_profile_base_aodh_api_spec.rb b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
index 22f26cf..eda649a 100644 (file)
--- a/spec/classes/tripleo_profile_base_aodh_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
@@ -22,8 +22,8 @@ describe 'tripleo::profile::base::aodh::api' do
       "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, rabbit_hosts => ['localhost.localdomain'] }"
     end
 
-    context 'with step less than 4' do
-      let(:params) { { :step => 3 } }
+    context 'with step less than 3' do
+      let(:params) { { :step => 2 } }
 
       it 'should do nothing' do
         is_expected.to contain_class('tripleo::profile::base::aodh::api')
@@ -33,9 +33,9 @@ describe 'tripleo::profile::base::aodh::api' do
       end
     end
 
-    context 'with step 4' do
+    context 'with step 3' do
       let(:params) { {
-        :step => 4,
+        :step => 3,
       } }
 
       it 'should trigger complete configuration' do