diff --git a/manifests/agent.pp b/manifests/agent.pp index 94f8ad2d..bf85747d 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -21,7 +21,7 @@ # Defaults to true. # # [*backend_driver*] -# (optional) Driver used for backend communication (fake, rpc, bind9, powerdns) +# (optional) Driver used for backend communication (fake, rpc, bind9) # Defaults to 'bind9' # # [*listen*] diff --git a/manifests/backend/powerdns.pp b/manifests/backend/powerdns.pp deleted file mode 100644 index 01dfdf79..00000000 --- a/manifests/backend/powerdns.pp +++ /dev/null @@ -1,31 +0,0 @@ -# == Class designate::backend::powerdns -# -# DEPRECATED! -# Install PowerDNS and configure Designate to use it as a backend. This does -# not configure PowerDNS itself since that is expected to be very environment -# specific. -# -# == Parameters -# -# [*database_connection*] -# (required) The connection string. format: -# [driver]://[user]:[password]@[host]/[database] -# -# [*use_db_reconnect*] -# (optional) Whether or not to automatically reconnect and retry transactions. -# Defaults to true -# -# [*sync_db*] -# Enable dbsync. -# Defaults to true -# -class designate::backend::powerdns ( - $database_connection, - $use_db_reconnect = true, - $sync_db = true, -) { - - warning('The designate::backend::powerdns class has been deprecaed \ -and has no effect. This class will be removed in a future release.') - -} diff --git a/manifests/db/powerdns/mysql.pp b/manifests/db/powerdns/mysql.pp deleted file mode 100644 index f34cdbc5..00000000 --- a/manifests/db/powerdns/mysql.pp +++ /dev/null @@ -1,47 +0,0 @@ -# == Class: designate::db::powerdns::mysql -# -# DEPRECATED ! -# Class that configures mysql for the designate PowerDNS backend. -# -# === Parameters: -# -# [*password*] -# Password to use for the powerdns user -# -# [*dbname*] -# (optional) The name of the database -# Defaults to 'powerdns' -# -# [*user*] -# (optional) The mysql user to create -# Defaults to 'powerdns' -# -# [*host*] -# (optional) The IP address of the mysql server -# Defaults to '127.0.0.1' -# -# [*charset*] -# (optional) The charset to use for the powerdns database -# Defaults to 'utf8' -# -# [*collate*] -# (optional) The collate to use for the powerdns database -# Defaults to 'utf8_general_ci' -# -# [*allowed_hosts*] -# (optional) Additional hosts that are allowed to access this DB -# Defaults to undef -# -class designate::db::powerdns::mysql ( - $password, - $dbname = 'powerdns', - $user = 'powerdns', - $host = '127.0.0.1', - $charset = 'utf8', - $collate = 'utf8_general_ci', - $allowed_hosts = undef, -) { - - warning('The designate::db::powerdns::mysql class has been deprecaed \ -and has no effect. This class will be removed in a future release.') -} diff --git a/manifests/db/powerdns/sync.pp b/manifests/db/powerdns/sync.pp deleted file mode 100644 index 39151154..00000000 --- a/manifests/db/powerdns/sync.pp +++ /dev/null @@ -1,20 +0,0 @@ -# -# DEPRECATED !! -# Class to execute designate powerdns dbsync -# -# ==Parameters -# -# [*extra_params*] -# (optional) String of extra command line parameters to append -# to the designate-manage powerdns sync command. These will be -# inserted in the command line between 'designate-manage' and -# 'powerdns sync'. -# Defaults to undef -class designate::db::powerdns::sync( - $extra_params = undef, -) { - - warning('The designate::db::powerdns::sync class has been deprecaed \ -and has no effect. This class will be removed in a future release.') - -} diff --git a/manifests/pool_target.pp b/manifests/pool_target.pp index 25e5188b..a2e6000c 100644 --- a/manifests/pool_target.pp +++ b/manifests/pool_target.pp @@ -30,11 +30,6 @@ define designate::pool_target ( include designate::deps - if target == 'powerdns' { - include powerdns - include powerdns::mysql - } - validate_legacy(Pattern[/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/], 'validate_re', $name, ['[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}']) validate_legacy(Hash, 'validate_hash', $options) @@ -47,18 +42,4 @@ define designate::pool_target ( "pool_target:${name}/type": value => $type; "pool_target:${name}/masters": value => join($masters,','); } - - if $type == 'powerdns' { - exec { "designate-powerdns-dbsync ${name}": - command => "${::designate::params::designate_manage} powerdns sync ${name}", - path => '/usr/bin', - user => 'root', - refreshonly => true, - logoutput => on_failure, - } - - # Have to have a valid configuration file before running migrations - Designate_config<||> -> Exec["designate-powerdns-dbsync ${name}"] - Exec["designate-powerdns-dbsync ${name}"] ~> Service<| title == 'designate-pool-manager' |> - } } diff --git a/metadata.json b/metadata.json index d46b7b49..d7b2b216 100644 --- a/metadata.json +++ b/metadata.json @@ -24,10 +24,6 @@ { "name": "openstack/oslo", "version_requirement": ">=19.3.0 <20.0.0" - }, - { - "name": "antonlindstrom/powerdns", - "version_requirement": ">=0.0.5 <1.0.0" } ], "description": "Installs and configures OpenStack Designate (DNS Services).", diff --git a/releasenotes/notes/remove-powerdns3-driver-9ef389daac73343a.yaml b/releasenotes/notes/remove-powerdns3-driver-9ef389daac73343a.yaml new file mode 100644 index 00000000..2edb7dd2 --- /dev/null +++ b/releasenotes/notes/remove-powerdns3-driver-9ef389daac73343a.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - | + The following classes for powerdns 3 driver have been removed. + + - ``designate::backend::powerdns`` + - ``designate::db::powerdns::mysql`` + - ``designate::db::powerdns::sync`` +