From 3f68936a0cddbdf12f144128b64bc9bad5fde718 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 14 Jan 2020 16:51:24 +1100
Subject: [PATCH] openafs-client: add centos8

Add CentOS 8 support for the openafs client build

Change-Id: I8290cf1eed9ee8e4af44ac209502553944c52103
Depends-On: https://review.opendev.org/702348
---
 .zuul.yaml                                         | 14 ++++++++++++++
 .../tasks/install-packages/CentOS.yaml             | 12 ++++++++++++
 roles/openafs-client/tasks/main.yaml               |  1 +
 .../vars/{CentOS.yaml => CentOS.7.yaml}            |  0
 roles/openafs-client/vars/CentOS.8.yaml            |  3 +++
 5 files changed, 30 insertions(+)
 rename roles/openafs-client/vars/{CentOS.yaml => CentOS.7.yaml} (100%)
 create mode 100644 roles/openafs-client/vars/CentOS.8.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 2049a9e392..aad7cedb9d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -629,6 +629,18 @@
           nodes:
             - base
 
+- job:
+    name: system-config-zuul-role-integration-centos-8
+    parent: system-config-zuul-role-integration
+    nodeset:
+      nodes:
+        - name: base
+          label: centos-8
+      groups:
+        - name: openafs
+          nodes:
+            - base
+
 - project-template:
     name: system-config-zuul-role-integration
     check:
@@ -636,11 +648,13 @@
         - system-config-zuul-role-integration-xenial
         - system-config-zuul-role-integration-bionic
         - system-config-zuul-role-integration-debian-stable
+        - system-config-zuul-role-integration-centos-8
     gate:
       jobs:
         - system-config-zuul-role-integration-xenial
         - system-config-zuul-role-integration-bionic
         - system-config-zuul-role-integration-debian-stable
+        - system-config-zuul-role-integration-centos-8
 
 - job:
     name: system-config-run
diff --git a/roles/kerberos-client/tasks/install-packages/CentOS.yaml b/roles/kerberos-client/tasks/install-packages/CentOS.yaml
index ebd8bcacd9..2a4a3332ec 100644
--- a/roles/kerberos-client/tasks/install-packages/CentOS.yaml
+++ b/roles/kerberos-client/tasks/install-packages/CentOS.yaml
@@ -5,6 +5,13 @@
     state: present
   become: yes
 
+# Until in EPEL8; see:
+#  https://bugzilla.redhat.com/show_bug.cgi?id=1791168
+- name: Install kstart copr repo for CentOS8
+  command: dnf copr enable -y iwienand/kstart
+  become: yes
+  when: ansible_distribution_major_version == '8'
+
 - name: Install kerberos client packages
   yum:
     name: '{{ kerberos_client_packages }}'
@@ -12,3 +19,8 @@
     state: present
   become: yes
 
+- name: Remove kstart copr repo for CentOS8
+  command: dnf copr remove -y iwienand/kstart
+  become: yes
+  when: ansible_distribution_major_version == '8'
+
diff --git a/roles/openafs-client/tasks/main.yaml b/roles/openafs-client/tasks/main.yaml
index f673846308..d7e050325c 100644
--- a/roles/openafs-client/tasks/main.yaml
+++ b/roles/openafs-client/tasks/main.yaml
@@ -4,6 +4,7 @@
     params:
       files:
         - "{{ ansible_distribution }}.{{ ansible_architecture }}.yaml"
+        - "{{ ansible_distribution }}.{{ ansible_distribution_major_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
         - "{{ ansible_os_family }}.yaml"
       paths:
diff --git a/roles/openafs-client/vars/CentOS.yaml b/roles/openafs-client/vars/CentOS.7.yaml
similarity index 100%
rename from roles/openafs-client/vars/CentOS.yaml
rename to roles/openafs-client/vars/CentOS.7.yaml
diff --git a/roles/openafs-client/vars/CentOS.8.yaml b/roles/openafs-client/vars/CentOS.8.yaml
new file mode 100644
index 0000000000..fd7ff782ae
--- /dev/null
+++ b/roles/openafs-client/vars/CentOS.8.yaml
@@ -0,0 +1,3 @@
+openafs_client_config_path: '/usr/vice/etc'
+openafs_client_yum_repo_url: https://tarballs.openstack.org/project-config/package-afs-centos8
+openafs_client_yum_repo_gpg_check: no