Add support for CentOS 8 & RHEL8

fixes: #6301
pulp · Mar 6, 2020 · 78a29d8 · 78a29d8
1 parent 8bce976
commit 78a29d8
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 3 deletions.
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -2,7 +2,16 @@
 # tasks file for pulp_rpm_prerequisites
 
 - name: Load OS specific variables
-  include_vars: '{{ ansible_distribution }}.yml'
+  include_vars: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
+        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml'
+        - '{{ ansible_distribution }}.yml'
+        - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml'
+        - '{{ ansible_os_family }}.yml'
+      paths:
+        - 'vars'
   tags:
     - always
 

diff --git a/vars/CentOS.yml → vars/CentOS-7.yml b/vars/CentOS.yml → vars/CentOS-7.yml
diff --git a/vars/CentOS-8.yml b/vars/CentOS-8.yml
@@ -0,0 +1 @@
+Fedora.yml
diff --git a/vars/Fedora.yml b/vars/Fedora.yml
@@ -1,8 +1,10 @@
 ---
 # vars file for pulp_rpm_prerequisites on Fedora
+# Also used by RHEL8 / CentOS8
 packages:
   - gcc
   - make
+  - cairo-devel
   - cairo-gobject-devel
   - cmake
   - bzip2-devel
@@ -14,7 +16,6 @@ packages:
   - libmodulemd-devel
   - libxml2-devel
   - openssl-devel
-  - python3-cairo-devel
   - python3-devel
   - rpm-devel
   - sqlite-devel

diff --git a/vars/RedHat-7.yml b/vars/RedHat-7.yml
@@ -0,0 +1 @@
+CentOS-7.yml
diff --git a/vars/RedHat-8.yml b/vars/RedHat-8.yml
@@ -0,0 +1 @@
+Fedora.yml
diff --git a/vars/RedHat.yml b/vars/RedHat.yml