Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
EOLE
Zéphir
Services
SaltMaster manager
Commits
58e8d54e
Commit
58e8d54e
authored
May 09, 2019
by
Lionel Morin
Browse files
Merge branch 'fix-382' into 'develop'
Adding pillar cache activation to minion configuration See merge request
!7
parents
c32151c5
95bf5b04
Pipeline
#490
passed with stage
in 0 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/python/zephir/saltmaster/peering.py
View file @
58e8d54e
...
...
@@ -97,5 +97,5 @@ class SaltPeering():
err_msg
=
'Error while generating minion configuration'
raise
SaltPeeringError
(
err_msg
)
minion_conf
=
"master: {}
\n
master_port: {}
\n
hash_type: {}
\n
master_finger: {}
\n
pillar_raise_on_missing: True"
minion_conf
=
"master: {}
\n
master_port: {}
\n
hash_type: {}
\n
master_finger: {}
\n
pillar_raise_on_missing:
True
\n
minion_pillar_cache:
True"
return
minion_conf
.
format
(
os
.
environ
[
'SALTMASTER_PUBLIC_HOST'
],
30010
,
'sha256'
,
master_fingerprint
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment