Merge pull request #6 from cobbler/feature/define-supported-oses

Define supported operating systems

.github/workflows/test.yml

@@ -12,6 +12,7 @@ jobs:
   kitchen:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         kitchen-suite:
           - default
@@ -36,14 +37,11 @@ jobs:
           # - centos-7
           - fedora-36
           # - fedora35
-          - arch-base-latest
           - almalinux-8
           - rockylinux-8
           # - amazonlinux-2
           # - oraclelinux-8
           # - oraclelinux-7
-          # - gentoo-stage3-latest
-          # - gentoo-stage3-systemd
     steps:
       - uses: actions/checkout@v3
       - name: Set up Ruby

FORMULA

@@ -1,6 +1,6 @@
 name: cobbler
-os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Amazon, Oracle, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
-os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
+os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Amazon, Oracle, Suse, openSUSE
+os_family: Debian, RedHat, Suse
 version: 1.0.1
 release: 1
 minimum_version: 2019.2

cobbler/parameters/os/Amazon.yaml

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os') == Amazon.
+#
+# You just need to add the key:values for this `os` that differ
+# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
+#
+# If you do not need to provide defaults via the `os` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values: {}
+...

cobbler/parameters/os/CentOS.yaml

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os') == CentOS.
+#
+# You just need to add the key:values for this `os` that differ
+# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
+#
+# If you do not need to provide defaults via the `os` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values: {}
+...

cobbler/parameters/os/Fedora.yaml

@@ -11,9 +11,5 @@
 # you can remove this file or provide at least an empty dict, e.g.
 # values: {}
 ---
-values:
-  pkg:
-    name: cobbler-fedora
-  service:
-    name: service-fedora
+values: {}
 ...

cobbler/parameters/os/Oracle.yaml

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os') == Oracle.
+#
+# You just need to add the key:values for this `os` that differ
+# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
+#
+# If you do not need to provide defaults via the `os` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values: {}
+...

cobbler/parameters/os/Raspbian.yaml

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os') == Raspbian.
+#
+# You just need to add the key:values for this `os` that differ
+# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
+#
+# If you do not need to provide defaults via the `os` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values: {}
+...

cobbler/parameters/os/RedHat.yaml

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os') == RedHat.
+#
+# You just need to add the key:values for this `os` that differ
+# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
+#
+# If you do not need to provide defaults via the `os` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values: {}
+...

cobbler/parameters/os/Suse.yaml

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os') == Suse.
+#
+# You just need to add the key:values for this `os` that differ
+# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
+#
+# If you do not need to provide defaults via the `os` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values: {}
+...

cobbler/parameters/os/Ubuntu.yaml

@@ -11,8 +11,5 @@
 # you can remove this file or provide at least an empty dict, e.g.
 # values: {}
 ---
-values:
-  pkg:
-    name: cobbler-ubuntu
-  config: /etc/cobbler.d/custom-ubuntu.conf
+values: {}
 ...

cobbler/parameters/os/openSUSE.yaml

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Set values specific to:
+#   salt['config.get']('os') == openSUSE.
+#
+# You just need to add the key:values for this `os` that differ
+# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
+#
+# If you do not need to provide defaults via the `os` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values: {}
+...

cobbler/parameters/os_family/Debian.yaml

@@ -11,8 +11,5 @@
 # you can remove this file or provide at least an empty dict, e.g.
 # values: {}
 ---
-values:
-  pkg:
-    name: cobbler-debian
-  config: /etc/cobbler.d/custom.conf
+values: {}
 ...

cobbler/parameters/os_family/RedHat.yaml

@@ -11,8 +11,5 @@
 # you can remove this file or provide at least an empty dict, e.g.
 # values: {}
 ---
-values:
-  pkg:
-    name: cobbler-redhat
-  config: /etc/cobbler.conf
+values: {}
 ...

cobbler/parameters/os_family/Suse.yaml

@@ -11,7 +11,5 @@
 # you can remove this file or provide at least an empty dict, e.g.
 # values: {}
 ---
-values:
-  pkg:
-    name: cobbler-suse
+values: {}
 ...

cobbler/parameters/osfinger/Ubuntu-18.04.yaml → cobbler/parameters/osfinger/Leap-15.yaml

@@ -2,7 +2,7 @@
 # vim: ft=yaml
 #
 # Set values specific to:
-#   salt['config.get']('osfinger') == Ubuntu-18.04.
+#   salt['config.get']('osfinger') == Leap-15.
 #
 # You just need to add the key:values for this `osfinger` that differ
 # from `defaults.yaml`.
@@ -11,6 +11,5 @@
 # you can remove this file or provide at least an empty dict, e.g.
 # values: {}
 ---
-values:
-  config: /etc/cobbler.d/custom-ubuntu-18.04.conf
+values: {}
 ...

cobbler/parameters/osfinger/CentOS-6.yaml → cobbler/parameters/osfinger/SLES-15.yaml

@@ -2,7 +2,7 @@
 # vim: ft=yaml
 #
 # Set values specific to:
-#   salt['config.get']('osfinger') == CentOS-6.
+#   salt['config.get']('osfinger') == SLES-15.
 #
 # You just need to add the key:values for this `osfinger` that differ
 # from `defaults.yaml`.
@@ -11,8 +11,5 @@
 # you can remove this file or provide at least an empty dict, e.g.
 # values: {}
 ---
-values:
-  pkg:
-    name: cobbler-centos-6
-  config: /etc/cobbler.d/custom-centos-6.conf
+values: {}
 ...

kitchen.yml

@@ -130,16 +130,6 @@ platforms:
   - name: oraclelinux-7-master-py3
     driver:
       image: saltimages/salt-master-py3:oraclelinux-7
-  - name: arch-base-latest-master-py3
-    driver:
-      image: saltimages/salt-master-py3:arch-base-latest
-  - name: gentoo-stage3-latest-master-py3
-    driver:
-      image: saltimages/salt-master-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-master-py3
-    driver:
-      image: saltimages/salt-master-py3:gentoo-stage3-systemd
   - name: almalinux-8-master-py3
     driver:
       image: saltimages/salt-master-py3:almalinux-8
@@ -193,16 +183,6 @@ platforms:
   - name: oraclelinux-7-3004-1-py3
     driver:
       image: saltimages/salt-3004.1-py3:oraclelinux-7
-  - name: arch-base-latest-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:gentoo-stage3-systemd
   - name: almalinux-8-3004-1-py3
     driver:
       image: saltimages/salt-3004.1-py3:almalinux-8

pillar.example

@@ -2,17 +2,11 @@
 # vim: ft=yaml
 ---
 cobbler:
-  lookup:
-    master: template-master
-
-  # 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: bash
+    name: cobbler
   service:
-    name: systemd-journald
-  config: /etc/template-formula.conf
+    name: cobblerd
+  config: /etc/cobbler/settings.yaml
 
   tofs:
     # The files_switch key serves as a selector for alternative