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

Merge pull request #36606 from danlsgiga/consul_pillar_token

Browse Source 
Add support for ACL Tokens in consul_pillar with the option consul.token
This commit is contained in:
Mike Place 2016-09-28 11:46:03 +09:00 committed by GitHub
commit 133705d567
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/pillar/consul_pillar.py
View File

@ -12,6 +12,9 @@ configuration file:
my_consul_config:
consul.host: 127.0.0.1
consul.port: 8500
consul.token: my_consul_acl_token
The ``consul.token`` is optional and requires python-consul >= 0.4.7.
After the profile is created, configure the external pillar system to use it.
Optionally, a root may be specified.
@ -64,6 +67,7 @@ from salt.utils.dictupdate import update as dict_merge
try:
import consul
HAS_CONSUL = True
CONSUL_VERSION = consul.__version__
except ImportError:
HAS_CONSUL = False
@ -186,9 +190,14 @@ def get_conn(opts, profile):
consul_host = conf.get('consul.host', '127.0.0.1')
consul_port = conf.get('consul.port', 8500)
consul_token = conf.get('consul.token', None)
if HAS_CONSUL:
return consul.Consul(host=consul_host, port=consul_port)
# Sanity check. ACL Tokens are supported on python-consul 0.4.7 onwards only.
if CONSUL_VERSION >= '0.4.7':
return consul.Consul(host=consul_host, port=consul_port, token=consul_token)
else:
return consul.Consul(host=consul_host, port=consul_port)
else:
raise CommandExecutionError(
'(unable to import consul, '