kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-10-07 17:40:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make "stable" the salt install_source default.

Browse source 
Fix a few indentation things
This commit is contained in:
Anders Ingemann 2014-05-16 18:30:01 +02:00
parent 81659321af
commit b03ec12c41
2 changed files with 15 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
bootstrapvz/plugins/salt/manifest-schema.json
View file

@ -9,30 +9,20 @@
"salt": {
"type": "object",
"properties": {
"master": {
"type": "string"
},
"install_source": {
"type": "string"
},
"version": {
"type": "string"
},
"grains": {
"type": "object",
"patternProperties": {
"^[^\/\\0]+$": {
"type": "string"
}
},
"minItems": 1
}
"master": { "type": "string" },
"install_source": { "enum": ["stable", "daily", "git"] },
"version": { "type": "string" },
"grains": {
"type": "object",
"patternProperties": {
"^[^\/\\0]+$": { "type": "string" }
},
"minItems": 1
}
},
"required": ["install_source"]
}
},
"required": ["salt"]
}
}
},
"required": ["plugins"]
}
}

9
bootstrapvz/plugins/salt/tasks.py
View file

@ -34,17 +34,14 @@ class BootstrapSaltMinion(Task):
# This is needed since bootstrap doesn't handle -X for debian distros properly.
# We disable checking for running services at end since we do not start them.
sed_i(
bootstrap_script, 'install_debian_check_services',
"disabled_debian_check_services")
sed_i(bootstrap_script, 'install_debian_check_services', 'disabled_debian_check_services')
bootstrap_command = [
'chroot', info.root, 'bash', 'install_salt.sh', '-X']
bootstrap_command = ['chroot', info.root, 'bash', 'install_salt.sh', '-X']
if 'master' in info.manifest.plugins['salt']:
bootstrap_command.extend(['-A', info.manifest.plugins['salt']['master']])
install_source = info.manifest.plugins['salt']['install_source']
install_source = info.manifest.plugins['salt'].get('install_source', 'stable')
bootstrap_command.append(install_source)
if install_source == 'git' and ('version' in info.manifest.plugins['salt']):