From caf459e448950605c45669d93171ce1344c13fa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Krupa?= <pawel@krupa.net.pl>
Date: Fri, 18 Oct 2019 16:35:38 +0200
Subject: [PATCH] add official support for CentOS8 (#114)
[minor] release
---
meta/main.yml | 1 +
molecule/alternative/molecule.yml | 8 ++++++++
molecule/default/molecule.yml | 8 ++++++++
tasks/main.yml | 2 +-
vars/{redhat.yml => redhat-7.yml} | 0
5 files changed, 18 insertions(+), 1 deletion(-)
rename vars/{redhat.yml => redhat-7.yml} (100%)
diff --git a/meta/main.yml b/meta/main.yml
index 2db6b71..b2c93f5 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -17,6 +17,7 @@ galaxy_info:
- name: EL
versions:
- 7
+ - 8
- name: Fedora
versions:
- 30
diff --git a/molecule/alternative/molecule.yml b/molecule/alternative/molecule.yml
index 9fae6ea..c9291ee 100644
--- a/molecule/alternative/molecule.yml
+++ b/molecule/alternative/molecule.yml
@@ -36,6 +36,14 @@ platforms:
privileged: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
+ - name: centos8
+ image: paulfantom/centos-molecule:8
+ docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
+ privileged: true
+ volumes:
+ - /sys/fs/cgroup:/sys/fs/cgroup:ro
+ groups:
+ - python3
- name: fedora
image: paulfantom/fedora-molecule:30
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 59afbca..da65dce 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -36,6 +36,14 @@ platforms:
privileged: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
+ - name: centos8
+ image: paulfantom/centos-molecule:8
+ docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
+ privileged: true
+ volumes:
+ - /sys/fs/cgroup:/sys/fs/cgroup:ro
+ groups:
+ - python3
- name: fedora
image: paulfantom/fedora-molecule:30
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
diff --git a/tasks/main.yml b/tasks/main.yml
index c29276c..2c90dc2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -4,7 +4,7 @@
with_first_found:
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
- - "{{ ansible_distribution_file_variety | lower }}.yml"
+ - "{{ ansible_distribution_file_variety | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
- "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
- "{{ ansible_distribution | lower }}.yml"
- "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
diff --git a/vars/redhat.yml b/vars/redhat-7.yml
similarity index 100%
rename from vars/redhat.yml
rename to vars/redhat-7.yml
--
GitLab