Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F3763651
D3401.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
652 B
Referenced Files
None
Subscribers
None
D3401.diff
View Options
diff --git a/roles/core/salt/init.sls b/roles/core/salt/init.sls
--- a/roles/core/salt/init.sls
+++ b/roles/core/salt/init.sls
@@ -48,11 +48,15 @@
# -------------------------------------------------------------
# Vault
+#
+# For shellserver, set in roles/shellserver/vault unit instead.
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+{% if not salt["node.has_role"]("shellserver") %}
{{ dirs.etc }}/salt/minion.d/vault.conf:
file.managed:
- source: salt://roles/core/salt/files/vault.conf
- template: jinja
- context:
certificate: {{ certificates.dir }}/nasqueron-vault-ca.crt
+{% endif %}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Nov 23, 01:21 (18 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2256793
Default Alt Text
D3401.diff (652 B)
Attached To
Mode
D3401: Resolve conflict for Salt Vault configuration
Attached
Detach File
Event Timeline
Log In to Comment