feat(pkg): include epel formula state

cobbler · Nov 17, 2023 · ac4e2e1 · ac4e2e1
1 parent e9b1d24
commit ac4e2e1
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 4 deletions.
diff --git a/cobbler/package/install.sls b/cobbler/package/install.sls
@@ -6,10 +6,25 @@
 {%- from tplroot ~ "/map.jinja" import mapdata as cobbler with context %}
 {%- set sls_repo_available = tplroot ~ '.package.repository' %}
 
+{% if cobbler.pkg.epel.enabled %}
+include:
+  - epel
+
+cobbler-package-install-pkg-enable-dnf-module:
+  cmd.run:
+    - name: dnf module enable cobbler
+    - unless: dnf module list --enabled | grep cobbler
+    - require:
+      - pkg: epel_release
+{% endif %}
+
 cobbler-package-install-pkg-installed:
   pkg.installed:
     - name: {{ cobbler.pkg.name }}
     {% if cobbler.pkg.communityrepo.enabled %}
     - require:
       - sls: {{ sls_repo_available }}
+    {% elif cobbler.pkg.epel.enabled %}
+    - require:
+      - pkg: epel_release
     {% endif %}
diff --git a/cobbler/parameters/defaults.yaml b/cobbler/parameters/defaults.yaml
@@ -9,9 +9,13 @@ values:
       enabled: false
       version: "main"
     communityrepo:
+      # This is mutually exclusive with "epel"!
       enabled: false
       # Available: "2.4.x", "2.6.x", "2.8.x", "3.0.x", "3.1.x", "3.2.x", "3.3.x"
       version: "3.3.x"
+    epel:
+      # This is mutually exclusive with "communityrepo"!
+      enabled: false
     name: cobbler
   service:
     name: cobblerd

diff --git a/cobbler/parameters/os/Fedora.yaml b/cobbler/parameters/os/Fedora.yaml
@@ -11,5 +11,9 @@
 # you can remove this file or provide at least an empty dict, e.g.
 # values: {}
 ---
-values: {}
+values:
+  pkg:
+    epel:
+      # Reset to false since Cobbler is in Fedora
+      enabled: false
 ...
diff --git a/cobbler/parameters/os_family/RedHat.yaml b/cobbler/parameters/os_family/RedHat.yaml
@@ -12,6 +12,9 @@
 # values: {}
 ---
 values:
+  pkg:
+    epel:
+      enabled: true
   tftp:
     location: "/var/lib/tftpboot"
 ...
diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml
@@ -22,7 +22,9 @@ values:
     - Y:G@id
   master: template-master
   pkg:
-    name: bash
+    name: cobbler
+    epel:
+      enabled: true
   rootgroup: root
   service:
     name: systemd-journald

diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -22,7 +22,9 @@ values:
     - Y:G@id
   master: template-master
   pkg:
-    name: bash
+    name: cobbler
+    epel:
+      enabled: true
   rootgroup: root
   service:
     name: systemd-journald

diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml
@@ -46,6 +46,8 @@ values:
     communityrepo:
       enabled: true
       version: "3.3.x"
+    epel:
+      enabled: false
     name: cobbler
     source:
       enabled: false

diff --git a/test/integration/default/files/_mapdata/fedora-36.yaml b/test/integration/default/files/_mapdata/fedora-36.yaml
@@ -46,6 +46,8 @@ values:
     communityrepo:
       enabled: false
       version: "3.3.x"
+    epel:
+      enabled: false
     name: cobbler
     source:
       enabled: false

diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml
@@ -46,6 +46,8 @@ values:
     communityrepo:
       enabled: false
       version: "3.3.x"
+    epel:
+      enabled: false
     name: cobbler
     source:
       enabled: false

diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
@@ -46,6 +46,8 @@ values:
     communityrepo:
       enabled: false
       version: "3.3.x"
+    epel:
+      enabled: false
     name: cobbler
     source:
       enabled: false

diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml
@@ -22,7 +22,9 @@ values:
     - Y:G@id
   master: template-master
   pkg:
-    name: bash
+    name: cobbler
+    epel:
+      enabled: true
   rootgroup: root
   service:
     name: systemd-journald

diff --git a/test/integration/default/files/_mapdata/ubuntu-22.yaml b/test/integration/default/files/_mapdata/ubuntu-22.yaml
@@ -46,6 +46,8 @@ values:
     communityrepo:
       enabled: true
       version: "3.3.x"
+    epel:
+      enabled: false
     name: cobbler
     source:
       enabled: false