openstack/puppet-nova
Code Issues Proposed changes

Deprecate nova-consoleauth service

Browse Source 
This deprecates the nova-consoleauth service
and the surrounding functionality.

Depends-On: https://review.opendev.org/661262
Change-Id: Ia4d4e411647e039b655fe62edb06afe9c53288cf
This commit is contained in:
Tobias Urdin 2019-05-24 14:19:09 +02:00
parent a6e7f4cf12
commit a738129d22
9 changed files with 27 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/nova_with_pacemaker.pp
View File

@ -18,7 +18,6 @@
#
# sudo pcs resource create nova_api_service lsb:openstack-nova-api
# sudo pcs resource create nova_conductor_service lsb:openstack-nova-conductor
# sudo pcs resource create nova_consoleauth_service lsb:openstack-nova-consoleauth
# sudo pcs resource create nova_novncproxy_service lsb:openstack-nova-novncproxy
# sudo pcs resource create nova_scheduler_service lsb:openstack-nova-scheduler
#
@ -38,11 +37,6 @@ class { '::nova::conductor':
manage_service => false,
}
class { '::nova::consoleauth':
enabled => false,
manage_service => false,
}
class { '::nova::scheduler':
enabled => false,
manage_service => false,

14
manifests/consoleauth.pp
View File

@ -5,6 +5,8 @@
# The consoleauth service is required for vncproxy auth
# for Horizon
#
# DEPRECATED!
#
# === Parameters
#
# [*enabled*]
@ -25,15 +27,5 @@ class nova::consoleauth(
$ensure_package = 'present'
) {
include ::nova::deps
include ::nova::params
nova::generic_service { 'consoleauth':
enabled => $enabled,
manage_service => $manage_service,
package_name => $::nova::params::consoleauth_package_name,
service_name => $::nova::params::consoleauth_service_name,
ensure_package => $ensure_package,
}
warning('nova::consoleauth is deprecated and has no effect')
}

15
manifests/init.pp
View File

@ -340,10 +340,6 @@
# (optional) Sets a version cap for messages sent to console services
# Defaults to $::os_service_default
#
# [*upgrade_level_consoleauth*]
# (optional) Sets a version cap for messages sent to consoleauth services
# Defaults to $::os_service_default
#
# [*upgrade_level_intercell*]
# (optional) Sets a version cap for messages sent between cells services
# Defaults to $::os_service_default
@ -413,6 +409,10 @@
# exceptions in the API service
# Defaults to undef
#
# [*upgrade_level_consoleauth*]
# (optional) Sets a version cap for messages sent to consoleauth services
# Defaults to undef
#
class nova(
$ensure_package = 'present',
$database_connection = undef,
@ -492,7 +492,6 @@ class nova(
$upgrade_level_compute = $::os_service_default,
$upgrade_level_conductor = $::os_service_default,
$upgrade_level_console = $::os_service_default,
$upgrade_level_consoleauth = $::os_service_default,
$upgrade_level_intercell = $::os_service_default,
$upgrade_level_network = $::os_service_default,
$upgrade_level_scheduler = $::os_service_default,
@ -506,6 +505,7 @@ class nova(
$notify_api_faults = undef,
$image_service = undef,
$notify_on_api_faults = undef,
$upgrade_level_consoleauth = undef,
) inherits nova::params {
include ::nova::deps
@ -526,6 +526,10 @@ class nova(
warning('The notify_on_api_faults parameter is deprecated.')
}
if $upgrade_level_consoleauth {
warning('The nova::upgrade_level_consoleauth parameter is deprecated and has no effect')
}
if $image_service {
warning('The unused image_service parameter is deprecated, as we are \
already using python-glanceclient instead of old glance client.')
@ -738,7 +742,6 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
'upgrade_levels/compute': value => $upgrade_level_compute;
'upgrade_levels/conductor': value => $upgrade_level_conductor;
'upgrade_levels/console': value => $upgrade_level_console;
'upgrade_levels/consoleauth': value => $upgrade_level_consoleauth;
'upgrade_levels/intercell': value => $upgrade_level_intercell;
'upgrade_levels/network': value => $upgrade_level_network;
'upgrade_levels/scheduler': value => $upgrade_level_scheduler;

4
manifests/params.pp
View File

@ -16,7 +16,6 @@ class nova::params {
$python_package_name = "python${pyvers}-nova"
$compute_package_name = 'openstack-nova-compute'
$conductor_package_name = 'openstack-nova-conductor'
$consoleauth_package_name = 'openstack-nova-console'
$doc_package_name = 'openstack-nova-doc'
$libvirt_package_name = 'libvirt'
$libvirt_guests_package_name = 'libvirt-client'
@ -34,7 +33,6 @@ class nova::params {
$api_service_name = 'openstack-nova-api'
$compute_service_name = 'openstack-nova-compute'
$conductor_service_name = 'openstack-nova-conductor'
$consoleauth_service_name = 'openstack-nova-consoleauth'
$libvirt_service_name = 'libvirtd'
$libvirt_guests_service_name = 'libvirt-guests'
$virtlock_service_name = 'virtlockd'
@ -81,7 +79,6 @@ class nova::params {
$python_package_name = "python${pyvers}-nova"
$compute_package_name = 'nova-compute'
$conductor_package_name = 'nova-conductor'
$consoleauth_package_name = 'nova-consoleauth'
$doc_package_name = 'nova-doc'
if ($::operatingsystem == 'Debian') and (versioncmp($::operatingsystemmajrelease, '9') >= 0 ) {
$libvirt_package_name = 'libvirt-daemon-system'
@ -97,7 +94,6 @@ class nova::params {
$api_service_name = 'nova-api'
$compute_service_name = 'nova-compute'
$conductor_service_name = 'nova-conductor'
$consoleauth_service_name = 'nova-consoleauth'
$network_service_name = 'nova-network'
$scheduler_service_name = 'nova-scheduler'
$vncproxy_service_name = 'nova-novncproxy'

14
releasenotes/notes/deprecate-consoleauth-7c39573925d3f6a7.yaml Normal file
View File

@ -0,0 +1,14 @@
---
upgrade:
- |
The nova-consoleauth service is now deprecated and not deployed.
This means the nova::consoleauth has no effect now and does not manage
the package or service for consoleauth. Deployments should stop this service
and remove the package if it's deployed.
deprecations:
- |
The nova-consoleauth service is deprecated. The nova::consoleauth class
has no effect now and will be removed in the next release.
- |
The nova::upgrade_level_consoleauth parameter is deprecated, has no effect
and will be removed in the next release.

34
spec/classes/nova_consoleauth_spec.rb
View File

@ -1,34 +0,0 @@
require 'spec_helper'
describe 'nova::consoleauth' 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-consoleauth',
:package_name => 'nova-consoleauth',
:service_name => 'nova-consoleauth' }
when 'RedHat'
it_behaves_like 'generic nova service', {
:name => 'nova-consoleauth',
:package_name => 'openstack-nova-console',
:service_name => 'openstack-nova-consoleauth' }
end
end
end
end
end

2
spec/classes/nova_init_spec.rb
View File

@ -98,7 +98,6 @@ describe 'nova' do
:upgrade_level_compute => '1.0.0',
:upgrade_level_conductor => '1.0.0',
:upgrade_level_console => '1.0.0',
:upgrade_level_consoleauth => '1.0.0',
:upgrade_level_intercell => '1.0.0',
:upgrade_level_network => '1.0.0',
:upgrade_level_scheduler => '1.0.0',
@ -154,7 +153,6 @@ describe 'nova' do
is_expected.to contain_nova_config('upgrade_levels/compute').with_value('1.0.0')
is_expected.to contain_nova_config('upgrade_levels/conductor').with_value('1.0.0')
is_expected.to contain_nova_config('upgrade_levels/console').with_value('1.0.0')
is_expected.to contain_nova_config('upgrade_levels/consoleauth').with_value('1.0.0')
is_expected.to contain_nova_config('upgrade_levels/intercell').with_value('1.0.0')
is_expected.to contain_nova_config('upgrade_levels/network').with_value('1.0.0')
is_expected.to contain_nova_config('upgrade_levels/scheduler').with_value('1.0.0')

1
spec/fixtures/manifests/site.pp vendored
View File

@ -2,6 +2,5 @@ node default {}
node 'test-001.example.org' {
include ::nova
include ::nova::consoleauth
include ::nova::spicehtml5proxy
}

6
spec/hosts/test-001_spec.rb
View File

@ -3,12 +3,8 @@ require 'spec_helper'
describe 'test-001.example.org' do
shared_examples_for 'both services' do
# Bug #1278452
it 'nova::consoleauth and nova::spicehtml5proxy do not conflict' do
is_expected.to contain_class('nova::consoleauth')
it 'nova::spicehtml5proxy' do
is_expected.to contain_class('nova::spicehtml5proxy')
is_expected.to contain_nova__generic_service('consoleauth')
is_expected.to contain_nova__generic_service('spicehtml5proxy')
end
end