Update Varnish role to work on CentOS 8.

Author: geerlingguy

provisioning/requirements.yml

@@ -79,4 +79,4 @@ roles:
   - name: geerlingguy.solr
     version: 5.1.0
   - name: geerlingguy.varnish
-    version: 3.2.0
+    version: 3.3.0

provisioning/roles/geerlingguy.varnish/.travis.yml

@@ -6,7 +6,7 @@ env:
   global:
     - ROLE_NAME: varnish
   matrix:
-    # - MOLECULE_DISTRO: centos8
+    - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
     - MOLECULE_DISTRO: ubuntu1804
     - MOLECULE_DISTRO: ubuntu1604

provisioning/roles/geerlingguy.varnish/README.md

@@ -16,9 +16,9 @@ Available variables are listed below, along with default values (see `defaults/m
 
 Varnish package name you want to install. See `apt-cache policy varnish` or `yum list varnish` for a listing of available candidates.
 
-    varnish_version: "6.1"
+    varnish_version: "6.4"
 
-Varnish version that should be installed. See the [Varnish Cache packagecloud.io repositories](https://packagecloud.io/varnishcache) for a listing of available versions. Some examples include: `6.1`, `6.0`, `5.1`, `4.1`, `3.0`, and `2.1`.
+Varnish version that should be installed. See the [Varnish Cache packagecloud.io repositories](https://packagecloud.io/varnishcache) for a listing of available versions. Some examples include: `6.4`, `6.3`, `6.1`, `4.1`, `3.0`, and `2.1`.
 
     varnish_config_path: /etc/varnish
 

provisioning/roles/geerlingguy.varnish/meta/main.yml

@@ -13,7 +13,7 @@ galaxy_info:
       versions:
         - 6
         - 7
-        # - 8
+        - 8
     - name: Ubuntu
       versions:
         - precise

provisioning/roles/geerlingguy.varnish/molecule/default/converge.yml

@@ -6,14 +6,6 @@
   pre_tasks:
     - import_tasks: playbook-setup.yml
 
-    - name: Set older Varnish version for older OSes.
-      set_fact:
-        varnish_version: "5.1"
-      when: >
-        (ansible_os_family == 'RedHat' and ansible_distribution_major_version|int < 7) or
-        (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version|int < 16) or
-        (ansible_distribution == 'Debian' and ansible_distribution_major_version|int < 9)
-
   roles:
     - role: geerlingguy.varnish
 

provisioning/roles/geerlingguy.varnish/tasks/setup-RedHat.yml

@@ -1,11 +1,15 @@
 ---
-- name: Ensure Varnish dependencies are installed.
+- name: Ensure Varnish dependency is installed.
   yum:
-    name:
-      - yum-utils
-      - pygpgme
+    name: yum-utils
     state: present
 
+- name: Ensure extra Varnish dependency on older RHEL versions is installed.
+  yum:
+    name: pygpgme
+    state: present
+  when: ansible_distribution_major_version | int < 8
+
 - name: Add Varnish packagecloud.io yum repo.
   yum_repository:
     name: varnishcache_{{ varnish_packagecloud_repo }}
@@ -21,12 +25,22 @@
   register: varnish_packagecloud_repo_addition
 
 - name: Refresh yum metadata cache if repo changed.
-  command: yum clean metadata
+  command: >
+    yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_{{ varnish_packagecloud_repo }}'
   args:
     warn: false
   when: varnish_packagecloud_repo_addition.changed
   tags: ['skip_ansible_lint']
 
+- name: Disable varnish AppStream in RHEL 8.
+  command: dnf module disable -y varnish
+  args:
+    warn: false
+  when:
+    - varnish_packagecloud_repo_addition.changed
+    - ansible_distribution_major_version | int == 8
+  tags: ['skip_ansible_lint']
+
 - name: Ensure Varnish is installed.
   yum:
     name: "{{ varnish_package_name }}"