Merge "Remove legacy flag and use composable interface"

2 files changed, 3 insertions, 20 deletions

diff --git a/manifests/profile/base/ceilometer/api.pp b/manifests/profile/base/ceilometer/api.pp
index 2e7986b..6ef4748 100644
--- a/manifests/profile/base/ceilometer/api.pp
+++ b/manifests/profile/base/ceilometer/api.pp
@@ -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,
diff --git a/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb
index 2887d32..acc9b51 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb
@@ -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