Fix test run on RHEL8 nftables vs iptables

This commit is contained in:
2020-10-15 16:39:29 +13:00
parent 829ca8310d
commit dadda67b98
3 changed files with 9 additions and 8 deletions

View File

@@ -1,6 +1,7 @@
# Centos8-Dockerfile # Centos8-Dockerfile
FROM docker.io/pycontribs/centos:8 FROM docker.io/pycontribs/centos:8
RUN yum install -y iproute firewalld net-tools && \ RUN yum install -y iproute firewalld net-tools && \
systemctl disable nftables && \ sed -i 's/FirewallBackend=nftables/FirewallBackend=iptables/' /etc/firewalld/firewalld.conf && \
systemctl enable firewalld && \ sed -i 's/IPv6_rpfilter=yes/IPv6_rpfilter=no/' /etc/firewalld/firewalld.conf && \
systemctl enable firewalld

View File

@@ -15,7 +15,6 @@
port: 6556/tcp port: 6556/tcp
state: enabled state: enabled
permanent: yes permanent: yes
immediate: yes
- name: ensure firewall reloaded - name: ensure firewall reloaded
command: firewall-cmd --reload command: firewall-cmd --reload

View File

@@ -5,20 +5,21 @@ driver:
name: docker name: docker
platforms: platforms:
- name: rhel8 - name: rhel8
image: docker.io/pycontribs/centos:8 image: mycent8-builder:latest
#dockerfile: Centos8-Dockerfile
privileged: True privileged: True
volume_mounts: volume_mounts:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw" - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/usr/sbin/init" command: "/usr/sbin/init"
pre_build_image: true pre_build_image: true
- name: rhel7 - name: rhel7
image: docker.io/pycontribs/centos:7 image: mycent7-builder:latest
dockerfile: Centos7-Dockerfile # dockerfile: Centos7-Dockerfile
privileged: True privileged: True
volume_mounts: volume_mounts:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw" - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/usr/sbin/init" command: "/usr/sbin/init"
pre_build_image: false pre_build_image: true
provisioner: provisioner:
name: ansible name: ansible
verifier: verifier: