openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Remove legacy flag and use composable interface"

Browse Source
This commit is contained in:
Jenkins 2017-01-18 20:00:35 +00:00 committed by Gerrit Code Review
commit 3b3699ac99
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,10 +18,6 @@
#
# === Parameters
#
# [*enable_legacy_api*]
# (Optional) Enable legacy ceilometer api service.
# Defaults to hiera('enable_legacy_api', false)
#
# [*ceilometer_network*]
# (Optional) The network name where the ceilometer endpoint is listening on.
# This is set by t-h-t.
@ -57,7 +53,6 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::ceilometer::api (
$enable_legacy_api = hiera('enable_legacy_ceilometer_api', false),
$ceilometer_network = hiera('ceilometer_api_network', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
@ -81,7 +76,7 @@ class tripleo::profile::base::ceilometer::api (
$tls_keyfile = undef
}
if $step >= 4 and $enable_legacy_api {
if $step >= 4 {
include ::ceilometer::api
class { '::ceilometer::wsgi::apache':
ssl_cert => $tls_certfile,

16
spec/classes/tripleo_profile_base_ceilometer_api_spec.rb
View File

@ -32,10 +32,9 @@ describe 'tripleo::profile::base::ceilometer::api' do
end
end
context 'with step 4 and enable_legacy_api' do
context 'with step 4' do
let(:params) { {
:step => 4,
:enable_legacy_api => true,
:step => 4,
} }
it 'should trigger complete configuration' do
@ -43,17 +42,6 @@ describe 'tripleo::profile::base::ceilometer::api' do
is_expected.to contain_class('ceilometer::wsgi::apache')
end
end
context 'with step 4 and default enable_legacy_api' do
let(:params) { {
:step => 4,
} }
it 'should do nothing' do
is_expected.to_not contain_class('ceilometer::api')
is_expected.to_not contain_class('ceilometer::wsgi::apache')
end
end
end