salt/volumes: Flatten directory structure

This will simplify the introduction of other states depending on
`.installed`, into which we move the systemd unit template and cleanup
script creation.

See: scality#2982

Author: gdemonet

buildchain/buildchain/salt_tree.py

@@ -670,11 +670,11 @@ def _get_parts(self) -> Iterator[str]:
     Path('salt/metalk8s/utils/httpd-tools/installed.sls'),
 
     Path('salt/metalk8s/volumes/init.sls'),
-    Path('salt/metalk8s/volumes/prepared/init.sls'),
-    Path('salt/metalk8s/volumes/prepared/installed.sls'),
-    Path('salt/metalk8s/volumes/prepared/files/metalk8s-sparse-volume@.service'),
-    Path('salt/metalk8s/volumes/prepared/files/sparse_volume_cleanup.py'),
-    Path('salt/metalk8s/volumes/unprepared/init.sls'),
+    Path('salt/metalk8s/volumes/installed.sls'),
+    Path('salt/metalk8s/volumes/prepared.sls'),
+    Path('salt/metalk8s/volumes/unprepared.sls'),
+    Path('salt/metalk8s/volumes/files/metalk8s-sparse-volume@.service'),
+    Path('salt/metalk8s/volumes/files/sparse_volume_cleanup.py'),
 
     Path('salt/_auth/kubernetes_rbac.py'),
 

salt/metalk8s/volumes/prepared/files/metalk8s-sparse-volume@.service salt/metalk8s/volumes/files/metalk8s-sparse-volume@.service

@@ -23,3 +23,24 @@ Ensure Python 3 is available:
   test.fail_without_changes:
     - comment: Could not find a working Python 3 installation
     - unless: /usr/bin/env python3 --version
+
+Create the sparse file directory:
+  file.directory:
+    - name: /var/lib/metalk8s/storage/sparse/
+    - makedirs: True
+
+Set up systemd template unit for sparse loop device provisioning:
+  file.managed:
+    - name: /etc/systemd/system/metalk8s-sparse-volume@.service
+    - source: salt://{{ slspath }}/files/metalk8s-sparse-volume@.service
+    - user: root
+    - group : root
+    - mode: 644
+
+Install clean-up script:
+  file.managed:
+    - name: /usr/local/libexec/metalk8s-sparse-volume-cleanup
+    - source: salt://{{ slspath }}/files/sparse_volume_cleanup.py
+    - user: root
+    - group : root
+    - mode: 755

salt/metalk8s/volumes/prepared/files/sparse_volume_cleanup.py salt/metalk8s/volumes/files/sparse_volume_cleanup.py

@@ -22,26 +22,6 @@ Volume {{ target_volume_name }} not found in pillar:
     {%- do volumes_to_create.extend(all_volumes.values()|list) %}
 {%- endif %}
 
-Create the sparse file directory:
-  file.directory:
-    - name: /var/lib/metalk8s/storage/sparse/
-    - makedirs: True
-
-Set up systemd template unit for sparse loop device provisioning:
-  file.managed:
-    - name: /etc/systemd/system/metalk8s-sparse-volume@.service
-    - source: salt://{{ slspath }}/files/metalk8s-sparse-volume@.service
-    - user: root
-    - group : root
-    - mode: 644
-
-Install clean-up script:
-  file.managed:
-    - name: /usr/local/libexec/metalk8s-sparse-volume-cleanup
-    - source: salt://{{ slspath }}/files/sparse_volume_cleanup.py
-    - user: root
-    - group : root
-    - mode: 755
 
 {%- for volume in volumes_to_create %}
   {%- set volume_name = volume.metadata.name %}

salt/metalk8s/volumes/prepared/installed.sls salt/metalk8s/volumes/installed.sls

@@ -112,7 +112,7 @@ commands =
             packages/debian/download_packages.py \
         ); \
         untyped_files=( \
-            salt/metalk8s/volumes/prepared/files/sparse_volume_cleanup.py \
+            salt/metalk8s/volumes/files/sparse_volume_cleanup.py \
         ); \
         pylint $\{untyped_files[@]\} $\{typed_files[@]\}; PYLINT_RC=$?; \
         mypy --strict $\{typed_files[@]\}; MYPY_RC=$?; \