From ae4b864bbce6545679969a8bb086c4ab972dab18 Mon Sep 17 00:00:00 2001 From: Sam Morrison Date: Fri, 2 Dec 2016 15:11:27 +1100 Subject: [PATCH] Remove service:central/backend_driver option, no longer exists Change-Id: Ide49b872e0bbea640d9948c6d3d6809b70e5d767 --- example/all-in-one-keystone.pp | 5 +---- example/all-in-one-noauth.pp | 5 +---- manifests/central.pp | 18 ++++++++++++------ ...backend_driver-option-cfd8f6a4d3732a7f.yaml | 5 +++++ spec/acceptance/basic_designate_spec.rb | 4 +--- spec/classes/designate_central_spec.rb | 7 ------- 6 files changed, 20 insertions(+), 24 deletions(-) create mode 100644 releasenotes/notes/deprecate-central-backend_driver-option-cfd8f6a4d3732a7f.yaml diff --git a/example/all-in-one-keystone.pp b/example/all-in-one-keystone.pp index a0050e88..188dd9bf 100644 --- a/example/all-in-one-keystone.pp +++ b/example/all-in-one-keystone.pp @@ -22,7 +22,6 @@ node /designate/ { $rabbit_userid = 'guest' $rabbit_password = 'guest' $auth_strategy = 'keystone' - $backend_driver = 'bind9' $designate_db_password = 'admin' $db_host = '127.0.0.1' @@ -74,9 +73,7 @@ node /designate/ { keystone_password => $keystone_password, } - class {'::designate::central': - backend_driver => $backend_driver, - } + include '::designate::central' include '::designate::dns' class {'::designate::backend::bind9': diff --git a/example/all-in-one-noauth.pp b/example/all-in-one-noauth.pp index c949b5ed..f577a5be 100644 --- a/example/all-in-one-noauth.pp +++ b/example/all-in-one-noauth.pp @@ -9,7 +9,6 @@ node /designate/ { $rabbit_userid = 'guest' $rabbit_password = 'guest' $auth_strategy = 'noauth' - $backend_driver = 'bind9' $designate_db_password = 'admin' $db_host = '127.0.0.1' @@ -36,7 +35,5 @@ node /designate/ { auth_strategy => $auth_strategy, } - class {'::designate::central': - backend_driver => $backend_driver, - } + include '::designate::central' } diff --git a/manifests/central.pp b/manifests/central.pp index 0d495d2e..94b9e99d 100644 --- a/manifests/central.pp +++ b/manifests/central.pp @@ -20,10 +20,6 @@ # (optional) Whether the designate central service will be running. # Defaults to 'running' # -# [*backend_driver*] -# (optional) Driver used for backend communication (fake, rpc, bind9, powerdns) -# Defaults to 'bind9' -# # [*managed_resource_email*] # (optional) Email to use for managed resources like domains created by the FloatingIP API # Defaults to 'hostmaster@example.com' @@ -45,23 +41,33 @@ # (optional) Minimum TTL. # 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 ( $package_ensure = present, $central_package_name = $::designate::params::central_package_name, $enabled = true, $service_ensure = 'running', - $backend_driver = 'bind9', $managed_resource_email = 'hostmaster@example.com', $managed_resource_tenant_id = '123456', $max_domain_name_len = '255', $max_recordset_name_len = '255', $min_ttl = $::os_service_default, + # DEPRECATED PARAMETERS + $backend_driver = undef, ) inherits designate { include ::designate::deps + if $backend_driver { + warning('backend_driver has been deprecated and has no effect. It will be removed in Pike.') + } + designate_config { - 'service:central/backend_driver' : value => $backend_driver; 'service:central/managed_resource_email' : value => $managed_resource_email; 'service:central/managed_resource_tenant_id' : value => $managed_resource_tenant_id; 'service:central/max_domain_name_len' : value => $max_domain_name_len; diff --git a/releasenotes/notes/deprecate-central-backend_driver-option-cfd8f6a4d3732a7f.yaml b/releasenotes/notes/deprecate-central-backend_driver-option-cfd8f6a4d3732a7f.yaml new file mode 100644 index 00000000..5ab57864 --- /dev/null +++ b/releasenotes/notes/deprecate-central-backend_driver-option-cfd8f6a4d3732a7f.yaml @@ -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. diff --git a/spec/acceptance/basic_designate_spec.rb b/spec/acceptance/basic_designate_spec.rb index 2f757632..655fac60 100644 --- a/spec/acceptance/basic_designate_spec.rb +++ b/spec/acceptance/basic_designate_spec.rb @@ -45,9 +45,7 @@ describe 'basic designate' do enabled => true, auth_strategy => 'keystone', } - class {'::designate::central': - backend_driver => 'bind9', - } + include ::designate::central class { '::designate::backend::bind9': rndc_config_file => '', rndc_key_file => '', diff --git a/spec/classes/designate_central_spec.rb b/spec/classes/designate_central_spec.rb index f596af3b..72340917 100644 --- a/spec/classes/designate_central_spec.rb +++ b/spec/classes/designate_central_spec.rb @@ -27,7 +27,6 @@ describe 'designate::central' do end 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_tenant_id').with_value('123456') 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('') 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 context 'with custom package name' do