From dadda67b9889469bca9d30e5ea1e54240558bd36 Mon Sep 17 00:00:00 2001 From: Aaron Guise Date: Thu, 15 Oct 2020 16:39:29 +1300 Subject: [PATCH] Fix test run on RHEL8 nftables vs iptables --- Centos8-Dockerfile | 7 ++++--- handlers/main.yml | 1 - molecule/default/molecule.yml | 9 +++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Centos8-Dockerfile b/Centos8-Dockerfile index 1cc77c5..0c7261d 100644 --- a/Centos8-Dockerfile +++ b/Centos8-Dockerfile @@ -1,6 +1,7 @@ # Centos8-Dockerfile FROM docker.io/pycontribs/centos:8 RUN yum install -y iproute firewalld net-tools && \ - systemctl disable nftables && \ - systemctl enable firewalld && \ - + sed -i 's/FirewallBackend=nftables/FirewallBackend=iptables/' /etc/firewalld/firewalld.conf && \ + sed -i 's/IPv6_rpfilter=yes/IPv6_rpfilter=no/' /etc/firewalld/firewalld.conf && \ + systemctl enable firewalld + diff --git a/handlers/main.yml b/handlers/main.yml index 6ad9bc6..8781a21 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -15,7 +15,6 @@ port: 6556/tcp state: enabled permanent: yes - immediate: yes - name: ensure firewall reloaded command: firewall-cmd --reload diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 64acf48..457254b 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -5,20 +5,21 @@ driver: name: docker platforms: - name: rhel8 - image: docker.io/pycontribs/centos:8 + image: mycent8-builder:latest + #dockerfile: Centos8-Dockerfile privileged: True volume_mounts: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/usr/sbin/init" pre_build_image: true - name: rhel7 - image: docker.io/pycontribs/centos:7 - dockerfile: Centos7-Dockerfile + image: mycent7-builder:latest + # dockerfile: Centos7-Dockerfile privileged: True volume_mounts: - "/sys/fs/cgroup:/sys/fs/cgroup:rw" command: "/usr/sbin/init" - pre_build_image: false + pre_build_image: true provisioner: name: ansible verifier: