From 7e185518fb29972092b221e2d6322b095d682ff1 Mon Sep 17 00:00:00 2001 From: Enno Gotthold Date: Tue, 19 Sep 2023 10:34:56 +0200 Subject: [PATCH] fix: remove unused subcomponent --- cobbler/clean.sls | 1 - cobbler/init.sls | 1 - cobbler/parameters/defaults.yaml | 2 -- cobbler/subcomponent/clean.sls | 5 ---- cobbler/subcomponent/config/clean.sls | 16 ----------- cobbler/subcomponent/config/file.sls | 27 ------------------- .../files/default/subcomponent-example.tmpl | 6 ----- .../default/subcomponent-example.tmpl.jinja | 6 ----- cobbler/subcomponent/config/init.sls | 5 ---- cobbler/subcomponent/init.sls | 5 ---- docs/README.rst | 22 --------------- test/integration/default/controls/config.rb | 4 +-- .../default/controls/subcomponent_config.rb | 25 ----------------- .../default/files/_mapdata/almalinux-8.yaml | 4 --- .../default/files/_mapdata/amazonlinux-1.yaml | 4 --- .../default/files/_mapdata/amazonlinux-2.yaml | 4 --- .../files/_mapdata/arch-base-latest.yaml | 4 --- .../default/files/_mapdata/centos-6.yaml | 4 --- .../default/files/_mapdata/centos-7.yaml | 4 --- .../default/files/_mapdata/centos-8.yaml | 4 --- .../default/files/_mapdata/debian-10.yaml | 4 --- .../default/files/_mapdata/debian-11.yaml | 4 --- .../default/files/_mapdata/debian-9.yaml | 4 --- .../default/files/_mapdata/fedora-31.yaml | 4 --- .../default/files/_mapdata/fedora-32.yaml | 4 --- .../default/files/_mapdata/fedora-33.yaml | 4 --- .../default/files/_mapdata/fedora-34.yaml | 4 --- .../default/files/_mapdata/fedora-35.yaml | 4 --- .../default/files/_mapdata/fedora-36.yaml | 4 --- .../default/files/_mapdata/gentoo-2-sysd.yaml | 4 --- .../default/files/_mapdata/gentoo-2-sysv.yaml | 4 --- .../default/files/_mapdata/opensuse-15.yaml | 4 --- .../files/_mapdata/opensuse-tumbleweed.yaml | 4 --- .../default/files/_mapdata/oraclelinux-7.yaml | 4 --- .../default/files/_mapdata/oraclelinux-8.yaml | 4 --- .../default/files/_mapdata/rockylinux-8.yaml | 4 --- .../default/files/_mapdata/ubuntu-16.yaml | 4 --- .../default/files/_mapdata/ubuntu-18.yaml | 4 --- .../default/files/_mapdata/ubuntu-20.yaml | 4 --- .../default/files/_mapdata/ubuntu-22.yaml | 4 --- test/salt/pillar/default.sls | 2 -- test/salt/pillar/upstart.sls | 2 -- 42 files changed, 1 insertion(+), 236 deletions(-) delete mode 100644 cobbler/subcomponent/clean.sls delete mode 100644 cobbler/subcomponent/config/clean.sls delete mode 100644 cobbler/subcomponent/config/file.sls delete mode 100644 cobbler/subcomponent/config/files/default/subcomponent-example.tmpl delete mode 100644 cobbler/subcomponent/config/files/default/subcomponent-example.tmpl.jinja delete mode 100644 cobbler/subcomponent/config/init.sls delete mode 100644 cobbler/subcomponent/init.sls delete mode 100644 test/integration/default/controls/subcomponent_config.rb diff --git a/cobbler/clean.sls b/cobbler/clean.sls index 9e45fb40..2cefe7dd 100644 --- a/cobbler/clean.sls +++ b/cobbler/clean.sls @@ -2,7 +2,6 @@ # vim: ft=sls include: - - .subcomponent.clean - .service.clean - .config.clean - .package.clean diff --git a/cobbler/init.sls b/cobbler/init.sls index 275d1fc8..858a8e6e 100644 --- a/cobbler/init.sls +++ b/cobbler/init.sls @@ -5,4 +5,3 @@ include: - .package - .config - .service - - .subcomponent diff --git a/cobbler/parameters/defaults.yaml b/cobbler/parameters/defaults.yaml index cc0a048e..ceac7baa 100644 --- a/cobbler/parameters/defaults.yaml +++ b/cobbler/parameters/defaults.yaml @@ -10,8 +10,6 @@ values: config: '/etc/cobbler' service: name: cobbler - subcomponent: - config: '/etc/cobbler-subcomponent-formula.conf' # Just here for testing added_in_defaults: defaults_value winner: defaults diff --git a/cobbler/subcomponent/clean.sls b/cobbler/subcomponent/clean.sls deleted file mode 100644 index 564769d2..00000000 --- a/cobbler/subcomponent/clean.sls +++ /dev/null @@ -1,5 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=sls - -include: - - .config.clean diff --git a/cobbler/subcomponent/config/clean.sls b/cobbler/subcomponent/config/clean.sls deleted file mode 100644 index 8485bd6f..00000000 --- a/cobbler/subcomponent/config/clean.sls +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=sls - -{#- Get the `tplroot` from `tpldir` #} -{%- set tplroot = tpldir.split('/')[0] %} -{%- set sls_service_clean = tplroot ~ '.service.clean' %} -{%- from tplroot ~ "/map.jinja" import mapdata as cobbler with context %} - -include: - - {{ sls_service_clean }} - -cobbler-subcomponent-config-clean-file-absent: - file.absent: - - name: {{ cobbler.subcomponent.config }} - - watch_in: - - sls: {{ sls_service_clean }} diff --git a/cobbler/subcomponent/config/file.sls b/cobbler/subcomponent/config/file.sls deleted file mode 100644 index 4e4ca367..00000000 --- a/cobbler/subcomponent/config/file.sls +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=sls - -{#- Get the `tplroot` from `tpldir` #} -{%- set tplroot = tpldir.split('/')[0] %} -{%- set sls_config_file = tplroot ~ '.config.file' %} -{%- from tplroot ~ "/map.jinja" import mapdata as cobbler with context %} -{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %} - -include: - - {{ sls_config_file }} - -cobbler-subcomponent-config-file-file-managed: - file.managed: - - name: {{ cobbler.subcomponent.config }} - - source: {{ files_switch(['subcomponent-example.tmpl'], - lookup='cobbler-subcomponent-config-file-file-managed', - use_subpath=True - ) - }} - - mode: 644 - - user: root - - group: {{ cobbler.rootgroup }} - - makedirs: True - - template: jinja - - require_in: - - sls: {{ sls_config_file }} diff --git a/cobbler/subcomponent/config/files/default/subcomponent-example.tmpl b/cobbler/subcomponent/config/files/default/subcomponent-example.tmpl deleted file mode 100644 index 522de004..00000000 --- a/cobbler/subcomponent/config/files/default/subcomponent-example.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -######################################################################## -# File managed by Salt at <{{ source }}>. -# Your changes will be overwritten. -######################################################################## - -This is a subcomponent example file from SaltStack template-formula. diff --git a/cobbler/subcomponent/config/files/default/subcomponent-example.tmpl.jinja b/cobbler/subcomponent/config/files/default/subcomponent-example.tmpl.jinja deleted file mode 100644 index cbfd51dc..00000000 --- a/cobbler/subcomponent/config/files/default/subcomponent-example.tmpl.jinja +++ /dev/null @@ -1,6 +0,0 @@ -######################################################################## -# File managed by Salt at <{{ source }}>. -# Your changes will be overwritten. -######################################################################## - -This is another subcomponent example file from SaltStack template-formula. diff --git a/cobbler/subcomponent/config/init.sls b/cobbler/subcomponent/config/init.sls deleted file mode 100644 index 465ddfea..00000000 --- a/cobbler/subcomponent/config/init.sls +++ /dev/null @@ -1,5 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=sls - -include: - - .file diff --git a/cobbler/subcomponent/init.sls b/cobbler/subcomponent/init.sls deleted file mode 100644 index 6003be17..00000000 --- a/cobbler/subcomponent/init.sls +++ /dev/null @@ -1,5 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=sls - -include: - - .config diff --git a/docs/README.rst b/docs/README.rst index 6e722fc2..d92ef3c1 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -129,28 +129,6 @@ dependency on ``cobbler.service.clean`` via include list. This state will remove the cobbler package and has a depency on ``cobbler.config.clean`` via include list. -``cobbler.subcomponent`` -^^^^^^^^^^^^^^^^^^^^^^^^ - -*Meta-state (This is a state that includes other states)*. - -This state installs a subcomponent configuration file before -configuring and starting the cobbler service. - -``cobbler.subcomponent.config`` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -This state will configure the cobbler subcomponent and has a -dependency on ``cobbler.config`` via include list. - -``cobbler.subcomponent.config.clean`` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -This state will remove the configuration of the cobbler subcomponent -and reload the cobbler service by a dependency on -``cobbler.service.running`` via include list and ``watch_in`` -requisite. - Testing ------- diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb index b307f401..0de5966d 100644 --- a/test/integration/default/controls/config.rb +++ b/test/integration/default/controls/config.rb @@ -26,9 +26,7 @@ should include( '"tofs": {"files_switch": ["any/path/can/be/used/here", "id", '\ '"roles", "osfinger", "os", "os_family"], "source_files": '\ - '{"cobbler-config-file-file-managed": ["example.tmpl.jinja"], '\ - '"cobbler-subcomponent-config-file-file-managed": '\ - '["subcomponent-example.tmpl.jinja"]}' + '{"cobbler-config-file-file-managed": ["example.tmpl.jinja"]}}' ) # rubocop:enable Layout/LineLength # rubocop:enable Lint/RedundantCopDisableDirective diff --git a/test/integration/default/controls/subcomponent_config.rb b/test/integration/default/controls/subcomponent_config.rb deleted file mode 100644 index c91f23b7..00000000 --- a/test/integration/default/controls/subcomponent_config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# frozen_string_literal: true - -control 'cobbler.subcomponent.config.file' do - title 'Verify the subcomponent configuration file' - - describe file('/etc/cobbler-subcomponent-formula.conf') do - it { should be_file } - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - its('mode') { should cmp '0644' } - its('content') do - should include( - '# File managed by Salt at '\ - '.' - ) - end - its('content') do - should include( - 'This is another subcomponent example file from SaltStack '\ - 'template-formula.' - ) - end - end -end diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml index 9d616cc0..dd316399 100644 --- a/test/integration/default/files/_mapdata/almalinux-8.yaml +++ b/test/integration/default/files/_mapdata/almalinux-8.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/amazonlinux-1.yaml b/test/integration/default/files/_mapdata/amazonlinux-1.yaml index 9074b9bd..52100762 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: crond - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml index 5a66f346..6a1d9b64 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml index 3303c910..d10c37d3 100644 --- a/test/integration/default/files/_mapdata/arch-base-latest.yaml +++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/centos-6.yaml b/test/integration/default/files/_mapdata/centos-6.yaml index 380eb869..0f3a46f6 100644 --- a/test/integration/default/files/_mapdata/centos-6.yaml +++ b/test/integration/default/files/_mapdata/centos-6.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: crond - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index 16778cbd..76a07bc0 100644 --- a/test/integration/default/files/_mapdata/centos-7.yaml +++ b/test/integration/default/files/_mapdata/centos-7.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index 2b3a426e..210d204f 100644 --- a/test/integration/default/files/_mapdata/centos-8.yaml +++ b/test/integration/default/files/_mapdata/centos-8.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index ccbba916..8cd5fa2e 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml index 0cd60327..a147b9a2 100644 --- a/test/integration/default/files/_mapdata/debian-11.yaml +++ b/test/integration/default/files/_mapdata/debian-11.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index dda87fb7..335da2e9 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml index 4452c906..7c6b56ba 100644 --- a/test/integration/default/files/_mapdata/fedora-31.yaml +++ b/test/integration/default/files/_mapdata/fedora-31.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml index 635caaee..87177985 100644 --- a/test/integration/default/files/_mapdata/fedora-32.yaml +++ b/test/integration/default/files/_mapdata/fedora-32.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml index a5c38539..3d625c8b 100644 --- a/test/integration/default/files/_mapdata/fedora-33.yaml +++ b/test/integration/default/files/_mapdata/fedora-33.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml index 8fc6e20b..70884a6d 100644 --- a/test/integration/default/files/_mapdata/fedora-34.yaml +++ b/test/integration/default/files/_mapdata/fedora-34.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/fedora-35.yaml b/test/integration/default/files/_mapdata/fedora-35.yaml index 84981add..b90bdfb7 100644 --- a/test/integration/default/files/_mapdata/fedora-35.yaml +++ b/test/integration/default/files/_mapdata/fedora-35.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/fedora-36.yaml b/test/integration/default/files/_mapdata/fedora-36.yaml index c783f0df..30b64823 100644 --- a/test/integration/default/files/_mapdata/fedora-36.yaml +++ b/test/integration/default/files/_mapdata/fedora-36.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml index 528ba141..2b33cbb0 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml index 489ad8af..bef12b90 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: mtab - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index 37af85a9..28de5a98 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index 5fd49177..d3e7fbb3 100644 --- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml index 0ffabbad..0f5a3e67 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml index 7ace47b8..475ccafe 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml index f1c6e09d..7be6b399 100644 --- a/test/integration/default/files/_mapdata/rockylinux-8.yaml +++ b/test/integration/default/files/_mapdata/rockylinux-8.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml index 806d823c..ff4c9a95 100644 --- a/test/integration/default/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 265a952d..4b284688 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index f50c55ef..a03c93d8 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/integration/default/files/_mapdata/ubuntu-22.yaml b/test/integration/default/files/_mapdata/ubuntu-22.yaml index 85e805bd..4f0e50df 100644 --- a/test/integration/default/files/_mapdata/ubuntu-22.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-22.yaml @@ -26,8 +26,6 @@ values: rootgroup: root service: name: systemd-journald - subcomponent: - config: /etc/cobbler-subcomponent-formula.conf tofs: files_switch: - any/path/can/be/used/here @@ -39,6 +37,4 @@ values: source_files: cobbler-config-file-file-managed: - example.tmpl.jinja - cobbler-subcomponent-config-file-file-managed: - - subcomponent-example.tmpl.jinja winner: pillar diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls index b697e18c..6748ec17 100644 --- a/test/salt/pillar/default.sls +++ b/test/salt/pillar/default.sls @@ -49,8 +49,6 @@ cobbler: source_files: cobbler-config-file-file-managed: - 'example.tmpl.jinja' - cobbler-subcomponent-config-file-file-managed: - - 'subcomponent-example.tmpl.jinja' # Just for testing purposes winner: pillar diff --git a/test/salt/pillar/upstart.sls b/test/salt/pillar/upstart.sls index 3c6b709a..3be19758 100644 --- a/test/salt/pillar/upstart.sls +++ b/test/salt/pillar/upstart.sls @@ -47,8 +47,6 @@ cobbler: source_files: cobbler-config-file-file-managed: - 'example.tmpl.jinja' - cobbler-subcomponent-config-file-file-managed: - - 'subcomponent-example.tmpl.jinja' # Just for testing purposes winner: pillar