openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Move ceilometer wsgi to step 3" into stable/ocata

This commit is contained in:
Jenkins 2017-04-21 06:00:55 +00:00 committed by Gerrit Code Review
parent ef4a1da270 9e81a1bcec
commit 11fbb03309
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@ class tripleo::profile::base::ceilometer::api (
$tls_keyfile = undef $tls_keyfile = undef
} }
if $step >= 4 { if $step >= 3 {
include ::ceilometer::api include ::ceilometer::api
include ::apache::mod::ssl include ::apache::mod::ssl
class { '::ceilometer::wsgi::apache': class { '::ceilometer::wsgi::apache':

8
spec/classes/tripleo_profile_base_ceilometer_api_spec.rb
View File

@ -22,8 +22,8 @@ describe 'tripleo::profile::base::ceilometer::api' do
"class { '::tripleo::profile::base::ceilometer': step => #{params[:step]}, rabbit_hosts => ['localhost.localdomain'] }" "class { '::tripleo::profile::base::ceilometer': step => #{params[:step]}, rabbit_hosts => ['localhost.localdomain'] }"
end end
context 'with step less than 4' do context 'with step less than 2' 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::ceilometer::api') is_expected.to contain_class('tripleo::profile::base::ceilometer::api')
@ -32,9 +32,9 @@ describe 'tripleo::profile::base::ceilometer::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