Remove service:central/backend_driver option, no longer exists
Change-Id: Ide49b872e0bbea640d9948c6d3d6809b70e5d767
This commit is contained in:
parent
1e95f32a6f
commit
ae4b864bbc
@ -22,7 +22,6 @@ node /designate/ {
|
|||||||
$rabbit_userid = 'guest'
|
$rabbit_userid = 'guest'
|
||||||
$rabbit_password = 'guest'
|
$rabbit_password = 'guest'
|
||||||
$auth_strategy = 'keystone'
|
$auth_strategy = 'keystone'
|
||||||
$backend_driver = 'bind9'
|
|
||||||
$designate_db_password = 'admin'
|
$designate_db_password = 'admin'
|
||||||
$db_host = '127.0.0.1'
|
$db_host = '127.0.0.1'
|
||||||
|
|
||||||
@ -74,9 +73,7 @@ node /designate/ {
|
|||||||
keystone_password => $keystone_password,
|
keystone_password => $keystone_password,
|
||||||
}
|
}
|
||||||
|
|
||||||
class {'::designate::central':
|
include '::designate::central'
|
||||||
backend_driver => $backend_driver,
|
|
||||||
}
|
|
||||||
|
|
||||||
include '::designate::dns'
|
include '::designate::dns'
|
||||||
class {'::designate::backend::bind9':
|
class {'::designate::backend::bind9':
|
||||||
|
@ -9,7 +9,6 @@ node /designate/ {
|
|||||||
$rabbit_userid = 'guest'
|
$rabbit_userid = 'guest'
|
||||||
$rabbit_password = 'guest'
|
$rabbit_password = 'guest'
|
||||||
$auth_strategy = 'noauth'
|
$auth_strategy = 'noauth'
|
||||||
$backend_driver = 'bind9'
|
|
||||||
$designate_db_password = 'admin'
|
$designate_db_password = 'admin'
|
||||||
$db_host = '127.0.0.1'
|
$db_host = '127.0.0.1'
|
||||||
|
|
||||||
@ -36,7 +35,5 @@ node /designate/ {
|
|||||||
auth_strategy => $auth_strategy,
|
auth_strategy => $auth_strategy,
|
||||||
}
|
}
|
||||||
|
|
||||||
class {'::designate::central':
|
include '::designate::central'
|
||||||
backend_driver => $backend_driver,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -20,10 +20,6 @@
|
|||||||
# (optional) Whether the designate central service will be running.
|
# (optional) Whether the designate central service will be running.
|
||||||
# Defaults to 'running'
|
# Defaults to 'running'
|
||||||
#
|
#
|
||||||
# [*backend_driver*]
|
|
||||||
# (optional) Driver used for backend communication (fake, rpc, bind9, powerdns)
|
|
||||||
# Defaults to 'bind9'
|
|
||||||
#
|
|
||||||
# [*managed_resource_email*]
|
# [*managed_resource_email*]
|
||||||
# (optional) Email to use for managed resources like domains created by the FloatingIP API
|
# (optional) Email to use for managed resources like domains created by the FloatingIP API
|
||||||
# Defaults to 'hostmaster@example.com'
|
# Defaults to 'hostmaster@example.com'
|
||||||
@ -45,23 +41,33 @@
|
|||||||
# (optional) Minimum TTL.
|
# (optional) Minimum TTL.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
|
# === DEPRECATED PARAMETERS
|
||||||
|
#
|
||||||
|
# [*backend_driver*]
|
||||||
|
# (optional) Driver used for backend communication (fake, rpc, bind9, powerdns)
|
||||||
|
# Defaults to 'undef'
|
||||||
|
#
|
||||||
class designate::central (
|
class designate::central (
|
||||||
$package_ensure = present,
|
$package_ensure = present,
|
||||||
$central_package_name = $::designate::params::central_package_name,
|
$central_package_name = $::designate::params::central_package_name,
|
||||||
$enabled = true,
|
$enabled = true,
|
||||||
$service_ensure = 'running',
|
$service_ensure = 'running',
|
||||||
$backend_driver = 'bind9',
|
|
||||||
$managed_resource_email = 'hostmaster@example.com',
|
$managed_resource_email = 'hostmaster@example.com',
|
||||||
$managed_resource_tenant_id = '123456',
|
$managed_resource_tenant_id = '123456',
|
||||||
$max_domain_name_len = '255',
|
$max_domain_name_len = '255',
|
||||||
$max_recordset_name_len = '255',
|
$max_recordset_name_len = '255',
|
||||||
$min_ttl = $::os_service_default,
|
$min_ttl = $::os_service_default,
|
||||||
|
# DEPRECATED PARAMETERS
|
||||||
|
$backend_driver = undef,
|
||||||
) inherits designate {
|
) inherits designate {
|
||||||
|
|
||||||
include ::designate::deps
|
include ::designate::deps
|
||||||
|
|
||||||
|
if $backend_driver {
|
||||||
|
warning('backend_driver has been deprecated and has no effect. It will be removed in Pike.')
|
||||||
|
}
|
||||||
|
|
||||||
designate_config {
|
designate_config {
|
||||||
'service:central/backend_driver' : value => $backend_driver;
|
|
||||||
'service:central/managed_resource_email' : value => $managed_resource_email;
|
'service:central/managed_resource_email' : value => $managed_resource_email;
|
||||||
'service:central/managed_resource_tenant_id' : value => $managed_resource_tenant_id;
|
'service:central/managed_resource_tenant_id' : value => $managed_resource_tenant_id;
|
||||||
'service:central/max_domain_name_len' : value => $max_domain_name_len;
|
'service:central/max_domain_name_len' : value => $max_domain_name_len;
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- The "backend_driver" option in designate::central is deprecated.
|
||||||
|
This option is no longer recognised by designate from at least
|
||||||
|
mitaka.
|
@ -45,9 +45,7 @@ describe 'basic designate' do
|
|||||||
enabled => true,
|
enabled => true,
|
||||||
auth_strategy => 'keystone',
|
auth_strategy => 'keystone',
|
||||||
}
|
}
|
||||||
class {'::designate::central':
|
include ::designate::central
|
||||||
backend_driver => 'bind9',
|
|
||||||
}
|
|
||||||
class { '::designate::backend::bind9':
|
class { '::designate::backend::bind9':
|
||||||
rndc_config_file => '',
|
rndc_config_file => '',
|
||||||
rndc_key_file => '',
|
rndc_key_file => '',
|
||||||
|
@ -27,7 +27,6 @@ describe 'designate::central' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it 'configures designate-central with default parameters' do
|
it 'configures designate-central with default parameters' do
|
||||||
is_expected.to contain_designate_config('service:central/backend_driver').with_value('bind9')
|
|
||||||
is_expected.to contain_designate_config('service:central/managed_resource_email').with_value('hostmaster@example.com')
|
is_expected.to contain_designate_config('service:central/managed_resource_email').with_value('hostmaster@example.com')
|
||||||
is_expected.to contain_designate_config('service:central/managed_resource_tenant_id').with_value('123456')
|
is_expected.to contain_designate_config('service:central/managed_resource_tenant_id').with_value('123456')
|
||||||
is_expected.to contain_designate_config('service:central/max_domain_name_len').with_value('255')
|
is_expected.to contain_designate_config('service:central/max_domain_name_len').with_value('255')
|
||||||
@ -35,12 +34,6 @@ describe 'designate::central' do
|
|||||||
is_expected.to contain_designate_config('service:central/min_ttl').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_designate_config('service:central/min_ttl').with_value('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when using Power DNS backend driver' do
|
|
||||||
before { params.merge!(:backend_driver => 'powerdns') }
|
|
||||||
it 'configures designate-central with pdns backend' do
|
|
||||||
is_expected.to contain_designate_config('service:central/backend_driver').with_value('powerdns')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with custom package name' do
|
context 'with custom package name' do
|
||||||
|
Loading…
Reference in New Issue
Block a user