summaryrefslogtreecommitdiffstats
path: root/pillar/role
diff options
context:
space:
mode:
Diffstat (limited to 'pillar/role')
-rw-r--r--pillar/role/salt/master.sls5
1 files changed, 4 insertions, 1 deletions
diff --git a/pillar/role/salt/master.sls b/pillar/role/salt/master.sls
index 36df21e..1608a3e 100644
--- a/pillar/role/salt/master.sls
+++ b/pillar/role/salt/master.sls
@@ -2,9 +2,12 @@ salt:
gpg_keydir: ${'secret_salt:master:gpg_keydir'}
interface: ${'secret_salt:master:interface'}
master_remove_config: True
+ extmods: {'modules': ['nbroles.py'], 'pillar': ['lookup.py']}
master:
cache: redis
cli_summary: True
+ # to-do: package extension modules
+ extension_modules: /opt/extmods
ipv6: True
file_ignore_glob:
- '*.pyc'
@@ -38,7 +41,7 @@ salt:
- root: ${'secret_salt:master:ext_pillar:git:Lysergic:root'}
- user: ${'secret_salt:master:ext_pillar:git:Lysergic:user'}
- password: ${'secret_salt:master:ext_pillar:git:Lysergic:password'}
- - lookup:
+ - lookup: {}
ext_pillar_first: True
pillar_merge_lists: True
pillar_source_merging_strategy: smart