Remove deprecated designate::producer::backend_url
... because it was deprecated during Xena cycle[1] in favor of the new
designate::coordination class.
[1] 823d409fe8
Change-Id: I564ef6ec944c4b0f4a48fe99db2aade54e7f684c
This commit is contained in:
parent
5d9b0ede4e
commit
d4550c5b6e
|
@ -26,10 +26,8 @@ class designate::coordination (
|
||||||
|
|
||||||
include designate::deps
|
include designate::deps
|
||||||
|
|
||||||
$backend_url_real = pick($::designate::producer::backend_url, $backend_url)
|
|
||||||
|
|
||||||
oslo::coordination{ 'designate_config':
|
oslo::coordination{ 'designate_config':
|
||||||
backend_url => $backend_url_real
|
backend_url => $backend_url
|
||||||
}
|
}
|
||||||
|
|
||||||
designate_config {
|
designate_config {
|
||||||
|
|
|
@ -32,12 +32,6 @@
|
||||||
# (optional) List of tasks to enable, the default enables all tasks.
|
# (optional) List of tasks to enable, the default enables all tasks.
|
||||||
# Defaults to $::os_service_default.
|
# Defaults to $::os_service_default.
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*backend_url*]
|
|
||||||
# (optional) URL to use for coordination, should be a tooz URL.
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
class designate::producer (
|
class designate::producer (
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$package_name = $::designate::params::producer_package_name,
|
$package_name = $::designate::params::producer_package_name,
|
||||||
|
@ -46,8 +40,6 @@ class designate::producer (
|
||||||
$workers = $::os_workers,
|
$workers = $::os_workers,
|
||||||
$threads = $::os_service_default,
|
$threads = $::os_service_default,
|
||||||
$enabled_tasks = $::os_service_default,
|
$enabled_tasks = $::os_service_default,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$backend_url = undef,
|
|
||||||
) inherits designate::params {
|
) inherits designate::params {
|
||||||
|
|
||||||
designate_config {
|
designate_config {
|
||||||
|
@ -56,11 +48,6 @@ class designate::producer (
|
||||||
'service:producer/enabled_tasks' : value => join(any2array($enabled_tasks), ',');
|
'service:producer/enabled_tasks' : value => join(any2array($enabled_tasks), ',');
|
||||||
}
|
}
|
||||||
|
|
||||||
if $backend_url != undef {
|
|
||||||
warning('designate::producer::backend_url is deprecated. Use designate::coordination instead')
|
|
||||||
include designate::coordination
|
|
||||||
}
|
|
||||||
|
|
||||||
designate::generic_service { 'producer':
|
designate::generic_service { 'producer':
|
||||||
package_ensure => $package_ensure,
|
package_ensure => $package_ensure,
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``designate::producer::backend_url`` parameter has been removed.
|
|
@ -11,10 +11,9 @@ describe 'designate::producer' do
|
||||||
end
|
end
|
||||||
let :designate_producer_params do
|
let :designate_producer_params do
|
||||||
{
|
{
|
||||||
:workers => '3',
|
:workers => '3',
|
||||||
:threads => '3000',
|
:threads => '3000',
|
||||||
:enabled_tasks => ['domain_purge','periodic_secondary_refresh'],
|
:enabled_tasks => ['domain_purge','periodic_secondary_refresh'],
|
||||||
:backend_url => 'redis://10.0.0.1:1234'
|
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -47,7 +46,6 @@ describe 'designate::producer' do
|
||||||
is_expected.to contain_designate_config("service:producer/workers").with_value('3')
|
is_expected.to contain_designate_config("service:producer/workers").with_value('3')
|
||||||
is_expected.to contain_designate_config("service:producer/threads").with_value('3000')
|
is_expected.to contain_designate_config("service:producer/threads").with_value('3000')
|
||||||
is_expected.to contain_designate_config("service:producer/enabled_tasks").with_value('domain_purge,periodic_secondary_refresh')
|
is_expected.to contain_designate_config("service:producer/enabled_tasks").with_value('domain_purge,periodic_secondary_refresh')
|
||||||
is_expected.to contain_designate_config("coordination/backend_url").with_value('redis://10.0.0.1:1234')
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue