Merge branch 'w/2.5/bugfix/fix-salt-lags' into tmp/octopus/w/2.6/bugf…

…ix/fix-salt-lags
scality · Apr 16, 2020 · 037cc80 · 037cc80
2 parents ded86a5 + ff77c79
commit 037cc80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/eve/main.yml b/eve/main.yml
@@ -1515,7 +1515,7 @@ stages:
           workdir: build/eve/workers/openstack-multiple-nodes/terraform/
           env:
             <<: *_env_terraform
-            TF_VAR_nodes_count: "2"
+            TF_VAR_nodes_count: "1"
       - ShellCommand:
           name: Check SSH config for bootstrap node
           command: |-

diff --git a/salt/metalk8s/salt/master/files/master-99-metalk8s.conf.j2 b/salt/metalk8s/salt/master/files/master-99-metalk8s.conf.j2
@@ -4,6 +4,9 @@ peer:
   .*:
     - x509.sign_remote_certificate
 
+# Enable grains caching on salt-master
+grains_cache: True
+
 # We use information from the `metalk8s_node` ext_pillar to match in
 # `pillar/top.sls`, hence we need to load them first.
 ext_pillar_first: true