From 2272bcabba8752cd1876f85b1f9b83b0c7592c94 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 29 Mar 2017 17:42:32 -0400
Subject: Deploy WSGI apps at the same step (3)

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

Related-Bug: #1664418
Change-Id: Ie00b717a6741e215e59d219710154f0d2ce6b39e
---
 manifests/profile/base/aodh/api.pp                 | 2 +-
 manifests/profile/base/heat/api.pp                 | 2 +-
 manifests/profile/base/heat/api_cfn.pp             | 2 +-
 manifests/profile/base/heat/api_cloudwatch.pp      | 2 +-
 spec/classes/tripleo_profile_base_aodh_api_spec.rb | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/profile/base/aodh/api.pp b/manifests/profile/base/aodh/api.pp
index 0834536..22fc000 100644
--- a/manifests/profile/base/aodh/api.pp
+++ b/manifests/profile/base/aodh/api.pp
@@ -66,7 +66,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/manifests/profile/base/heat/api.pp b/manifests/profile/base/heat/api.pp
index f35735b..8e2da7e 100644
--- a/manifests/profile/base/heat/api.pp
+++ b/manifests/profile/base/heat/api.pp
@@ -63,7 +63,7 @@ class tripleo::profile::base::heat::api (
     $tls_keyfile = undef
   }
 
-  if $step >= 4 {
+  if $step >= 3 {
     include ::heat::api
     class { '::heat::wsgi::apache_api':
       ssl_cert => $tls_certfile,
diff --git a/manifests/profile/base/heat/api_cfn.pp b/manifests/profile/base/heat/api_cfn.pp
index 2545dbc..02eb82a 100644
--- a/manifests/profile/base/heat/api_cfn.pp
+++ b/manifests/profile/base/heat/api_cfn.pp
@@ -63,7 +63,7 @@ class tripleo::profile::base::heat::api_cfn (
     $tls_keyfile = undef
   }
 
-  if $step >= 4 {
+  if $step >= 3 {
     include ::heat::api_cfn
 
     class { '::heat::wsgi::apache_api_cfn':
diff --git a/manifests/profile/base/heat/api_cloudwatch.pp b/manifests/profile/base/heat/api_cloudwatch.pp
index 872de8d..558d247 100644
--- a/manifests/profile/base/heat/api_cloudwatch.pp
+++ b/manifests/profile/base/heat/api_cloudwatch.pp
@@ -63,7 +63,7 @@ class tripleo::profile::base::heat::api_cloudwatch (
     $tls_keyfile = undef
   }
 
-  if $step >= 4 {
+  if $step >= 3 {
     include ::heat::api_cloudwatch
 
     class { '::heat::wsgi::apache_api_cloudwatch':
diff --git a/spec/classes/tripleo_profile_base_aodh_api_spec.rb b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
index f2a26bf..a82cf49 100644
--- 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]}, oslomsg_rpc_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
-- 
cgit 1.2.3-korg