Merge branch 'bugfix/2729-fix-volume-formula' into tmp/octopus/w/2.6/…

…bugfix/2729-fix-volume-formula
scality · Aug 11, 2020 · 1e91ac1 · 1e91ac1
2 parents a7199ba + 49d880c
commit 1e91ac1
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/salt/metalk8s/volumes/prepared/init.sls b/salt/metalk8s/volumes/prepared/init.sls
@@ -48,12 +48,21 @@ Provision backing storage for {{ volume }}:
     - name: {{ volume }}
     - require:
       - metalk8s_volumes: Prepare backing storage for {{ volume }}
+    - require_in:
+      - module: Update pillar after volume provisioning
 
-Update pillar after volume provisionning:
+{%- endfor %}
+
+{%- if volumes_to_create %}
+
+Update pillar after volume provisioning:
   module.run:
     - saltutil.refresh_pillar:
       - wait: True
-    - require:
-      - metalk8s_volumes: Provision backing storage for {{ volume }}
 
-{%- endfor %}
+{%- else %}
+
+No volume to create:
+  test.succeed_without_changes: []
+
+{%- endif %}