Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-02 21:13:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add env var for local saltfs root during bootstrap

Browse source
This commit is contained in:
Aneesh Agrawal 2017-04-12 02:00:14 -04:00
parent 7262270990
commit 0a9a43aa31
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
python/servo/bootstrap.py
View file

@ -78,18 +78,28 @@ def salt(context, force=False):
# Hence, dynamically generate the config with an appropriate `root_dir` # Hence, dynamically generate the config with an appropriate `root_dir`
# and serialize it as JSON (which is valid YAML). # and serialize it as JSON (which is valid YAML).
config = { config = {
'fileserver_backend': ['git'],
'gitfs_env_whitelist': 'base',
'gitfs_provider': 'gitpython',
'gitfs_remotes': [
'https://github.com/servo/saltfs.git',
],
'hash_type': 'sha384', 'hash_type': 'sha384',
'master': 'localhost', 'master': 'localhost',
'root_dir': salt_root, 'root_dir': salt_root,
'state_output': 'changes', 'state_output': 'changes',
'state_tabular': True, 'state_tabular': True,
} }
if 'SERVO_SALTFS_ROOT' in os.environ:
config.update({
'fileserver_backend': ['roots'],
'file_roots': {
'base': [os.path.abspath(os.environ['SERVO_SALTFS_ROOT'])],
},
})
else:
config.update({
'fileserver_backend': ['git'],
'gitfs_env_whitelist': 'base',
'gitfs_provider': 'gitpython',
'gitfs_remotes': [
'https://github.com/servo/saltfs.git',
],
})
if not os.path.exists(config_dir): if not os.path.exists(config_dir):
os.makedirs(config_dir, mode=0o700) os.makedirs(config_dir, mode=0o700)