Skip to content

Commit

Permalink
Merge branch 'bugfix/fix-salt-lags' into q/2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bert-e committed Apr 16, 2020
2 parents d454477 + 0d8b76d commit d0e24a6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion eve/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ stages:
OS_PASSWORD: "%(secret:scality_cloud_password)s"
OS_TENANT_NAME: "%(secret:scality_cloud_tenant_name)s"
TF_VAR_worker_uuid: "%(prop:worker_uuid)s"
TF_VAR_nodes_count: "2"
TF_VAR_nodes_count: "1"
haltOnFailure: true
- ShellCommand:
name: Check SSH config for bootstrap node
Expand Down
3 changes: 3 additions & 0 deletions salt/metalk8s/salt/master/files/master-99-metalk8s.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d0e24a6

Please sign in to comment.