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

Load gitfs config values as strings

Browse Source
This commit is contained in:
Erik Johnson 2014-10-27 14:14:47 -06:00
parent 947262d31e
commit d20a803c8d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/fileserver/gitfs.py
View File

@ -52,6 +52,7 @@ import re
import shutil
import subprocess
from datetime import datetime
from salt._compat import text_type as _text_type
VALID_PROVIDERS = ('gitpython', 'pygit2', 'dulwich')
PER_REMOTE_PARAMS = ('base', 'mountpoint', 'root')
@ -614,14 +615,18 @@ def init():
per_remote_defaults = {}
for param in override_params:
per_remote_defaults[param] = __opts__['gitfs_{0}'.format(param)]
per_remote_defaults[param] = \
_text_type(__opts__['gitfs_{0}'.format(param)])
for remote in __opts__['gitfs_remotes']:
repo_conf = copy.deepcopy(per_remote_defaults)
bad_per_remote_conf = False
if isinstance(remote, dict):
repo_url = next(iter(remote))
per_remote_conf = salt.utils.repack_dictlist(remote[repo_url])
per_remote_conf = dict(
[(key, _text_type(val)) for key, val in
salt.utils.repack_dictlist(remote[repo_url]).items()]
)
if not per_remote_conf:
log.error(
'Invalid per-remote configuration for remote {0}. If no '
@ -1253,10 +1258,9 @@ def serve_file(load, fnd):
required_load_keys = set(['path', 'loc', 'saltenv'])
if not all(x in load for x in required_load_keys):
log.debug(
'Not all of the required key in load are present. Missing: {0}'.format(
', '.join(
required_load_keys.difference(load.keys())
)
'Not all of the required keys present in payload. '
'Missing: {0}'.format(
', '.join(required_load_keys.difference(load.keys()))
)
)
return ret