Move ceilometer wsgi to step 3
Apache is configured in step 3 so if we configure ceilometer in step 4, the configuration is removed on updates. We need to configure it in step 3 with the other apache services to ensure we don't have issues on updates. Change-Id: Icc9d03cd8904c93cb6e17f662f141c6e4c0bf423 Related-Bug: #1664418
This commit is contained in:
parent
cb2393f6e0
commit
890178bd6f
|
@ -63,7 +63,7 @@ class tripleo::profile::base::ceilometer::api (
|
|||
$tls_keyfile = undef
|
||||
}
|
||||
|
||||
if $step >= 4 {
|
||||
if $step >= 3 {
|
||||
include ::ceilometer::api
|
||||
class { '::ceilometer::wsgi::apache':
|
||||
ssl_cert => $tls_certfile,
|
||||
|
|
|
@ -22,8 +22,8 @@ describe 'tripleo::profile::base::ceilometer::api' do
|
|||
"class { '::tripleo::profile::base::ceilometer': 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 2' do
|
||||
let(:params) { { :step => 2 } }
|
||||
|
||||
it 'should do nothing' do
|
||||
is_expected.to contain_class('tripleo::profile::base::ceilometer::api')
|
||||
|
@ -32,9 +32,9 @@ describe 'tripleo::profile::base::ceilometer::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
|
||||
|
|
Loading…
Reference in New Issue