From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Wed, 8 Nov 2023 13:21:58 +0000 (+0100)
Subject: Merge branch 'test' into develop
X-Git-Tag: 3.2.1~25^2
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=06162b850ae8eb339e1c0ad58843e0a934462982;p=pixelpark%2Fcreate-vmware-tpl.git

Merge branch 'test' into develop
---

06162b850ae8eb339e1c0ad58843e0a934462982
diff --cc etc/cobbler-distros.d/centos-7.yaml
index cdd5d48,f817599..01108a1
--- a/etc/cobbler-distros.d/centos-7.yaml
+++ b/etc/cobbler-distros.d/centos-7.yaml
@@@ -21,27 -21,15 +21,14 @@@ cobbler-distros
        - '@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'
-       # - 'yum-utils'
 -      - 'wget'
        - '-iwl*'
        - '-mysql-community*'
        - '-nfs*'
diff --cc etc/cobbler-distros.d/centos-stream-8.yaml
index 3fc556b,4333408..9b07e17
--- a/etc/cobbler-distros.d/centos-stream-8.yaml
+++ b/etc/cobbler-distros.d/centos-stream-8.yaml
@@@ -30,27 -29,14 +29,13 @@@ cobbler-distros
        - 'cloud-init'
        - 'curl'
        - 'dbus'
-       # - 'git'
-       # - 'grubby'
-       # - 'iotop'
-       # - 'langpacks-de'
        - 'lsof'
-       # - 'mailx'
        - 'man'
-       # - 'mlocate'
        - 'net-tools'
        - 'oddjob-mkhomedir'
-       # - 'postfix'
        - 'psmisc'
-       # - 'rsync'
-       # - 'strace'
-       # - 'sysstat'
-       # - 'tcpdump'
-       # - 'telnet'
        - 'tmux'
-       # - 'traceroute'
        - 'vim'
-       # - 'yum-utils'
 -      - 'wget'
        - '-abrt*'
        - '-iwl*'
        - '-nfs*'
diff --cc etc/cobbler-distros.d/oel-7.yaml
index 47a9b97,75aea06..4e7ab44
--- a/etc/cobbler-distros.d/oel-7.yaml
+++ b/etc/cobbler-distros.d/oel-7.yaml
@@@ -25,27 -25,15 +25,14 @@@ cobbler-distros
        - '@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'
-       # - 'yum-utils'
 -      - 'wget'
        - '-iwl*'
        - '-mysql-community*'
        - '-nfs*'
diff --cc etc/cobbler-distros.d/rhel-9.yaml
index 03e3a13,0bf075f..4fda09b
--- a/etc/cobbler-distros.d/rhel-9.yaml
+++ b/etc/cobbler-distros.d/rhel-9.yaml
@@@ -28,20 -24,14 +24,13 @@@ cobbler-distros
        - 'net-tools'
        - 'oddjob-mkhomedir'
        - 'psmisc'
-       # - 'rsync'
-       # - 's-nail'
-       # - 'strace'
-       # - 'sysstat'
-       # - 'tcpdump'
-       # - 'telnet'
        - 'tmux'
-       # - 'traceroute'
        - 'vim'
-       # - 'yum-utils'
 -      - 'wget'
        - '-abrt*'
+       - '-insights-client'
        - '-iwl*'
        - '-nfs*'
+       - '-rhc'
        - '-rpcbind'
      snippets:
        - 'tpl.001.basics.sh'
diff --cc lib/cr_vmware_tpl/handler/vm.py
index 8d5737c,3421b6f..049791f
--- a/lib/cr_vmware_tpl/handler/vm.py
+++ b/lib/cr_vmware_tpl/handler/vm.py
@@@ -26,7 -26,7 +26,7 @@@ from fb_tools.errors import HandlerErro
  from .. import print_section_start, print_section_end
  from ..xlate import XLATOR
  
--__version__ = '0.2.6'
++__version__ = '0.2.7'
  
  LOG = logging.getLogger(__name__)