From 48a036a13e8291bd6c7b0af8a2324487ecd1a9d7 Mon Sep 17 00:00:00 2001
From: Yaguang Tang <tangyg2@lenovo.com>
Date: Fri, 25 Aug 2017 21:18:43 +0800
Subject: [PATCH] Remove deprecated nova-cert service configuration

Change-Id: I087685b43ad3551926b24fdc862e28ae3edd4a39
---
 manifests/cert.pp                             | 38 -------------------
 manifests/params.pp                           |  4 --
 .../remove_nova_cert-bd8d0a14ff5e272e.yaml    |  4 ++
 spec/classes/nova_cert_spec.rb                | 34 -----------------
 4 files changed, 4 insertions(+), 76 deletions(-)
 delete mode 100644 manifests/cert.pp
 create mode 100644 releasenotes/notes/notes/remove_nova_cert-bd8d0a14ff5e272e.yaml
 delete mode 100644 spec/classes/nova_cert_spec.rb

diff --git a/manifests/cert.pp b/manifests/cert.pp
deleted file mode 100644
index 8fe7e034d..000000000
--- a/manifests/cert.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-# == Class: nova::cert
-#
-# Installs nova cert package and service
-#
-# === Parameters:
-#
-# [*enabled*]
-#   (optional) Whether or not to enable the nova cert service
-#   Defaults to true
-#
-# [*manage_service*]
-#   (optional) Whether to start/stop the service
-#   Defaults to true
-#
-# [*ensure_package*]
-#   (optional) The state to set for the nova-cert package
-#   Defaults to 'present'
-#
-class nova::cert(
-  $enabled        = true,
-  $manage_service = true,
-  $ensure_package = 'present'
-) {
-
-  include ::nova::deps
-  include ::nova::params
-
-  warning('nova::cert class is deprecated and will be removed in Queens.')
-
-  nova::generic_service { 'cert':
-    enabled        => $enabled,
-    manage_service => $manage_service,
-    package_name   => $::nova::params::cert_package_name,
-    service_name   => $::nova::params::cert_service_name,
-    ensure_package => $ensure_package,
-  }
-
-}
diff --git a/manifests/params.pp b/manifests/params.pp
index c27954148..db6bdc151 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -11,7 +11,6 @@ class nova::params {
       $api_package_name              = 'openstack-nova-api'
       $placement_package_name        = 'openstack-nova-placement-api'
       $cells_package_name            = 'openstack-nova-cells'
-      $cert_package_name             = 'openstack-nova-cert'
       $common_package_name           = 'openstack-nova-common'
       $compute_package_name          = 'openstack-nova-compute'
       $conductor_package_name        = 'openstack-nova-conductor'
@@ -31,7 +30,6 @@ class nova::params {
       # service names
       $api_service_name              = 'openstack-nova-api'
       $cells_service_name            = 'openstack-nova-cells'
-      $cert_service_name             = 'openstack-nova-cert'
       $compute_service_name          = 'openstack-nova-compute'
       $conductor_service_name        = 'openstack-nova-conductor'
       $consoleauth_service_name      = 'openstack-nova-consoleauth'
@@ -78,7 +76,6 @@ class nova::params {
       $api_package_name             = 'nova-api'
       $placement_package_name       = 'nova-placement-api'
       $cells_package_name           = 'nova-cells'
-      $cert_package_name            = 'nova-cert'
       $common_package_name          = 'nova-common'
       $compute_package_name         = 'nova-compute'
       $conductor_package_name       = 'nova-conductor'
@@ -94,7 +91,6 @@ class nova::params {
       # service names
       $api_service_name             = 'nova-api'
       $cells_service_name           = 'nova-cells'
-      $cert_service_name            = 'nova-cert'
       $compute_service_name         = 'nova-compute'
       $conductor_service_name       = 'nova-conductor'
       $consoleauth_service_name     = 'nova-consoleauth'
diff --git a/releasenotes/notes/notes/remove_nova_cert-bd8d0a14ff5e272e.yaml b/releasenotes/notes/notes/remove_nova_cert-bd8d0a14ff5e272e.yaml
new file mode 100644
index 000000000..0d4129876
--- /dev/null
+++ b/releasenotes/notes/notes/remove_nova_cert-bd8d0a14ff5e272e.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - |
+    Nova-cert service configuration class has been removed.
diff --git a/spec/classes/nova_cert_spec.rb b/spec/classes/nova_cert_spec.rb
deleted file mode 100644
index 74da08324..000000000
--- a/spec/classes/nova_cert_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-describe 'nova::cert' do
-
-  let :pre_condition do
-    'include nova'
-  end
-
-  on_supported_os({
-    :supported_os => OSDefaults.get_supported_os
-  }).each do |os,facts|
-    context "on #{os}" do
-      let (:facts) do
-        facts.merge!(OSDefaults.get_facts())
-      end
-
-      let (:platform_params) do
-        case facts[:osfamily]
-        when 'Debian'
-          it_behaves_like 'generic nova service', {
-            :name         => 'nova-cert',
-            :package_name => 'nova-cert',
-            :service_name => 'nova-cert' }
-        when 'RedHat'
-          it_behaves_like 'generic nova service', {
-            :name         => 'nova-cert',
-            :package_name => 'openstack-nova-cert',
-            :service_name => 'openstack-nova-cert' }
-        end
-      end
-    end
-  end
-
-end