Merge pull request #8 from cobbler/feature/add-service

Add systemd service management
cobbler · Nov 21, 2023 · c19412a · c19412a
2 parents f7d278c + 10f2da8
commit c19412a
Show file tree

Hide file tree

Showing 28 changed files with 28 additions and 43 deletions.
diff --git a/cobbler/parameters/defaults.yaml b/cobbler/parameters/defaults.yaml
@@ -20,7 +20,7 @@ values:
   rootgroup: root
   config: '/etc/cobbler'
   service:
-    name: cobbler
+    name: cobblerd
   # Just here for testing
   added_in_defaults: defaults_value
   winner: defaults

diff --git a/test/integration/default/controls/services.rb b/test/integration/default/controls/services.rb
@@ -1,19 +1,9 @@
 # frozen_string_literal: true
 
-# Prepare platform "finger"
-platform_finger = system.platform[:finger].split('.').first.to_s
-
 control 'cobbler.service.running' do
   title 'The service should be installed, enabled and running'
 
-  # Override by `platform_finger`
-  service_name =
-    case platform_finger
-    when 'centos-6', 'amazonlinux-1'
-      'crond'
-    else
-      'systemd-journald'
-    end
+  service_name = 'cobblerd'
 
   describe service(service_name) do
     it { should be_installed }

diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml
@@ -33,7 +33,7 @@ values:
       version: main
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/amazonlinux-1.yaml b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
@@ -25,7 +25,7 @@ values:
     name: cronie
   rootgroup: root
   service:
-    name: crond
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
@@ -25,7 +25,7 @@ values:
     name: bash
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/centos-6.yaml b/test/integration/default/files/_mapdata/centos-6.yaml
@@ -25,7 +25,7 @@ values:
     name: cronie
   rootgroup: root
   service:
-    name: crond
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -25,7 +25,7 @@ values:
     name: bash
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -33,7 +33,7 @@ values:
       version: main
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml
@@ -25,7 +25,7 @@ values:
     name: bash
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml
@@ -33,7 +33,7 @@ values:
       version: "main"
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -25,7 +25,7 @@ values:
     name: bash
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml
@@ -25,7 +25,7 @@ values:
     name: bash
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml
@@ -25,7 +25,7 @@ values:
     name: bash
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml
@@ -25,7 +25,7 @@ values:
     name: bash
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml
@@ -25,7 +25,7 @@ values:
     name: bash
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/fedora-35.yaml b/test/integration/default/files/_mapdata/fedora-35.yaml
@@ -25,7 +25,7 @@ values:
     name: bash
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/fedora-36.yaml b/test/integration/default/files/_mapdata/fedora-36.yaml
@@ -33,7 +33,7 @@ values:
       version: main
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml
@@ -33,7 +33,7 @@ values:
       version: main
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
@@ -33,7 +33,7 @@ values:
       version: main
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
@@ -25,7 +25,7 @@ values:
     name: bash
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
@@ -25,7 +25,7 @@ values:
     name: bash
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml
@@ -33,7 +33,7 @@ values:
       version: main
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -25,7 +25,7 @@ values:
     name: bash
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -25,7 +25,7 @@ values:
     name: bash
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -25,7 +25,7 @@ values:
     name: bash
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/integration/default/files/_mapdata/ubuntu-22.yaml b/test/integration/default/files/_mapdata/ubuntu-22.yaml
@@ -33,7 +33,7 @@ values:
       version: main
   rootgroup: root
   service:
-    name: systemd-journald
+    name: cobblerd
   tofs:
     files_switch:
     - any/path/can/be/used/here

diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls
@@ -8,8 +8,6 @@ cobbler:
     winner: lookup
     added_in_lookup: lookup_value
 
-  service:
-    name: systemd-journald
   config: /etc/template-formula.conf
 
   tofs:

diff --git a/test/salt/pillar/upstart.sls b/test/salt/pillar/upstart.sls
@@ -8,13 +8,10 @@ cobbler:
     winner: lookup
     added_in_lookup: lookup_value
 
-  # Using bash package and udev service as an example. This allows us to
-  # test the template formula itself. You should set these parameters to
-  # examples that make sense in the contexto of the formula you're writing.
   pkg:
-    name: cronie
+    name: cobbler
   service:
-    name: crond
+    name: cobblerd
   config: /etc/template-formula.conf
 
   tofs: