Merge pull request #89 from yeoldegrove/require_cloud_provider

fix `cloud_provider` grain on SLES 15 SP4
SUSE · Jun 1, 2022 · 19c9b95 · 19c9b95
2 parents 3dc7a98 + 267e2c1
commit 19c9b95
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/_service b/_service
@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="exclude">.git</param>
     <param name="filename">habootstrap-formula</param>
-    <param name="versionformat">0.4.4+git.%ct.%h</param>
+    <param name="versionformat">0.4.5+git.%ct.%h</param>
     <param name="revision">%%VERSION%%</param>
   </service>
 

diff --git a/cluster/cloud_detection.sls b/cluster/cloud_detection.sls
@@ -12,3 +12,4 @@ set_cloud_data_in_grains:
   crm.cloud_grains_present:
     - require:
       - install_crmsh
+    - reload_grains: true
diff --git a/cluster/configure_resources.sls b/cluster/configure_resources.sls
@@ -39,6 +39,8 @@ configure-cluster-op-defaults:
     - group: root
     - mode: 644
     - template: jinja
+    - require:
+        - set_cloud_data_in_grains
 {% endif %}
 
 configure-the-cluster:

diff --git a/habootstrap-formula.changes b/habootstrap-formula.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed May 25 12:12:57 UTC 2022 - Eike Waldt <waldt@b1-systems.de>
+
+- Version bump 0.4.5
+  * reload grains after setting cloud_provider (fix SLES 15 SP4)
+  * require set_cloud_data_in_grains to create resources (fix SLES 15 SP4)
+
 -------------------------------------------------------------------
 Mon Sep 08 11:37:27 UTC 2021 - Eike Waldt <waldt@b1-systems.de>