valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

expose environment specific information stored in consul (#34027)

Browse Source 
added support so that the environment grain may be used in the root
path to expose environment-specific information stored in consul.
This commit is contained in:
Jacob Weinstock 2016-06-15 10:41:24 -06:00 committed by Nicole Thomas
parent 9a856bde82
commit 70514d2c16
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/pillar/consul_pillar.py
View File

@ -80,7 +80,7 @@ Using these configuration profiles, multiple consul sources may also be used:
- consul: my_consul_config - consul: my_consul_config
- consul: my_other_consul_config - consul: my_other_consul_config
Either the ``minion_id``, or the ``role`` grain may be used in the ``root`` Either the ``minion_id``, or the ``role``, or the ``environment`` grain may be used in the ``root``
path to expose minion-specific information stored in consul. path to expose minion-specific information stored in consul.
.. code-block:: yaml .. code-block:: yaml
@ -88,6 +88,7 @@ path to expose minion-specific information stored in consul.
ext_pillar: ext_pillar:
- consul: my_consul_config root=/salt/%(minion_id)s - consul: my_consul_config root=/salt/%(minion_id)s
- consul: my_consul_config root=/salt/%(role)s - consul: my_consul_config root=/salt/%(role)s
- consul: my_consul_config root=/salt/%(environment)s
Minion-specific values may override shared values when the minion-specific root Minion-specific values may override shared values when the minion-specific root
appears after the shared root: appears after the shared root:
@ -98,12 +99,13 @@ appears after the shared root:
- consul: my_consul_config root=/salt-shared - consul: my_consul_config root=/salt-shared
- consul: my_other_consul_config root=/salt-private/%(minion_id)s - consul: my_other_consul_config root=/salt-private/%(minion_id)s
If using the ``role`` grain in the consul key path, be sure to define it using If using the ``role`` or ``environment`` grain in the consul key path, be sure to define it using
`/etc/salt/grains`, or similar: `/etc/salt/grains`, or similar:
.. code-block:: yaml .. code-block:: yaml
role: my-minion-role role: my-minion-role
environment: dev
''' '''
from __future__ import absolute_import from __future__ import absolute_import
@ -156,10 +158,12 @@ def ext_pillar(minion_id,
path = comps[1].replace('root=', '') path = comps[1].replace('root=', '')
role = __salt__['grains.get']('role') role = __salt__['grains.get']('role')
environment = __salt__['grains.get']('environment')
# put the minion's ID in the path if necessary # put the minion's ID in the path if necessary
path %= { path %= {
'minion_id': minion_id, 'minion_id': minion_id,
'role': role 'role': role,
'environment': environment
} }
try: try: