From 311ef3bf16d545c658ba9280f9cc5a9643607b8d Mon Sep 17 00:00:00 2001
From: phoenix <felix.niederwanger@suse.com>
Date: Mon, 27 Jun 2022 16:45:31 +0200
Subject: [PATCH] Revive role

Update role to Leap 15.4 and switch molecule tests to internal
Dockerfiles instead of external test images.
---
 README.md                                     |  1 +
 meta/main.yml                                 |  2 ++
 molecule/default/Dockerfile.leap15_3          |  7 ++++++
 molecule/default/Dockerfile.leap15_4          |  7 ++++++
 molecule/default/molecule.yml                 | 24 +++++++++++++------
 vars/openSUSE Leap_15.3.yml                   |  2 ++
 ...E Leap_15.2.yml => openSUSE Leap_15.4.yml} |  2 ++
 7 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 molecule/default/Dockerfile.leap15_3
 create mode 100644 molecule/default/Dockerfile.leap15_4
 rename vars/{openSUSE Leap_15.2.yml => openSUSE Leap_15.4.yml} (73%)

diff --git a/README.md b/README.md
index 9b2843f..06062f9 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
 Easy ansible role for setup of `grafana` with a custom backend. Currently only `influxdb` is supported. This ansible role works with
 
 - openSUSE Leap 15.3
+- openSUSE Leap 15.4
 
 
 ## Role Variables
diff --git a/meta/main.yml b/meta/main.yml
index a6a099f..39537a8 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,6 +1,8 @@
 ---
 galaxy_info:
   author: Felix Niederwanger
+  role_name: nginx
+  namespace: grafana
   description: Configurable grafana installation role
   company: SUSE
   issue_tracker_url: https://github.com/GeekOops/geekoops-grafana/issues
diff --git a/molecule/default/Dockerfile.leap15_3 b/molecule/default/Dockerfile.leap15_3
new file mode 100644
index 0000000..f32602a
--- /dev/null
+++ b/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"]
diff --git a/molecule/default/Dockerfile.leap15_4 b/molecule/default/Dockerfile.leap15_4
new file mode 100644
index 0000000..ae18e14
--- /dev/null
+++ b/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"]
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 3471be8..d240c16 100644
--- a/molecule/default/molecule.yml
+++ b/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,8 +28,9 @@ provisioner:
   name: ansible
   inventory:
     host_vars:
-      leap15_2:
-        ansible_python_interpreter: /usr/bin/python3
+      leap15_3:
+        influxdb: true
+      leap15_4:
         influxdb: true
 verifier:
   name: testinfra
diff --git a/vars/openSUSE Leap_15.3.yml b/vars/openSUSE Leap_15.3.yml
index 7502f7e..a7595b8 100644
--- a/vars/openSUSE Leap_15.3.yml	
+++ b/vars/openSUSE Leap_15.3.yml	
@@ -1,3 +1,5 @@
 ---
+# openSUSE Leap 15.3 specific variables
+
 packages_grafana: ['grafana', 'grafana-piechart-panel', 'grafana-status-panel']
 packages_influxdb: ['influxdb']
diff --git a/vars/openSUSE Leap_15.2.yml b/vars/openSUSE Leap_15.4.yml
similarity index 73%
rename from vars/openSUSE Leap_15.2.yml
rename to vars/openSUSE Leap_15.4.yml
index 7502f7e..a7595b8 100644
--- a/vars/openSUSE Leap_15.2.yml	
+++ b/vars/openSUSE Leap_15.4.yml	
@@ -1,3 +1,5 @@
 ---
+# openSUSE Leap 15.3 specific variables
+
 packages_grafana: ['grafana', 'grafana-piechart-panel', 'grafana-status-panel']
 packages_influxdb: ['influxdb']