Merge pull request #2 from GeekOops/revive

Revive the role

meta/main.yml

@@ -1,6 +1,8 @@
 ---
 galaxy_info:
   author: Felix Niederwanger
+  role_name: next
+  namespace: geekoops
   description: Configurable nginx setup role
   company: SUSE
   # issue_tracker_url: http://example.com/issue/tracker
@@ -16,7 +18,8 @@ galaxy_info:
   platforms:
     - name: opensuse
       versions:
-        - 15.2
+        - 15.3
+        - 15.4
 
   galaxy_tags: ['pxe', 'next', 'netboot']
 

molecule/default/Dockerfile.leap15_3

@@ -0,0 +1,7 @@
+FROM registry.opensuse.org/opensuse/leap:15.3
+
+# Install systemd and development tools, clear cache
+RUN zypper in -y systemd systemd-sysvinit firewalld python3 python3-firewall curl && rm -rf /var/cache/* && rm -f /etc/machine-id /var/lib/dbus/machine-id
+
+# Start container with systemd
+ENTRYPOINT ["/usr/sbin/init"]

molecule/default/Dockerfile.leap15_4

@@ -0,0 +1,7 @@
+FROM registry.opensuse.org/opensuse/leap:15.4
+
+# Install systemd and development tools, clear cache
+RUN zypper in -y systemd systemd-sysvinit firewalld python3 python3-firewall curl && rm -rf /var/cache/* && rm -f /etc/machine-id /var/lib/dbus/machine-id
+
+# Start container with systemd
+ENTRYPOINT ["/usr/sbin/init"]

molecule/default/molecule.yml

@@ -4,14 +4,23 @@ dependency:
 driver:
   name: docker
 platforms:
-  - name: leap15_2
-    image: grisu48/leap-ansible
-    pre_build_image: true
+  - name: leap15_3
+    image: registry.opensuse.org/opensuse/leap:15.3
+    dockerfile: Dockerfile.leap15_3
+    command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"}
+    privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    capabilities:
-      - SYS_ADMIN
+    tmpfs:
+      - /run
+      - /tmp
+  - name: leap15_4
+    image: registry.opensuse.org/opensuse/leap:15.4
+    dockerfile: Dockerfile.leap15_4
+    command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"}
     privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     tmpfs:
       - /run
       - /tmp
@@ -19,7 +28,8 @@ provisioner:
   name: ansible
   inventory:
     host_vars:
-      leap15_2:
+      leap15_3:
+      leap15_4:
 verifier:
   name: testinfra
   lint:

vars/openSUSE Leap_15.3.yml

@@ -1,5 +1,5 @@
 ---
-# openSUSE Leap 15.2 specific variables
+# openSUSE Leap 15.3 specific variables
 
 ## Software packages
 

vars/openSUSE Leap_15.4.yml

@@ -0,0 +1,10 @@
+---
+# openSUSE Leap 15.4 specific variables
+
+## Software packages
+
+packages: ['dnsmasq', 'unzip']
+
+dnsmasq_service: "dnsmasq"
+
+tftp_root: "/srv/tftpboot"