kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 07:26:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add enable_agent option to puppet plugin

Browse source
This commit is contained in:
Anders Ingemann 2014-05-03 21:50:00 +02:00
parent 00780844c7
commit 03a9667c64
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -2,6 +2,7 @@
Anders Ingemann:
* Require hostname setting for vagrant plugin
* Fixes #14: S3 images can now be bootstrapped outside EC2.
* Added enable_agent option to puppet plugin
2014-05-02:
Tomasz Rybak:
* Added Google Compute Engine Provider

2
bootstrapvz/plugins/puppet/__init__.py
View file

@ -15,3 +15,5 @@ def resolve_tasks(taskset, manifest):
if 'manifest' in manifest.plugins['puppet']:
taskset.add(tasks.CheckManifestPath)
taskset.add(tasks.ApplyPuppetManifest)
if manifest.plugins['puppet'].get('enable_agent', False):
taskset.add(tasks.EnableAgent)

3
bootstrapvz/plugins/puppet/manifest-schema.json
View file

@ -10,7 +10,8 @@
"type": "object",
"properties": {
"manifest": { "$ref": "#/definitions/absolute_path" },
"assets": { "$ref": "#/definitions/absolute_path" }
"assets": { "$ref": "#/definitions/absolute_path" },
"enable_agent": { "type": "boolean" }
},
"minProperties": 1,
"additionalProperties": false