From e102d8807aa8b847bb5f05a2b2b364de0eeb4143 Mon Sep 17 00:00:00 2001 From: mavimo Date: Wed, 3 Apr 2013 21:29:05 +0200 Subject: [PATCH 1/2] moved dependencies in the right place --- library/vagrant | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/vagrant b/library/vagrant index f9781dd2bfa..523cba46d10 100644 --- a/library/vagrant +++ b/library/vagrant @@ -19,7 +19,7 @@ DOCUMENTATION = ''' module: vagrant short_description: create a local instance via vagrant description: - - creates VM instances via vagrant and optionally waits for it to be 'running'. This module has a dependency on python-vagrant. + - creates VM instances via vagrant and optionally waits for it to be 'running'. version_added: "1.1" options: state: @@ -62,13 +62,13 @@ options: aliases: [] memory: description: - - memory in MB + - memory in MB required: False - + examples: - code: 'local_action: vagrant cmd=up box_name=lucid32 vm_name=webserver' - description: -requirements: [ "vagrant" ] + description: +requirements: [ "vagrant", "python-vagrant" ] author: Rob Parrott ''' From a8f966cd061de11d5ede3b6e3a04a085cee3302c Mon Sep 17 00:00:00 2001 From: mavimo Date: Wed, 3 Apr 2013 21:29:57 +0200 Subject: [PATCH 2/2] Moved choises in the right place --- library/vagrant | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/library/vagrant b/library/vagrant index 523cba46d10..a00be92b5f1 100644 --- a/library/vagrant +++ b/library/vagrant @@ -27,10 +27,11 @@ options: - Should the VMs be "present" or "absent." cmd: description: - - vagrant subcommand to execute. Can be "up," "status," "config," "ssh," "halt," "destroy" or "clear." + - vagrant subcommand to execute. required: false default: null - aliases: ['command'] + aliases: ['command'] + choices: [ "up", "status", "config", "ssh", "halt", "destroy", "clear" ] box_name: description: - vagrant boxed image to start