openstack
/
puppet-designate
Code Issues Proposed changes

Merge "Remove support for designate-zone-manager"

This commit is contained in:
Zuul 2022-05-11 10:20:04 +00:00 committed by Gerrit Code Review
parent d096b9dc4b f6458f5524
commit 65592d2046
4 changed files with 4 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/params.pp
View File

@ -13,7 +13,6 @@ class designate::params {
$central_service_name = 'designate-central'
$sink_service_name = 'designate-sink'
$mdns_service_name = 'designate-mdns'
$zone_manager_service_name = 'designate-zone-manager'
$producer_service_name = 'designate-producer'
$worker_service_name = 'designate-worker'
$group = 'designate'
@ -28,7 +27,6 @@ class designate::params {
$agent_package_name = 'openstack-designate-agent'
$sink_package_name = 'openstack-designate-sink'
$mdns_package_name = 'openstack-designate-mdns'
$zone_manager_package_name = 'openstack-designate-zone-manager'
$producer_package_name = 'openstack-designate-producer'
$worker_package_name = 'openstack-designate-worker'
$designate_wsgi_script_path = '/var/www/cgi-bin/designate'
@ -42,7 +40,6 @@ class designate::params {
$agent_package_name = 'designate-agent'
$sink_package_name = 'designate-sink'
$mdns_package_name = 'designate-mdns'
$zone_manager_package_name = 'designate-zone-manager'
$producer_package_name = 'designate-producer'
$worker_package_name = 'designate-worker'
$designate_wsgi_script_path = '/usr/lib/cgi-bin/designate'

66
manifests/zone_manager.pp
View File

@ -1,66 +0,0 @@
# == Class designate::zone_manager
# DEPRECATED !!
# Configure designate zone manager service
#
# == Parameters
#
# [*package_ensure*]
# (optional) The state of the package
# Defaults to 'present'
#
# [*package_name*]
# (optional) Name of the package
# Defaults to zone_manager_package_name from ::designate::params
#
# [*enabled*]
# (optional) Whether to enable the service.
# Defaults to true
#
# [*manage_service*]
# (Optional) Whether the designate zone manager service will be managed.
# Defaults to true.
#
# [*workers*]
# (optional) Number of workers to spawn.
# Defaults to $::os_workers.
#
# [*threads*]
# (optional) Number of greenthreads to spawn
# Defaults to $::os_service_default.
#
# [*enabled_tasks*]
# (optional) List of tasks to enable, the default enables all tasks.
# Defaults to $::os_service_default.
#
# [*export_synchronous*]
# (optional) Whether to allow synchronous zone exports
# Defaults to $::os_service_default.
#
class designate::zone_manager (
$package_ensure = 'present',
$package_name = $::designate::params::zone_manager_package_name,
$enabled = true,
$manage_service = true,
$workers = $::os_workers,
$threads = $::os_service_default,
$enabled_tasks = $::os_service_default,
$export_synchronous = $::os_service_default,
) inherits designate::params {
warning('The designate::zone_manager class has been deprecated.')
designate_config {
'service:zone_manager/workers' : value => $workers;
'service:zone_manager/threads' : value => $threads;
'service:zone_manager/enabled_tasks' : value => $enabled_tasks;
'service:zone_manager/export_synchronous' : value => $export_synchronous;
}
designate::generic_service { 'zone-manager':
package_ensure => $package_ensure,
enabled => $enabled,
package_name => $package_name,
manage_service => $manage_service,
service_name => $::designate::params::zone_manager_service_name,
}
}

4
releasenotes/notes/remove-zone_manager-fa3571eca39480f9.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``designate::zone_manager`` class has been removed.

75
spec/classes/designate_zone_manager_spec.rb
View File

@ -1,75 +0,0 @@
#
# Unit tests for designate::zone_manager
#
require 'spec_helper'
describe 'designate::zone_manager' do
let :params do
{
}
end
let :designate_zone_manager_params do
{
:workers => '3',
:threads => '3000',
:enabled_tasks => ['domain_purge','periodic_secondary_refresh'],
:export_synchronous => 'False',
}
end
shared_examples 'designate-zone-manager' do
context 'with default parameters' do
it 'installs designate-zone-manager package and service' do
is_expected.to contain_package('designate-zone-manager').with(
:name => platform_params[:zone_manager_package_name],
:ensure => 'present',
:tag => ['openstack','designate-package'],
)
is_expected.to contain_service('designate-zone-manager').with(
:name => 'designate-zone-manager',
:ensure => 'running',
:tag => ['openstack','designate-service'],
)
end
it 'configures designate zone manager with default config options' do
is_expected.to contain_designate_config("service:zone_manager/workers").with(:value => 8)
is_expected.to contain_designate_config("service:zone_manager/threads").with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_designate_config("service:zone_manager/enabled_tasks").with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_designate_config("service:zone_manager/export_synchronous").with(:value => '<SERVICE DEFAULT>')
end
end
context 'with non default parameters' do
before { params.merge!( designate_zone_manager_params ) }
it 'configures desginate zone manager with non default parameters' do
is_expected.to contain_designate_config("service:zone_manager/workers").with(:value => '3')
is_expected.to contain_designate_config("service:zone_manager/threads").with(:value => '3000')
is_expected.to contain_designate_config("service:zone_manager/enabled_tasks").with(:value => ['domain_purge','periodic_secondary_refresh'])
is_expected.to contain_designate_config("service:zone_manager/export_synchronous").with(:value => 'False')
end
end
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({ :os_workers => 8 }))
end
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :zone_manager_package_name => 'designate-zone-manager' }
when 'RedHat'
{ :zone_manager_package_name => 'openstack-designate-zone-manager' }
end
end
it_configures 'designate-zone-manager'
end
end
end