Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
salt-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
salt-formula
Commits
f39fff23
Commit
f39fff23
authored
10 years ago
by
Nitin Madhok
Browse files
Options
Downloads
Plain Diff
Merge pull request #90 from aboe76/master
Updated map.jinja for archlinux package convention
parents
de71de21
d071713f
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
pillar.example
+14
-0
14 additions, 0 deletions
pillar.example
salt/map.jinja
+7
-13
7 additions, 13 deletions
salt/map.jinja
with
21 additions
and
13 deletions
pillar.example
+
14
−
0
View file @
f39fff23
salt:
# to overwrite map.jinja salt packages
lookup:
salt-master: 'salt-master'
salt-minion: 'salt-minion'
salt-syndic: 'salt-syndic'
salt-cloud: 'salt-cloud'
salt-ssh: 'salt-ssh'
# salt master config
master:
fileserver_backend:
- git
...
...
@@ -9,6 +19,8 @@ salt:
file_roots:
base:
- /srv/salt
# salt minion config:
minion:
master: salt
fileserver_backend:
...
...
@@ -29,6 +41,8 @@ salt:
test.baz:
spam: sausage
cheese: bread
# salt cloud config
cloud:
master: salt
folders:
...
...
This diff is collapsed.
Click to expand it.
salt/map.jinja
+
7
−
13
View file @
f39fff23
{% set
map =
{
{% set
salt = salt['grains.filter_by'](
{
'Debian': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
...
...
@@ -33,11 +33,11 @@
'salt-minion': 'app-admin/salt',
'salt-syndic': 'app-admin/salt',
'salt-cloud': 'app-admin/salt'},
'Arch': {'salt-master': 'salt',
'salt-minion': 'salt',
'salt-syndic': 'salt',
'salt-cloud': 'salt',
'salt-ssh': 'salt'},
'Arch': {'salt-master': 'salt
-zmq
',
'salt-minion': 'salt
-zmq
',
'salt-syndic': 'salt
-zmq
',
'salt-cloud': 'salt
-zmq
',
'salt-ssh': 'salt
-zmq
'},
'openSUSE':{'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
...
...
@@ -51,10 +51,4 @@
'minion-service': 'salt_minion',
'master-service': 'salt_master',
'syndic-service': 'salt_syndic'},
} %}
{% if grains.get('saltversion', '').startswith('0.17') %}
{% set salt= salt['grains.filter_by'](map, merge=salt['pillar.get']('salt:lookup'), base='default') %}
{% else %}
{% set salt = map.get(grains.os_family) %}
{% endif %}
}, merge=salt['pillar.get']('salt:lookup')) %}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment