From 9057295065488cf293e8525bf9dd9f0465b36794 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Sat, 6 Dec 2014 19:04:19 -0500 Subject: [PATCH] changed to use ansible standard 'name' instead of 'package' --- lib/ansible/modules/extras/windows/win_chocolatey.ps1 | 6 +++--- lib/ansible/modules/extras/windows/win_chocolatey.py | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/ansible/modules/extras/windows/win_chocolatey.ps1 b/lib/ansible/modules/extras/windows/win_chocolatey.ps1 index 73da8bdcac..22e0d83e77 100644 --- a/lib/ansible/modules/extras/windows/win_chocolatey.ps1 +++ b/lib/ansible/modules/extras/windows/win_chocolatey.ps1 @@ -39,13 +39,13 @@ $params = Parse-Args $args; $result = New-Object PSObject; Set-Attr $result "changed" $false; -If ($params.package) +If ($params.name) { - $package = $params.package + $package = $params.name } Else { - Fail-Json $result "missing required argument: package" + Fail-Json $result "missing required argument: name" } if(($params.logPath).length -gt 0) diff --git a/lib/ansible/modules/extras/windows/win_chocolatey.py b/lib/ansible/modules/extras/windows/win_chocolatey.py index 80698abfe3..0be9d6c0c2 100644 --- a/lib/ansible/modules/extras/windows/win_chocolatey.py +++ b/lib/ansible/modules/extras/windows/win_chocolatey.py @@ -29,7 +29,7 @@ short_description: Installs packages using chocolatey description: - Installs packages using Chocolatey (http://chocolatey.org/). If Chocolatey is missing from the system, the module will install it. List of packages can be found at http://chocolatey.org/packages options: - package: + name: description: - Name of the package to be installed required: true @@ -97,22 +97,22 @@ author: Trond Hindenes, Peter Mounce EXAMPLES = ''' # Install git win_chocolatey: - package: git + name: git # Install notepadplusplus version 6.6 win_chocolatey: - package: notepadplusplus.install + name: notepadplusplus.install version: 6.6 # Uninstall git win_chocolatey: - package: git + name: git state: absent # Install Application Request Routing v3 from webpi # Logically, this requires that you install IIS first (see win_feature) # To find a list of packages available via webpi source, `choco list -source webpi` win_chocolatey: - package: ARRv3 + name: ARRv3 source: webpi '''