Merge pull request #157 from saltstack-formulas/lookup-fix-3

(Re-)enable pillar users-formula:lookup
This commit is contained in:
Niels Abspoel 2017-07-16 20:11:09 +02:00 committed by GitHub
commit b3671fcdb3
3 changed files with 21 additions and 1 deletions

View File

@ -51,3 +51,19 @@ This depends on the vim-formula to be installed.
---------------
Permits the abitrary management of files. See pillar.example for configuration details.
Overriding default values
=========================
In order to separate actual user account definitions from configuration the pillar ``users-formula`` was introduced:
.. code-block:: yaml
users:
myuser:
# stuff
users-formula:
lookup:
root_group: toor
shell: '/bin/zsh'

View File

@ -1,3 +1,7 @@
users-formula:
lookup: # override the defauls in map.jinja
root_group: root
users:
## Minimal required pillar values
auser:

View File

@ -44,4 +44,4 @@
'sudo_package': 'sudo',
'googleauth_package': 'libpam-google-authenticator',
},
}, merge=salt['pillar.get']('users:lookup')) %}
}, merge=salt['pillar.get']('users-formula:lookup')) %}