diff options
| author | Jens Harbott <j.harbott@x-ion.de> | 2020-09-27 12:23:37 +0200 |
|---|---|---|
| committer | Nicolas Bock <nicolas.bock@canonical.com> | 2020-09-30 00:15:47 +0000 |
| commit | b1d588cdf9857c18654e37971c9895d6d5e30b59 (patch) | |
| tree | cb43c8430a85cf19a310f1d3a0d18e058faf9396 | |
| parent | 47b9909ada2f2da3c0165a125dd3b581b27c4d8b (diff) | |
| download | designate-b1d588cdf9857c18654e37971c9895d6d5e30b59.tar.gz | |
Fix pdns4 devstack plugin
We no longer need to deal with xenial or older distro versions, so we
can assume that we can always install pdns4 from the distro directly
and don't need the distro version check any longer.
Drop a config option that was removed in pdns 4.2.x.
Use mysql credentials correctly.
Change-Id: I90af3a092296f943509833608f25522b6f8e9ab6
(cherry picked from commit 6f17fe10bb37d71944e16a422606ccf0f78c6771)
| -rw-r--r-- | devstack/designate_plugins/backend-pdns4 | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/devstack/designate_plugins/backend-pdns4 b/devstack/designate_plugins/backend-pdns4 index 577421ac..3b75b244 100644 --- a/devstack/designate_plugins/backend-pdns4 +++ b/devstack/designate_plugins/backend-pdns4 @@ -32,25 +32,6 @@ fi # install_designate_backend - install any external requirements function install_designate_backend { if is_ubuntu; then - GetOSVersion - if [ "$os_CODENAME" = "trusty" ]; then - sudo tee /etc/apt/sources.list.d/pdns.list > /dev/null <<EOF -deb [arch=amd64] http://repo.powerdns.com/ubuntu trusty-auth-40 main -EOF - sudo tee /etc/apt/preferences.d/pdns > /dev/null <<EOF -Package: pdns-* -Pin: origin repo.powerdns.com -Pin-Priority: 600 -EOF - curl https://repo.powerdns.com/FD380FBB-pub.asc | sudo apt-key add - && - sudo apt-get update - elif [ "$os_CODENAME" = "xenial" ]; then - echo "Use PDNS4 from apt repo" - elif [ "$os_CODENAME" = "bionic" ]; then - echo "Use PDNS4 from apt repo" - else - die $LINENO "PDNS4 backend only supports bionic, trusty or xenial" - fi PDNS=pdns-server else die $LINENO "PDNS4 Backend plugin backend only supports Ubuntu" @@ -118,7 +99,6 @@ slave=yes cache-ttl=0 query-cache-ttl=0 negquery-cache-ttl=0 -out-of-zone-additional-processing=no webserver=yes webserver-address=$(ipv6_unquote $DESIGNATE_SERVICE_HOST) webserver-allow-from=$(ipv6_unquote $DESIGNATE_SERVICE_HOST),127.0.0.1,::1 @@ -167,7 +147,7 @@ function init_designate_backend { # (Re)create designate_pdns database recreate_database designate_pdns utf8 if is_service_enabled mysql; then - sudo mysql -u root designate_pdns < $DESIGNATE_PLUGINS/backend-pdns4-mysql-db.sql + sudo mysql -u$DATABASE_USER -p$DATABASE_PASSWORD -h$MYSQL_HOST designate_pdns < $DESIGNATE_PLUGINS/backend-pdns4-mysql-db.sql elif is_service_enabled postgresql; then sudo psql -U root -d designate_pdns -f $DESIGNATE_PLUGINS/backend-pdns4-pgsql-db.sql else |