openstack/puppet-tripleo
Code Issues Proposed changes

Deploy WSGI apps at the same step (3)

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

Related-Bug: #1664418
Change-Id: Ie00b717a6741e215e59d219710154f0d2ce6b39e
This commit is contained in:
Emilien Macchi 2017-03-29 17:42:32 -04:00
parent e292871741
commit 2272bcabba
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/aodh/api.pp
View File

@ -66,7 +66,7 @@ class tripleo::profile::base::aodh::api (
} }
if $step >= 4 { if $step >= 3 {
include ::aodh::api include ::aodh::api
class { '::aodh::wsgi::apache': class { '::aodh::wsgi::apache':
ssl_cert => $tls_certfile, ssl_cert => $tls_certfile,

2
manifests/profile/base/heat/api.pp
View File

@ -63,7 +63,7 @@ class tripleo::profile::base::heat::api (
$tls_keyfile = undef $tls_keyfile = undef
} }
if $step >= 4 { if $step >= 3 {
include ::heat::api include ::heat::api
class { '::heat::wsgi::apache_api': class { '::heat::wsgi::apache_api':
ssl_cert => $tls_certfile, ssl_cert => $tls_certfile,

2
manifests/profile/base/heat/api_cfn.pp
View File

@ -63,7 +63,7 @@ class tripleo::profile::base::heat::api_cfn (
$tls_keyfile = undef $tls_keyfile = undef
} }
if $step >= 4 { if $step >= 3 {
include ::heat::api_cfn include ::heat::api_cfn
class { '::heat::wsgi::apache_api_cfn': class { '::heat::wsgi::apache_api_cfn':

2
manifests/profile/base/heat/api_cloudwatch.pp
View File

@ -63,7 +63,7 @@ class tripleo::profile::base::heat::api_cloudwatch (
$tls_keyfile = undef $tls_keyfile = undef
} }
if $step >= 4 { if $step >= 3 {
include ::heat::api_cloudwatch include ::heat::api_cloudwatch
class { '::heat::wsgi::apache_api_cloudwatch': class { '::heat::wsgi::apache_api_cloudwatch':

8
spec/classes/tripleo_profile_base_aodh_api_spec.rb
View File

@ -22,8 +22,8 @@ describe 'tripleo::profile::base::aodh::api' do
"class { '::tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }" "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
end end
context 'with step less than 4' do context 'with step less than 3' do
let(:params) { { :step => 3 } } let(:params) { { :step => 2 } }
it 'should do nothing' do it 'should do nothing' do
is_expected.to contain_class('tripleo::profile::base::aodh::api') is_expected.to contain_class('tripleo::profile::base::aodh::api')
@ -33,9 +33,9 @@ describe 'tripleo::profile::base::aodh::api' do
end end
end end
context 'with step 4' do context 'with step 3' do
let(:params) { { let(:params) { {
:step => 4, :step => 3,
} } } }
it 'should trigger complete configuration' do it 'should trigger complete configuration' do