Merge pull request #5 from cobbler/remove-subcomponent

fix: remove unused subcomponent
cobbler · Nov 17, 2023 · 30084fc · 30084fc
2 parents 99efd25 + 7e18551
commit 30084fc
Show file tree

Hide file tree

Showing 42 changed files with 1 addition and 236 deletions.
diff --git 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
@@ -5,4 +5,3 @@ include:
   - .package
   - .config
   - .service
-  - .subcomponent
diff --git 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
diff --git a/cobbler/subcomponent/config/clean.sls b/cobbler/subcomponent/config/clean.sls
diff --git a/cobbler/subcomponent/config/file.sls b/cobbler/subcomponent/config/file.sls
diff --git a/cobbler/subcomponent/config/files/default/subcomponent-example.tmpl b/cobbler/subcomponent/config/files/default/subcomponent-example.tmpl
diff --git a/cobbler/subcomponent/config/files/default/subcomponent-example.tmpl.jinja b/cobbler/subcomponent/config/files/default/subcomponent-example.tmpl.jinja
diff --git a/cobbler/subcomponent/config/init.sls b/cobbler/subcomponent/config/init.sls
diff --git a/cobbler/subcomponent/init.sls b/cobbler/subcomponent/init.sls
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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