Reorganizing configuration

diff --git a/etc/cobbler-distros.d/almalinux-8.yaml b/etc/cobbler-distros.d/almalinux-8.yaml
new file mode 100644 (file)
index 0000000..eac3945
--- /dev/null
+++ b/etc/cobbler-distros.d/almalinux-8.yaml
@@ -0,0 +1,82 @@
+---
+cobbler-distros:
+  almalinux-8:
+    distro: 'AlmaLinux-8-x86_64'
+    description: 'AlmaLinux 8 x86_64'
+    shortname: 'alma8'
+    ks_template: 'el8-standard.ks'
+    is_rhel: false
+    ks_repo_url: 'https://repo02.pixelpark.com/Linux/yum/almalinux/8/BaseOS/x86_64/os'
+    packages:
+      - '@core'
+      - '@^minimal install'
+      - 'NetworkManager-config-server'
+      - 'bash-completion'
+      - 'bc'
+      - 'bind-utils'
+      - 'chrony'
+      - 'curl'
+      - 'dbus'
+      - 'git'
+      - 'iotop'
+      - 'langpacks-de'
+      - 'lsof'
+      - 'mailx'
+      - 'man'
+      - 'mlocate'
+      - 'net-tools'
+      - 'oddjob-mkhomedir'
+      - 'postfix'
+      - 'psmisc'
+      - 'rsync'
+      - 'strace'
+      - 'sysstat'
+      - 'tcpdump'
+      - 'telnet'
+      - 'tmux'
+      - 'traceroute'
+      - 'vim'
+      - 'wget'
+      - 'yum-utils'
+      - '-abrt*'
+      - '-nfs*'
+      - '-rpcbind'
+    repos:
+      - 'almalinux-8-x86_64-baseos'
+      - 'almalinux-8-x86_64-appstream'
+      - 'almalinux-8-x86_64-extras'
+      - 'almalinux-8-x86_64-powertools'
+      - 'epel-8-x86_64'
+      - 'epel-8-x86_64-modular'
+      - 'icinga-el8-x86_64'
+      - 'puppetlabs-puppet7-el8-x86_64'
+      - 'pixelpark-el8-x86_64'
+      - 'monitoring-noarch'
+      - 'prometheus-el8-x86_64'
+    snippets:
+      - 'tpl.001.basics.sh'
+      - 'tpl.010.authkeys.sh'
+      - 'tpl.040.network.sh'
+      - 'tpl.060.tweak_systemd.sh'
+      - 'tpl.070.tweak_grub.sh'
+      - 'tpl.075.tmp-tmpfs.sh'
+      - 'tpl.080.rsyslogd-el8.sh'
+      - 'tpl.085.disable-ipv6.sh'
+      - 'tpl.100.clear_repos.sh'
+      - 'tpl.180.repos_almalinux8.sh'
+      - 'tpl.185.repos_el8.sh'
+      - 'tpl.200.init-repos.sh'
+      - 'tpl.210.bashrc-el8.sh'
+      - 'tpl.220.locales-el8.sh'
+      - 'tpl.230.vimrc-el8.sh'
+      - 'tpl.250.pkgs-el8.sh'
+      - 'tpl.280.dist-upgrade.sh'
+      - 'tpl.300.create-motd.sh'
+      - 'tpl.320.root-ssh-login.sh'
+      - 'tpl.350.legato.sh'
+      - 'tpl.400.chrony.sh'
+      - 'tpl.450.puppet.sh'
+      - 'tpl.470.postfix.sh'
+      - 'tpl.500.logrotate.sh'
+      - 'tpl.999.finish.sh'
+

diff --git a/etc/cobbler-distros.d/centos-7.yaml b/etc/cobbler-distros.d/centos-7.yaml
new file mode 100644 (file)
index 0000000..4077ba3
--- /dev/null
+++ b/etc/cobbler-distros.d/centos-7.yaml
@@ -0,0 +1,74 @@
+---
+cobbler-distros:
+  centos-7:
+    distro: 'CentOS-7.9-x86_64'
+    description: 'CentOS 7 x86_64'
+    shortname: 'centos7'
+    is_rhel: false
+    ks_template: 'el7-standard.ks'
+    ks_repo_url: 'https://repo02.pixelpark.com/Linux/yum/centos/7/os/x86_64'
+    repos:
+      - 'centos-7-x86_64-baseos'
+      - 'centos-7-x86_64-extras'
+      - 'centos-7-x86_64-updates'
+      - 'epel-7-x86_64'
+      - 'icinga-el7-x86_64'
+      - 'puppetlabs-puppet7-el7-x86_64'
+      - 'pixelpark-el7-x86_64'
+      - 'monitoring-noarch'
+      - 'prometheus-el7-x86_64'
+    packages:
+      - '@base'
+      - 'bash-completion'
+      - 'bc'
+      - 'bind-utils'
+      - 'chrony'
+      - 'curl'
+      - 'git'
+      - 'iotop'
+      - 'lsof'
+      - 'mailx'
+      - 'man'
+      - 'mlocate'
+      - 'net-tools'
+      - 'postfix'
+      - 'psmisc'
+      - 'rsync'
+      - 'strace'
+      - 'sysstat'
+      - 'tcpdump'
+      - 'telnet'
+      - 'tmux'
+      - 'traceroute'
+      - 'vim'
+      - 'wget'
+      - 'yum-utils'
+      - '-mysql-community*'
+      - '-nfs*'
+      - '-rpcbind'
+    snippets:
+      - 'tpl.001.basics.sh'
+      - 'tpl.010.authkeys.sh'
+      - 'tpl.040.network.sh'
+      - 'tpl.060.tweak_systemd.sh'
+      - 'tpl.070.tweak_grub.sh'
+      - 'tpl.075.tmp-tmpfs.sh'
+      - 'tpl.080.rsyslogd-el7.sh'
+      - 'tpl.085.disable-ipv6.sh'
+      - 'tpl.100.clear_repos.sh'
+      - 'tpl.170.repos_centos7.sh'
+      - 'tpl.175.repos_el7.sh'
+      - 'tpl.200.init-repos.sh'
+      - 'tpl.205.bashrc-el7.sh'
+      - 'tpl.225.vimrc-el7.sh'
+      - 'tpl.250.pkgs-el7.sh'
+      - 'tpl.280.dist-upgrade.sh'
+      - 'tpl.300.create-motd.sh'
+      - 'tpl.320.root-ssh-login.sh'
+      - 'tpl.350.legato.sh'
+      - 'tpl.400.chrony.sh'
+      - 'tpl.450.puppet.sh'
+      - 'tpl.470.postfix.sh'
+      - 'tpl.500.logrotate.sh'
+      - 'tpl.999.finish.sh'
+

diff --git a/etc/cobbler-distros.d/centos-stream-8.yaml b/etc/cobbler-distros.d/centos-stream-8.yaml
new file mode 100644 (file)
index 0000000..c1ea73a
--- /dev/null
+++ b/etc/cobbler-distros.d/centos-stream-8.yaml
@@ -0,0 +1,82 @@
+---
+cobbler-distros:
+  centos-stream-8:
+    distro: 'CentOS-Stream-8-x86_64'
+    description: 'CentOS Stream 8 x86_64'
+    shortname: 'centos8'
+    is_rhel: false
+    ks_template: 'el8-standard.ks'
+    ks_repo_url: 'https://repo02.pixelpark.com/Linux/yum/centos/8-stream/BaseOS/x86_64/os'
+    repos:
+      - 'centos-stream-8-x86_64-baseos'
+      - 'centos-stream-8-x86_64-appstream'
+      - 'centos-stream-8-x86_64-extras'
+      - 'centos-stream-8-x86_64-powertools'
+      - 'epel-8-x86_64'
+      - 'epel-8-x86_64-modular'
+      - 'icinga-el8-x86_64'
+      - 'puppetlabs-puppet7-el8-x86_64'
+      - 'pixelpark-el8-x86_64'
+      - 'monitoring-noarch'
+      - 'prometheus-el8-x86_64'
+    packages:
+      - '@core'
+      - '@^minimal install'
+      - 'NetworkManager-config-server'
+      - 'bash-completion'
+      - 'bc'
+      - 'bind-utils'
+      - 'chrony'
+      - 'curl'
+      - 'dbus'
+      - 'git'
+      - 'iotop'
+      - 'langpacks-de'
+      - 'lsof'
+      - 'mailx'
+      - 'man'
+      - 'mlocate'
+      - 'net-tools'
+      - 'oddjob-mkhomedir'
+      - 'postfix'
+      - 'psmisc'
+      - 'rsync'
+      - 'strace'
+      - 'sysstat'
+      - 'tcpdump'
+      - 'telnet'
+      - 'tmux'
+      - 'traceroute'
+      - 'vim'
+      - 'wget'
+      - 'yum-utils'
+      - '-abrt*'
+      - '-nfs*'
+      - '-rpcbind'
+    snippets:
+      - 'tpl.001.basics.sh'
+      - 'tpl.010.authkeys.sh'
+      - 'tpl.040.network.sh'
+      - 'tpl.060.tweak_systemd.sh'
+      - 'tpl.070.tweak_grub.sh'
+      - 'tpl.075.tmp-tmpfs.sh'
+      - 'tpl.080.rsyslogd-el8.sh'
+      - 'tpl.085.disable-ipv6.sh'
+      - 'tpl.100.clear_repos.sh'
+      - 'tpl.180.repos_centos8.sh'
+      - 'tpl.185.repos_el8.sh'
+      - 'tpl.200.init-repos.sh'
+      - 'tpl.210.bashrc-el8.sh'
+      - 'tpl.220.locales-el8.sh'
+      - 'tpl.230.vimrc-el8.sh'
+      - 'tpl.250.pkgs-el8.sh'
+      - 'tpl.280.dist-upgrade.sh'
+      - 'tpl.300.create-motd.sh'
+      - 'tpl.320.root-ssh-login.sh'
+      - 'tpl.350.legato.sh'
+      - 'tpl.400.chrony.sh'
+      - 'tpl.450.puppet.sh'
+      - 'tpl.470.postfix.sh'
+      - 'tpl.500.logrotate.sh'
+      - 'tpl.999.finish.sh'
+

diff --git a/etc/cobbler-distros.d/centos-stream-9.yaml b/etc/cobbler-distros.d/centos-stream-9.yaml
new file mode 100644 (file)
index 0000000..9fc340b
--- /dev/null
+++ b/etc/cobbler-distros.d/centos-stream-9.yaml
@@ -0,0 +1,82 @@
+---
+cobbler-distros:
+  centos-stream-9:
+    distro: 'CentOS-Stream-9-x86_64'
+    description: 'CentOS Stream 9 x86_64'
+    shortname: 'centos9'
+    is_rhel: false
+    ks_template: 'el9-standard.ks'
+    ks_repo_url: 'https://repo02.pixelpark.com/Linux/yum/centos-stream/9-stream/BaseOS/x86_64/os'
+    repos:
+      - 'centos-stream-8-x86_64-baseos'
+      - 'centos-stream-8-x86_64-appstream'
+      - 'centos-stream-8-x86_64-extras'
+      - 'centos-stream-8-x86_64-powertools'
+      - 'epel-8-x86_64'
+      - 'epel-8-x86_64-modular'
+      - 'icinga-el8-x86_64'
+      - 'puppetlabs-puppet7-el8-x86_64'
+      - 'pixelpark-el8-x86_64'
+      - 'monitoring-noarch'
+      - 'prometheus-el8-x86_64'
+    packages:
+      - '@core'
+      - '@^minimal install'
+      - 'NetworkManager-config-server'
+      - 'bash-completion'
+      - 'bc'
+      - 'bind-utils'
+      - 'chrony'
+      - 'curl'
+      - 'dbus'
+      - 'git'
+      - 'iotop'
+      - 'langpacks-de'
+      - 'lsof'
+      - 'mailx'
+      - 'man'
+      - 'mlocate'
+      - 'net-tools'
+      - 'oddjob-mkhomedir'
+      - 'postfix'
+      - 'psmisc'
+      - 'rsync'
+      - 'strace'
+      - 'sysstat'
+      - 'tcpdump'
+      - 'telnet'
+      - 'tmux'
+      - 'traceroute'
+      - 'vim'
+      - 'wget'
+      - 'yum-utils'
+      - '-abrt*'
+      - '-nfs*'
+      - '-rpcbind'
+    snippets:
+      - 'tpl.001.basics.sh'
+      - 'tpl.010.authkeys.sh'
+      - 'tpl.040.network.sh'
+      - 'tpl.060.tweak_systemd.sh'
+      - 'tpl.070.tweak_grub.sh'
+      - 'tpl.075.tmp-tmpfs.sh'
+      - 'tpl.080.rsyslogd-el8.sh'
+      - 'tpl.085.disable-ipv6.sh'
+      - 'tpl.100.clear_repos.sh'
+      - 'tpl.180.repos_centos8.sh'
+      - 'tpl.185.repos_el8.sh'
+      - 'tpl.200.init-repos.sh'
+      - 'tpl.210.bashrc-el8.sh'
+      - 'tpl.220.locales-el8.sh'
+      - 'tpl.230.vimrc-el8.sh'
+      - 'tpl.250.pkgs-el8.sh'
+      - 'tpl.280.dist-upgrade.sh'
+      - 'tpl.300.create-motd.sh'
+      - 'tpl.320.root-ssh-login.sh'
+      - 'tpl.350.legato.sh'
+      - 'tpl.400.chrony.sh'
+      - 'tpl.450.puppet.sh'
+      - 'tpl.470.postfix.sh'
+      - 'tpl.500.logrotate.sh'
+      - 'tpl.999.finish.sh'
+

diff --git a/etc/cobbler-distros.d/oel-7.yaml b/etc/cobbler-distros.d/oel-7.yaml
new file mode 100644 (file)
index 0000000..ada7f0b
--- /dev/null
+++ b/etc/cobbler-distros.d/oel-7.yaml
@@ -0,0 +1,79 @@
+---
+cobbler-distros:
+  oel-7:
+    distro: 'Oracle-Linux-7.9-x86_64'
+    description: 'Oracle Enterprise Linux 7 x86_64'
+    shortname: 'oel7'
+    is_rhel: false
+    ks_template: 'el7-standard.ks'
+    ks_repo_url: '$tree'
+    # ks_repo_url: 'https://repo02.pixelpark.com/Linux/yum/OracleLinux/OL7/ol7_latest'
+    # + 'LiveOS/squashfs.img'
+    repos:
+      - 'oraclelinux-7-x86_64-addons'
+      - 'oraclelinux-7-x86_64-latest'
+      - 'oraclelinux-7-x86_64-optionallatest'
+      - 'oraclelinux-7-x86_64-uekr3'
+      - 'oraclelinux-7-x86_64-uekr4'
+      - 'epel-7-x86_64'
+      - 'icinga-el7-x86_64'
+      - 'puppetlabs-puppet7-el7-x86_64'
+      - 'pixelpark-el7-x86_64'
+      - 'monitoring-noarch'
+      - 'prometheus-el7-x86_64'
+    packages:
+      - '@base'
+      - 'bash-completion'
+      - 'bc'
+      - 'bind-utils'
+      - 'chrony'
+      - 'curl'
+      - 'git'
+      - 'iotop'
+      - 'lsof'
+      - 'mailx'
+      - 'man'
+      - 'mlocate'
+      - 'net-tools'
+      - 'postfix'
+      - 'psmisc'
+      - 'rsync'
+      - 'strace'
+      - 'sysstat'
+      - 'tcpdump'
+      - 'telnet'
+      - 'tmux'
+      - 'traceroute'
+      - 'vim'
+      - 'wget'
+      - 'yum-utils'
+      - '-mysql-community*'
+      - '-nfs*'
+      - '-rpcbind'
+      - '-*uek*'
+    snippets:
+      - 'tpl.001.basics.sh'
+      - 'tpl.010.authkeys.sh'
+      - 'tpl.040.network.sh'
+      - 'tpl.060.tweak_systemd.sh'
+      - 'tpl.070.tweak_grub.sh'
+      - 'tpl.075.tmp-tmpfs.sh'
+      - 'tpl.080.rsyslogd-el7.sh'
+      - 'tpl.085.disable-ipv6.sh'
+      - 'tpl.100.clear_repos.sh'
+      - 'tpl.170.repos_oel7.sh'
+      - 'tpl.175.repos_el7.sh'
+      - 'tpl.200.init-repos.sh'
+      - 'tpl.205.bashrc-el7.sh'
+      - 'tpl.225.vimrc-el7.sh'
+      - 'tpl.250.pkgs-el7.sh'
+      - 'tpl.270.remove-uek.sh'
+      - 'tpl.280.dist-upgrade.sh'
+      - 'tpl.300.create-motd.sh'
+      - 'tpl.320.root-ssh-login.sh'
+      - 'tpl.350.legato.sh'
+      - 'tpl.400.chrony.sh'
+      - 'tpl.450.puppet.sh'
+      - 'tpl.470.postfix.sh'
+      - 'tpl.500.logrotate.sh'
+      - 'tpl.999.finish.sh'

diff --git a/etc/cobbler-distros.d/rhel-9.yaml b/etc/cobbler-distros.d/rhel-9.yaml
new file mode 100644 (file)
index 0000000..c51b4a8
--- /dev/null
+++ b/etc/cobbler-distros.d/rhel-9.yaml
@@ -0,0 +1,69 @@
+---
+cobbler-distros:
+  rhel-9:
+    distro: 'RHEL-9.2-x86_64'
+    description: 'RedHat Enterprise Linux 9 x86_64'
+    shortname: 'rhel9'
+    is_rhel: true
+    ks_template: 'el9-standard.ks'
+    ks_repo_url: 'http://${server}/cobbler/distro_mirror/RHEL-9.2'
+    repos: []
+    packages:
+      - '@core'
+      - '@^minimal install'
+      - 'NetworkManager-config-server'
+      - 'bash-completion'
+      - 'bc'
+      - 'bind-utils'
+      - 'chrony'
+      - 'curl'
+      - 'dbus'
+      - 'iotop'
+      - 'kexec-tools'
+      - 'langpacks-de'
+      - 'lsof'
+      - 'man'
+      - 'mlocate'
+      - 'net-tools'
+      - 'oddjob-mkhomedir'
+      - 'psmisc'
+      - 'rsync'
+      - 's-nail'
+      - 'strace'
+      - 'sysstat'
+      - 'tcpdump'
+      - 'telnet'
+      - 'tmux'
+      - 'traceroute'
+      - 'vim'
+      - 'wget'
+      - 'yum-utils'
+      - '-abrt*'
+      - '-nfs*'
+      - '-rpcbind'
+    snippets:
+      - 'tpl.001.basics.sh'
+      - 'tpl.005.update_resolvconf.sh'
+      - 'tpl.010.authkeys.sh'
+      - 'tpl.040.network.sh'
+      - 'tpl.060.tweak_systemd.sh'
+      - 'tpl.070.tweak_grub.sh'
+      - 'tpl.075.tmp-tmpfs.sh'
+      - 'tpl.080.rsyslogd-el9.sh'
+      - 'tpl.085.disable-ipv6.sh'
+      - 'tpl.100.clear_repos.sh'
+      - 'tpl.110.register-rhel.sh'
+      - 'tpl.190.repos_rhel9.sh'
+      - 'tpl.195.repos_el9.sh'
+      - 'tpl.200.init-repos.sh'
+      - 'tpl.211.bashrc-el9.sh'
+      - 'tpl.220.locales-el9.sh'
+      - 'tpl.231.vimrc-centos9.sh'
+      - 'tpl.250.pkgs-el9.sh'
+      - 'tpl.280.dist-upgrade.sh'
+      - 'tpl.300.create-motd.sh'
+      - 'tpl.320.root-ssh-login.sh'
+      - 'tpl.400.chrony.sh'
+      - 'tpl.450.puppet.sh'
+      - 'tpl.500.logrotate.sh'
+      - 'tpl.999.finish.sh'

diff --git a/etc/cobbler-distros.d/rocky-8.yaml b/etc/cobbler-distros.d/rocky-8.yaml
new file mode 100644 (file)
index 0000000..c8d8f13
--- /dev/null
+++ b/etc/cobbler-distros.d/rocky-8.yaml
@@ -0,0 +1,81 @@
+---
+cobbler-distros:
+  rocky-8:
+    distro: 'Rocky-8-x86_64'
+    description: 'Rocky Linux 8 x86_64'
+    shortname: 'rocky8'
+    is_rhel: false
+    ks_template: 'el8-standard.ks'
+    ks_repo_url: 'https://repo02.pixelpark.com/Linux/yum/rockylinux/8/BaseOS/x86_64/os'
+    repos:
+      - 'rocky-8-x86_64-baseos'
+      - 'rocky-8-x86_64-appstream'
+      - 'rocky-8-x86_64-extras'
+      - 'rocky-8-x86_64-powertools'
+      - 'epel-8-x86_64'
+      - 'epel-8-x86_64-modular'
+      - 'icinga-el8-x86_64'
+      - 'puppetlabs-puppet7-el8-x86_64'
+      - 'pixelpark-el8-x86_64'
+      - 'monitoring-noarch'
+      - 'prometheus-el8-x86_64'
+    packages:
+      - '@core'
+      - '@^minimal install'
+      - 'NetworkManager-config-server'
+      - 'bash-completion'
+      - 'bc'
+      - 'bind-utils'
+      - 'chrony'
+      - 'curl'
+      - 'dbus'
+      - 'git'
+      - 'iotop'
+      - 'langpacks-de'
+      - 'lsof'
+      - 'mailx'
+      - 'man'
+      - 'mlocate'
+      - 'net-tools'
+      - 'oddjob-mkhomedir'
+      - 'postfix'
+      - 'psmisc'
+      - 'rsync'
+      - 'strace'
+      - 'sysstat'
+      - 'tcpdump'
+      - 'telnet'
+      - 'tmux'
+      - 'traceroute'
+      - 'vim'
+      - 'wget'
+      - 'yum-utils'
+      - '-abrt*'
+      - '-nfs*'
+      - '-rpcbind'
+    snippets:
+      - 'tpl.001.basics.sh'
+      - 'tpl.010.authkeys.sh'
+      - 'tpl.040.network.sh'
+      - 'tpl.060.tweak_systemd.sh'
+      - 'tpl.070.tweak_grub.sh'
+      - 'tpl.075.tmp-tmpfs.sh'
+      - 'tpl.080.rsyslogd-el8.sh'
+      - 'tpl.085.disable-ipv6.sh'
+      - 'tpl.100.clear_repos.sh'
+      - 'tpl.180.repos_rocky8.sh'
+      - 'tpl.185.repos_el8.sh'
+      - 'tpl.200.init-repos.sh'
+      - 'tpl.210.bashrc-el8.sh'
+      - 'tpl.220.locales-el8.sh'
+      - 'tpl.230.vimrc-el8.sh'
+      - 'tpl.250.pkgs-el8.sh'
+      - 'tpl.280.dist-upgrade.sh'
+      - 'tpl.300.create-motd.sh'
+      - 'tpl.320.root-ssh-login.sh'
+      - 'tpl.350.legato.sh'
+      - 'tpl.400.chrony.sh'
+      - 'tpl.450.puppet.sh'
+      - 'tpl.470.postfix.sh'
+      - 'tpl.500.logrotate.sh'
+      - 'tpl.999.finish.sh'

diff --git a/etc/cobbler-distros.yaml.default b/etc/cobbler-distros.yaml.default
index 72c55399047356a2bce5e3db5a05c92bc7f998dd..2b6cf43f9a04b52c25f776eaa8af1bdd754db1c2 100644 (file)
--- a/etc/cobbler-distros.yaml.default
+++ b/etc/cobbler-distros.yaml.default
@@ -1,543 +1,4 @@
 ---
-cobbler-distros:
-  almalinux-8:
-    distro: 'AlmaLinux-8-x86_64'
-    description: 'AlmaLinux 8 x86_64'
-    shortname: 'alma8'
-    ks_template: 'el8-standard.ks'
-    is_rhel: false
-    ks_repo_url: 'https://repo02.pixelpark.com/Linux/yum/almalinux/8/BaseOS/x86_64/os'
-    packages:
-      - '@core'
-      - '@^minimal install'
-      - 'NetworkManager-config-server'
-      - 'bash-completion'
-      - 'bc'
-      - 'bind-utils'
-      - 'chrony'
-      - 'curl'
-      - 'dbus'
-      - 'git'
-      - 'iotop'
-      - 'langpacks-de'
-      - 'lsof'
-      - 'mailx'
-      - 'man'
-      - 'mlocate'
-      - 'net-tools'
-      - 'oddjob-mkhomedir'
-      - 'postfix'
-      - 'psmisc'
-      - 'rsync'
-      - 'strace'
-      - 'sysstat'
-      - 'tcpdump'
-      - 'telnet'
-      - 'tmux'
-      - 'traceroute'
-      - 'vim'
-      - 'wget'
-      - 'yum-utils'
-      - '-abrt*'
-      - '-nfs*'
-      - '-rpcbind'
-    repos:
-      - 'almalinux-8-x86_64-baseos'
-      - 'almalinux-8-x86_64-appstream'
-      - 'almalinux-8-x86_64-extras'
-      - 'almalinux-8-x86_64-powertools'
-      - 'epel-8-x86_64'
-      - 'epel-8-x86_64-modular'
-      - 'icinga-el8-x86_64'
-      - 'puppetlabs-puppet7-el8-x86_64'
-      - 'pixelpark-el8-x86_64'
-      - 'monitoring-noarch'
-      - 'prometheus-el8-x86_64'
-    snippets:
-      - 'tpl.001.basics.sh'
-      - 'tpl.010.authkeys.sh'
-      - 'tpl.040.network.sh'
-      - 'tpl.060.tweak_systemd.sh'
-      - 'tpl.070.tweak_grub.sh'
-      - 'tpl.075.tmp-tmpfs.sh'
-      - 'tpl.080.rsyslogd-el8.sh'
-      - 'tpl.085.disable-ipv6.sh'
-      - 'tpl.100.clear_repos.sh'
-      - 'tpl.180.repos_almalinux8.sh'
-      - 'tpl.185.repos_el8.sh'
-      - 'tpl.200.init-repos.sh'
-      - 'tpl.210.bashrc-el8.sh'
-      - 'tpl.220.locales-el8.sh'
-      - 'tpl.230.vimrc-el8.sh'
-      - 'tpl.250.pkgs-el8.sh'
-      - 'tpl.280.dist-upgrade.sh'
-      - 'tpl.300.create-motd.sh'
-      - 'tpl.320.root-ssh-login.sh'
-      - 'tpl.350.legato.sh'
-      - 'tpl.400.chrony.sh'
-      - 'tpl.450.puppet.sh'
-      - 'tpl.470.postfix.sh'
-      - 'tpl.500.logrotate.sh'
-      - 'tpl.999.finish.sh'
-
-  centos-7:
-    distro: 'CentOS-7.9-x86_64'
-    description: 'CentOS 7 x86_64'
-    shortname: 'centos7'
-    is_rhel: false
-    ks_template: 'el7-standard.ks'
-    ks_repo_url: 'https://repo02.pixelpark.com/Linux/yum/centos/7/os/x86_64'
-    repos:
-      - 'centos-7-x86_64-baseos'
-      - 'centos-7-x86_64-extras'
-      - 'centos-7-x86_64-updates'
-      - 'epel-7-x86_64'
-      - 'icinga-el7-x86_64'
-      - 'puppetlabs-puppet7-el7-x86_64'
-      - 'pixelpark-el7-x86_64'
-      - 'monitoring-noarch'
-      - 'prometheus-el7-x86_64'
-    packages:
-      - '@base'
-      - 'bash-completion'
-      - 'bc'
-      - 'bind-utils'
-      - 'chrony'
-      - 'curl'
-      - 'git'
-      - 'iotop'
-      - 'lsof'
-      - 'mailx'
-      - 'man'
-      - 'mlocate'
-      - 'net-tools'
-      - 'postfix'
-      - 'psmisc'
-      - 'rsync'
-      - 'strace'
-      - 'sysstat'
-      - 'tcpdump'
-      - 'telnet'
-      - 'tmux'
-      - 'traceroute'
-      - 'vim'
-      - 'wget'
-      - 'yum-utils'
-      - '-mysql-community*'
-      - '-nfs*'
-      - '-rpcbind'
-    snippets:
-      - 'tpl.001.basics.sh'
-      - 'tpl.010.authkeys.sh'
-      - 'tpl.040.network.sh'
-      - 'tpl.060.tweak_systemd.sh'
-      - 'tpl.070.tweak_grub.sh'
-      - 'tpl.075.tmp-tmpfs.sh'
-      - 'tpl.080.rsyslogd-el7.sh'
-      - 'tpl.085.disable-ipv6.sh'
-      - 'tpl.100.clear_repos.sh'
-      - 'tpl.170.repos_centos7.sh'
-      - 'tpl.175.repos_el7.sh'
-      - 'tpl.200.init-repos.sh'
-      - 'tpl.205.bashrc-el7.sh'
-      - 'tpl.225.vimrc-el7.sh'
-      - 'tpl.250.pkgs-el7.sh'
-      - 'tpl.280.dist-upgrade.sh'
-      - 'tpl.300.create-motd.sh'
-      - 'tpl.320.root-ssh-login.sh'
-      - 'tpl.350.legato.sh'
-      - 'tpl.400.chrony.sh'
-      - 'tpl.450.puppet.sh'
-      - 'tpl.470.postfix.sh'
-      - 'tpl.500.logrotate.sh'
-      - 'tpl.999.finish.sh'
-
-  centos-stream-8:
-    distro: 'CentOS-Stream-8-x86_64'
-    description: 'CentOS Stream 8 x86_64'
-    shortname: 'centos8'
-    is_rhel: false
-    ks_template: 'el8-standard.ks'
-    ks_repo_url: 'https://repo02.pixelpark.com/Linux/yum/centos/8-stream/BaseOS/x86_64/os'
-    repos:
-      - 'centos-stream-8-x86_64-baseos'
-      - 'centos-stream-8-x86_64-appstream'
-      - 'centos-stream-8-x86_64-extras'
-      - 'centos-stream-8-x86_64-powertools'
-      - 'epel-8-x86_64'
-      - 'epel-8-x86_64-modular'
-      - 'icinga-el8-x86_64'
-      - 'puppetlabs-puppet7-el8-x86_64'
-      - 'pixelpark-el8-x86_64'
-      - 'monitoring-noarch'
-      - 'prometheus-el8-x86_64'
-    packages:
-      - '@core'
-      - '@^minimal install'
-      - 'NetworkManager-config-server'
-      - 'bash-completion'
-      - 'bc'
-      - 'bind-utils'
-      - 'chrony'
-      - 'curl'
-      - 'dbus'
-      - 'git'
-      - 'iotop'
-      - 'langpacks-de'
-      - 'lsof'
-      - 'mailx'
-      - 'man'
-      - 'mlocate'
-      - 'net-tools'
-      - 'oddjob-mkhomedir'
-      - 'postfix'
-      - 'psmisc'
-      - 'rsync'
-      - 'strace'
-      - 'sysstat'
-      - 'tcpdump'
-      - 'telnet'
-      - 'tmux'
-      - 'traceroute'
-      - 'vim'
-      - 'wget'
-      - 'yum-utils'
-      - '-abrt*'
-      - '-nfs*'
-      - '-rpcbind'
-    snippets:
-      - 'tpl.001.basics.sh'
-      - 'tpl.010.authkeys.sh'
-      - 'tpl.040.network.sh'
-      - 'tpl.060.tweak_systemd.sh'
-      - 'tpl.070.tweak_grub.sh'
-      - 'tpl.075.tmp-tmpfs.sh'
-      - 'tpl.080.rsyslogd-el8.sh'
-      - 'tpl.085.disable-ipv6.sh'
-      - 'tpl.100.clear_repos.sh'
-      - 'tpl.180.repos_centos8.sh'
-      - 'tpl.185.repos_el8.sh'
-      - 'tpl.200.init-repos.sh'
-      - 'tpl.210.bashrc-el8.sh'
-      - 'tpl.220.locales-el8.sh'
-      - 'tpl.230.vimrc-el8.sh'
-      - 'tpl.250.pkgs-el8.sh'
-      - 'tpl.280.dist-upgrade.sh'
-      - 'tpl.300.create-motd.sh'
-      - 'tpl.320.root-ssh-login.sh'
-      - 'tpl.350.legato.sh'
-      - 'tpl.400.chrony.sh'
-      - 'tpl.450.puppet.sh'
-      - 'tpl.470.postfix.sh'
-      - 'tpl.500.logrotate.sh'
-      - 'tpl.999.finish.sh'
-
-  centos-stream-9:
-    distro: 'CentOS-Stream-9-x86_64'
-    description: 'CentOS Stream 9 x86_64'
-    shortname: 'centos9'
-    is_rhel: false
-    ks_template: 'el9-standard.ks'
-    ks_repo_url: 'https://repo02.pixelpark.com/Linux/yum/centos-stream/9-stream/BaseOS/x86_64/os'
-    repos:
-      - 'centos-stream-8-x86_64-baseos'
-      - 'centos-stream-8-x86_64-appstream'
-      - 'centos-stream-8-x86_64-extras'
-      - 'centos-stream-8-x86_64-powertools'
-      - 'epel-8-x86_64'
-      - 'epel-8-x86_64-modular'
-      - 'icinga-el8-x86_64'
-      - 'puppetlabs-puppet7-el8-x86_64'
-      - 'pixelpark-el8-x86_64'
-      - 'monitoring-noarch'
-      - 'prometheus-el8-x86_64'
-    packages:
-      - '@core'
-      - '@^minimal install'
-      - 'NetworkManager-config-server'
-      - 'bash-completion'
-      - 'bc'
-      - 'bind-utils'
-      - 'chrony'
-      - 'curl'
-      - 'dbus'
-      - 'git'
-      - 'iotop'
-      - 'langpacks-de'
-      - 'lsof'
-      - 'mailx'
-      - 'man'
-      - 'mlocate'
-      - 'net-tools'
-      - 'oddjob-mkhomedir'
-      - 'postfix'
-      - 'psmisc'
-      - 'rsync'
-      - 'strace'
-      - 'sysstat'
-      - 'tcpdump'
-      - 'telnet'
-      - 'tmux'
-      - 'traceroute'
-      - 'vim'
-      - 'wget'
-      - 'yum-utils'
-      - '-abrt*'
-      - '-nfs*'
-      - '-rpcbind'
-    snippets:
-      - 'tpl.001.basics.sh'
-      - 'tpl.010.authkeys.sh'
-      - 'tpl.040.network.sh'
-      - 'tpl.060.tweak_systemd.sh'
-      - 'tpl.070.tweak_grub.sh'
-      - 'tpl.075.tmp-tmpfs.sh'
-      - 'tpl.080.rsyslogd-el8.sh'
-      - 'tpl.085.disable-ipv6.sh'
-      - 'tpl.100.clear_repos.sh'
-      - 'tpl.180.repos_centos8.sh'
-      - 'tpl.185.repos_el8.sh'
-      - 'tpl.200.init-repos.sh'
-      - 'tpl.210.bashrc-el8.sh'
-      - 'tpl.220.locales-el8.sh'
-      - 'tpl.230.vimrc-el8.sh'
-      - 'tpl.250.pkgs-el8.sh'
-      - 'tpl.280.dist-upgrade.sh'
-      - 'tpl.300.create-motd.sh'
-      - 'tpl.320.root-ssh-login.sh'
-      - 'tpl.350.legato.sh'
-      - 'tpl.400.chrony.sh'
-      - 'tpl.450.puppet.sh'
-      - 'tpl.470.postfix.sh'
-      - 'tpl.500.logrotate.sh'
-      - 'tpl.999.finish.sh'
-
-  oel-7:
-    distro: 'Oracle-Linux-7.9-x86_64'
-    description: 'Oracle Enterprise Linux 7 x86_64'
-    shortname: 'oel7'
-    is_rhel: false
-    ks_template: 'el7-standard.ks'
-    ks_repo_url: '$tree'
-    # ks_repo_url: 'https://repo02.pixelpark.com/Linux/yum/OracleLinux/OL7/ol7_latest'
-    # + 'LiveOS/squashfs.img'
-    repos:
-      - 'oraclelinux-7-x86_64-addons'
-      - 'oraclelinux-7-x86_64-latest'
-      - 'oraclelinux-7-x86_64-optionallatest'
-      - 'oraclelinux-7-x86_64-uekr3'
-      - 'oraclelinux-7-x86_64-uekr4'
-      - 'epel-7-x86_64'
-      - 'icinga-el7-x86_64'
-      - 'puppetlabs-puppet7-el7-x86_64'
-      - 'pixelpark-el7-x86_64'
-      - 'monitoring-noarch'
-      - 'prometheus-el7-x86_64'
-    packages:
-      - '@base'
-      - 'bash-completion'
-      - 'bc'
-      - 'bind-utils'
-      - 'chrony'
-      - 'curl'
-      - 'git'
-      - 'iotop'
-      - 'lsof'
-      - 'mailx'
-      - 'man'
-      - 'mlocate'
-      - 'net-tools'
-      - 'postfix'
-      - 'psmisc'
-      - 'rsync'
-      - 'strace'
-      - 'sysstat'
-      - 'tcpdump'
-      - 'telnet'
-      - 'tmux'
-      - 'traceroute'
-      - 'vim'
-      - 'wget'
-      - 'yum-utils'
-      - '-mysql-community*'
-      - '-nfs*'
-      - '-rpcbind'
-      - '-*uek*'
-    snippets:
-      - 'tpl.001.basics.sh'
-      - 'tpl.010.authkeys.sh'
-      - 'tpl.040.network.sh'
-      - 'tpl.060.tweak_systemd.sh'
-      - 'tpl.070.tweak_grub.sh'
-      - 'tpl.075.tmp-tmpfs.sh'
-      - 'tpl.080.rsyslogd-el7.sh'
-      - 'tpl.085.disable-ipv6.sh'
-      - 'tpl.100.clear_repos.sh'
-      - 'tpl.170.repos_oel7.sh'
-      - 'tpl.175.repos_el7.sh'
-      - 'tpl.200.init-repos.sh'
-      - 'tpl.205.bashrc-el7.sh'
-      - 'tpl.225.vimrc-el7.sh'
-      - 'tpl.250.pkgs-el7.sh'
-      - 'tpl.270.remove-uek.sh'
-      - 'tpl.280.dist-upgrade.sh'
-      - 'tpl.300.create-motd.sh'
-      - 'tpl.320.root-ssh-login.sh'
-      - 'tpl.350.legato.sh'
-      - 'tpl.400.chrony.sh'
-      - 'tpl.450.puppet.sh'
-      - 'tpl.470.postfix.sh'
-      - 'tpl.500.logrotate.sh'
-      - 'tpl.999.finish.sh'
-
-  rhel-9:
-    distro: 'RHEL-9.2-x86_64'
-    description: 'RedHat Enterprise Linux 9 x86_64'
-    shortname: 'rhel9'
-    is_rhel: true
-    ks_template: 'el9-standard.ks'
-    ks_repo_url: 'http://${server}/cobbler/distro_mirror/RHEL-9.2'
-    repos: []
-    packages:
-      - '@core'
-      - '@^minimal install'
-      - 'NetworkManager-config-server'
-      - 'bash-completion'
-      - 'bc'
-      - 'bind-utils'
-      - 'chrony'
-      - 'curl'
-      - 'dbus'
-      - 'iotop'
-      - 'kexec-tools'
-      - 'langpacks-de'
-      - 'lsof'
-      - 'man'
-      - 'mlocate'
-      - 'net-tools'
-      - 'oddjob-mkhomedir'
-      - 'psmisc'
-      - 'rsync'
-      - 's-nail'
-      - 'strace'
-      - 'sysstat'
-      - 'tcpdump'
-      - 'telnet'
-      - 'tmux'
-      - 'traceroute'
-      - 'vim'
-      - 'wget'
-      - 'yum-utils'
-      - '-abrt*'
-      - '-nfs*'
-      - '-rpcbind'
-    snippets:
-      - 'tpl.001.basics.sh'
-      - 'tpl.005.update_resolvconf.sh'
-      - 'tpl.010.authkeys.sh'
-      - 'tpl.040.network.sh'
-      - 'tpl.060.tweak_systemd.sh'
-      - 'tpl.070.tweak_grub.sh'
-      - 'tpl.075.tmp-tmpfs.sh'
-      - 'tpl.080.rsyslogd-el9.sh'
-      - 'tpl.085.disable-ipv6.sh'
-      - 'tpl.100.clear_repos.sh'
-      - 'tpl.110.register-rhel.sh'
-      - 'tpl.190.repos_rhel9.sh'
-      - 'tpl.195.repos_el9.sh'
-      - 'tpl.200.init-repos.sh'
-      - 'tpl.211.bashrc-el9.sh'
-      - 'tpl.220.locales-el9.sh'
-      - 'tpl.231.vimrc-centos9.sh'
-      - 'tpl.250.pkgs-el9.sh'
-      - 'tpl.280.dist-upgrade.sh'
-      - 'tpl.300.create-motd.sh'
-      - 'tpl.320.root-ssh-login.sh'
-      - 'tpl.400.chrony.sh'
-      - 'tpl.450.puppet.sh'
-      - 'tpl.500.logrotate.sh'
-      - 'tpl.999.finish.sh'
-
-  rocky-8:
-    distro: 'Rocky-8-x86_64'
-    description: 'Rocky Linux 8 x86_64'
-    shortname: 'rocky8'
-    is_rhel: false
-    ks_template: 'el8-standard.ks'
-    ks_repo_url: 'https://repo02.pixelpark.com/Linux/yum/rockylinux/8/BaseOS/x86_64/os'
-    repos:
-      - 'rocky-8-x86_64-baseos'
-      - 'rocky-8-x86_64-appstream'
-      - 'rocky-8-x86_64-extras'
-      - 'rocky-8-x86_64-powertools'
-      - 'epel-8-x86_64'
-      - 'epel-8-x86_64-modular'
-      - 'icinga-el8-x86_64'
-      - 'puppetlabs-puppet7-el8-x86_64'
-      - 'pixelpark-el8-x86_64'
-      - 'monitoring-noarch'
-      - 'prometheus-el8-x86_64'
-    packages:
-      - '@core'
-      - '@^minimal install'
-      - 'NetworkManager-config-server'
-      - 'bash-completion'
-      - 'bc'
-      - 'bind-utils'
-      - 'chrony'
-      - 'curl'
-      - 'dbus'
-      - 'git'
-      - 'iotop'
-      - 'langpacks-de'
-      - 'lsof'
-      - 'mailx'
-      - 'man'
-      - 'mlocate'
-      - 'net-tools'
-      - 'oddjob-mkhomedir'
-      - 'postfix'
-      - 'psmisc'
-      - 'rsync'
-      - 'strace'
-      - 'sysstat'
-      - 'tcpdump'
-      - 'telnet'
-      - 'tmux'
-      - 'traceroute'
-      - 'vim'
-      - 'wget'
-      - 'yum-utils'
-      - '-abrt*'
-      - '-nfs*'
-      - '-rpcbind'
-    snippets:
-      - 'tpl.001.basics.sh'
-      - 'tpl.010.authkeys.sh'
-      - 'tpl.040.network.sh'
-      - 'tpl.060.tweak_systemd.sh'
-      - 'tpl.070.tweak_grub.sh'
-      - 'tpl.075.tmp-tmpfs.sh'
-      - 'tpl.080.rsyslogd-el8.sh'
-      - 'tpl.085.disable-ipv6.sh'
-      - 'tpl.100.clear_repos.sh'
-      - 'tpl.180.repos_rocky8.sh'
-      - 'tpl.185.repos_el8.sh'
-      - 'tpl.200.init-repos.sh'
-      - 'tpl.210.bashrc-el8.sh'
-      - 'tpl.220.locales-el8.sh'
-      - 'tpl.230.vimrc-el8.sh'
-      - 'tpl.250.pkgs-el8.sh'
-      - 'tpl.280.dist-upgrade.sh'
-      - 'tpl.300.create-motd.sh'
-      - 'tpl.320.root-ssh-login.sh'
-      - 'tpl.350.legato.sh'
-      - 'tpl.400.chrony.sh'
-      - 'tpl.450.puppet.sh'
-      - 'tpl.470.postfix.sh'
-      - 'tpl.500.logrotate.sh'
-      - 'tpl.999.finish.sh'
-
 cobbler-repos:
   almalinux-8-x86_64-appstream:
     reponame: 'appstream'

diff --git a/lib/cr_vmware_tpl/config/__init__.py b/lib/cr_vmware_tpl/config/__init__.py
index cee457239b290cd979cf789ec13efbbaf6e76b8a..d110155142a5849aa6ca58f4824f97550741ce69 100644 (file)
--- a/lib/cr_vmware_tpl/config/__init__.py
+++ b/lib/cr_vmware_tpl/config/__init__.py
@@ -37,7 +37,7 @@ from .eval import ConfigEval
 from .ldap import LdapConnectionInfo, LdapConnectionDict
 from .timeouts import ConfigTimeouts
 
-__version__ = '3.1.2'
+__version__ = '3.1.3'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -147,21 +147,6 @@ class CrTplConfiguration(BaseMultiConfig, ConfigCobbler, ConfigTimeouts, ConfigE
 
         self.eval_resolv_conf()
 
-        add_stems = []
-        if additional_stems:
-            if is_sequence(additional_stems):
-                for stem in additional_stems:
-                    add_stems.append(stem)
-            else:
-                add_stems.append(additional_stems)
-
-        if 'mail' not in add_stems:
-            add_stems.append('mail')
-        if 'cobbler-repos' not in add_stems:
-            add_stems.append('cobbler-distros')
-        if 'ldap' not in add_stems:
-            add_stems.append('ldap')
-
         self.os_id = self.default_os_id
 
         self.vsphere_cluster = self.default_vsphere_cluster
@@ -227,11 +212,23 @@ class CrTplConfiguration(BaseMultiConfig, ConfigCobbler, ConfigTimeouts, ConfigE
         super(CrTplConfiguration, self).__init__(
             appname=appname, verbose=verbose, version=version, base_dir=base_dir,
             append_appname_to_stems=append_appname_to_stems, config_dir=config_dir,
-            additional_stems=add_stems, additional_config_file=additional_config_file,
+            additional_config_file=additional_config_file,
             additional_cfgdirs=additional_cfgdirs, encoding=encoding, use_chardet=use_chardet,
             ensure_privacy=ensure_privacy, initialized=False,
         )
 
+        self.append_stem('mail')
+        self.append_stem('cobbler-distros')
+        self.append_stem('ldap')
+
+        if self.verbose > 1:
+            LOG.debug(_("Used config filename stems:") + '\n' + pp(self.stems))
+
+        self.collect_config_files()
+        LOG.debug(_("Additional config file: '{}'.").format(self.additional_config_file))
+
+        LOG.debug(_('Collected config files:') + '\n' + pp(self.config_files))
+
         self.vsphere_info = VSPhereConfigInfo(
             host=self.default_vsphere_host, port=self.default_vsphere_port, dc=self.default_dc,
             use_https=True, user=self.default_vsphere_user,