Remove deprecated nova-cert service configuration
Change-Id: I087685b43ad3551926b24fdc862e28ae3edd4a39
This commit is contained in:
parent
007255f90c
commit
48a036a13e
|
@ -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,
|
||||
}
|
||||
|
||||
}
|
|
@ -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'
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
deprecations:
|
||||
- |
|
||||
Nova-cert service configuration class has been removed.
|
|
@ -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
|
Loading…
Reference in New Issue