Merge pull request #154 from npmdnl/npmdnl-rec50

Adding rec-50 - removed EOL rec47 and ubuntu1804

.github/workflows/main.yml

@@ -14,9 +14,9 @@ jobs:
           - "2.13"
           - "2.14"
         scenario:
-          - pdns-rec-47
           - pdns-rec-48
           - pdns-rec-49
+          - pdns-rec-50
           - pdns-rec-master
     steps:
       - name: checkout

README.md

@@ -32,12 +32,6 @@ By default, the PowerDNS Recursor is installed from the software repositories co
   - { role: PowerDNS.pdns_recursor,
       pdns_rec_install_repo: "{{ pdns_rec_powerdns_repo_master }}" }
 
-# Install the PowerDNS Recursor from the '4.7.x' official repository
-- hosts: pdns-recursors
-  roles:
-  - { role: PowerDNS.pdns_recursor,
-      pdns_rec_install_repo: "{{ pdns_rec_powerdns_repo_47 }}" }
-
 # Install the PowerDNS Recursor from the '4.8.x' official repository
 - hosts: pdns-recursors
   roles:
@@ -49,6 +43,12 @@ By default, the PowerDNS Recursor is installed from the software repositories co
   roles:
   - { role: PowerDNS.pdns_recursor,
       pdns_rec_install_repo: "{{ pdns_rec_powerdns_repo_49 }}" }
+
+# Install the PowerDNS Recursor from the '5.0.x' official repository
+- hosts: pdns-recursors
+  roles:
+  - { role: PowerDNS.pdns_recursor,
+      pdns_rec_install_repo: "{{ pdns_rec_powerdns_repo_50 }}" }
 ```
 
 The examples above, show how to install the PowerDNS Recursor from the official PowerDNS repositories

molecule/pdns-rec-48/molecule.yml

@@ -18,10 +18,6 @@ platforms:
     image: oraclelinux:8
     dockerfile_tpl: centos-systemd
 
-  - name: ubuntu-1804
-    image: ubuntu:18.04
-    dockerfile_tpl: ubuntu-systemd
-
   - name: ubuntu-2004
     image: ubuntu:20.04
     dockerfile_tpl: ubuntu-systemd
@@ -66,4 +62,3 @@ verifier:
   additional_files_or_dirs:
     - ../repo-48/
     - ../systemd-overrides
-

molecule/pdns-rec-49/molecule.yml

@@ -18,10 +18,6 @@ platforms:
     image: oraclelinux:8
     dockerfile_tpl: centos-systemd
 
-  - name: ubuntu-1804
-    image: ubuntu:18.04
-    dockerfile_tpl: ubuntu-systemd
-
   - name: ubuntu-2004
     image: ubuntu:20.04
     dockerfile_tpl: ubuntu-systemd
@@ -66,4 +62,3 @@ verifier:
   additional_files_or_dirs:
     - ../repo-49/
     - ../systemd-overrides
-

molecule/pdns-rec-47/converge.yml → molecule/pdns-rec-50/converge.yml

@@ -3,6 +3,6 @@
 - hosts: all
   vars_files:
     - ../resources/vars/pdns-rec-common.yml
-    - ../resources/vars/pdns-rec-repo-47.yml
+    - ../resources/vars/pdns-rec-repo-50.yml
   roles:
     - { role: pdns_recursor-ansible }

molecule/pdns-rec-47/molecule.yml → molecule/pdns-rec-50/molecule.yml

@@ -1,7 +1,7 @@
 ---
 
 scenario:
-  name: pdns-rec-47
+  name: pdns-rec-50
 
 driver:
   name: docker
@@ -17,11 +17,7 @@ platforms:
   - name: oraclelinux-8
     image: oraclelinux:8
     dockerfile_tpl: centos-systemd
-
-  - name: ubuntu-1804
-    image: ubuntu:18.04
-    dockerfile_tpl: ubuntu-systemd
-
+
   - name: ubuntu-2004
     image: ubuntu:20.04
     dockerfile_tpl: ubuntu-systemd
@@ -55,7 +51,7 @@ provisioner:
     destroy: ../resources/destroy.yml
     prepare: ../resources/prepare.yml
   lint: ansible-lint -x ANSIBLE0006 ANSIBLE0016
-    
+
 lint: yamllint vars tasks defaults meta
 
 verifier:
@@ -64,5 +60,5 @@ verifier:
     vvv: True
   directory: ../resources/tests/all
   additional_files_or_dirs:
-    - ../repo-47/
+    - ../repo-50/
     - ../systemd-overrides

molecule/pdns-rec-master/molecule.yml

@@ -18,10 +18,6 @@ platforms:
     image: oraclelinux:8
     dockerfile_tpl: centos-systemd
 
-  - name: ubuntu-1804
-    image: ubuntu:18.04
-    dockerfile_tpl: ubuntu-systemd
-
   - name: ubuntu-2004
     image: ubuntu:20.04
     dockerfile_tpl: ubuntu-systemd

molecule/resources/tests/repo-47/test_repo_47.py → molecule/resources/tests/repo-50/test_repo_50.py

@@ -6,9 +6,9 @@
 def test_repo_file(host):
     f = None
     if host.system_info.distribution.lower() in debian_os:
-        f = host.file('/etc/apt/sources.list.d/powerdns-rec-47.list')
+        f = host.file('/etc/apt/sources.list.d/powerdns-rec-50.list')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-rec-47.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-rec-50.repo')
 
     assert f.exists
     assert f.user == 'root'
@@ -18,19 +18,19 @@ def test_repo_file(host):
 def test_pdns_repo(host):
     f = None
     if host.system_info.distribution.lower() in debian_os:
-        f = host.file('/etc/apt/sources.list.d/powerdns-rec-47.list')
+        f = host.file('/etc/apt/sources.list.d/powerdns-rec-50.list')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-rec-47.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-rec-50.repo')
 
     assert f.exists
-    assert f.contains('rec-47')
+    assert f.contains('rec-50')
 
 
 def test_pdns_version(host):
     cmd = host.run('/usr/sbin/pdns_recursor --version')
 
     assert 'PowerDNS Recursor' in cmd.stderr
-    assert '4.7' in cmd.stderr
+    assert '5.0' in cmd.stderr
 
 
 def systemd_override(host):

molecule/resources/vars/pdns-rec-repo-50.yml

@@ -0,0 +1,7 @@
+---
+
+##
+# PowerDNS Recursor 5.0.x Repository
+##
+
+pdns_rec_install_repo: "{{ pdns_rec_powerdns_repo_50 }}"

vars/main.yml

@@ -11,15 +11,6 @@ pdns_rec_powerdns_repo_master:
   yum_debug_symbols_repo_baseurl: "https://repo.powerdns.com/centos/$basearch/$releasever/rec-master/debug"
   name: "powerdns-rec-master"
 
-pdns_rec_powerdns_repo_47:
-  apt_repo_origin: "repo.powerdns.com"
-  apt_repo: "deb [arch=amd64] https://repo.powerdns.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }}-rec-47 main"
-  gpg_key: "https://repo.powerdns.com/FD380FBB-pub.asc"
-  gpg_key_id: "9FAAA5577E8FCF62093D036C1B0C6205FD380FBB"
-  yum_repo_baseurl: "https://repo.powerdns.com/centos/$basearch/$releasever/rec-47"
-  yum_debug_symbols_repo_baseurl: "https://repo.powerdns.com/centos/$basearch/$releasever/rec-47/debug"
-  name: "powerdns-rec-47"
-
 pdns_rec_powerdns_repo_48:
   apt_repo_origin: "repo.powerdns.com"
   apt_repo: "deb [arch=amd64] https://repo.powerdns.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }}-rec-48 main"
@@ -38,6 +29,14 @@ pdns_rec_powerdns_repo_49:
   yum_debug_symbols_repo_baseurl: "https://repo.powerdns.com/centos/$basearch/$releasever/rec-49/debug"
   name: "powerdns-rec-49"
 
+pdns_rec_powerdns_repo_50:
+  apt_repo_origin: "repo.powerdns.com"
+  apt_repo: "deb [arch=amd64] https://repo.powerdns.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }}-rec-50 main"
+  gpg_key: "https://repo.powerdns.com/FD380FBB-pub.asc"
+  gpg_key_id: "9FAAA5577E8FCF62093D036C1B0C6205FD380FBB"
+  yum_repo_baseurl: "https://repo.powerdns.com/centos/$basearch/$releasever/rec-50"
+  yum_debug_symbols_repo_baseurl: "https://repo.powerdns.com/centos/$basearch/$releasever/rec-50/debug"
+  name: "powerdns-rec-50"
 
 
 default_pdns_rec_service_overrides: >-