salt: use metalk8s storageclass

We now use a single metalk8s storageclass instead of one per addon (e.g. metalk8s-loki). Refs: #2742
scality · Sep 3, 2020 · f7f9c17 · f7f9c17
1 parent c7a5218
commit f7f9c17
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/buildchain/buildchain/salt_tree.py b/buildchain/buildchain/salt_tree.py
@@ -338,7 +338,6 @@ def _get_parts(self) -> Iterator[str]:
     Path('salt/metalk8s/addons/logging/loki/deployed/',
          'service-configuration.sls'),
     Path('salt/metalk8s/addons/logging/loki/deployed/services.sls'),
-    Path('salt/metalk8s/addons/logging/loki/deployed/storageclass.sls'),
 
     Path('salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls'),
     Path('salt/metalk8s/addons/prometheus-adapter/deployed/init.sls'),

diff --git a/salt/metalk8s/addons/logging/loki/deployed/init.sls b/salt/metalk8s/addons/logging/loki/deployed/init.sls
@@ -1,8 +1,8 @@
 include:
+  - ....storageclass.deployed
   - .service-configuration
   - .loki-configuration-secret
   - .chart
   - .services
-  - .storageclass
   - .datasource
   - .dashboard
diff --git a/salt/metalk8s/addons/logging/loki/deployed/storageclass.sls b/salt/metalk8s/addons/logging/loki/deployed/storageclass.sls