fix build and doc cleanups (#2286)

This commit is contained in:
René Moser 2016-05-24 13:24:04 +02:00
parent e35d5f2c54
commit a055d7240a
2 changed files with 14 additions and 16 deletions

View file

@ -24,6 +24,7 @@ env:
cloud/amazon/ec2_snapshot_facts.py cloud/amazon/ec2_snapshot_facts.py
cloud/amazon/ec2_vol_facts.py cloud/amazon/ec2_vol_facts.py
cloud/amazon/ec2_vpc_igw.py cloud/amazon/ec2_vpc_igw.py
cloud/amazon/ec2_vpc_nacl.py
cloud/amazon/ec2_vpc_net_facts.py cloud/amazon/ec2_vpc_net_facts.py
cloud/amazon/ec2_vpc_route_table_facts.py cloud/amazon/ec2_vpc_route_table_facts.py
cloud/amazon/ec2_vpc_route_table.py cloud/amazon/ec2_vpc_route_table.py
@ -109,6 +110,7 @@ env:
notification/mqtt.py notification/mqtt.py
notification/sns.py notification/sns.py
notification/typetalk.py notification/typetalk.py
packaging/language/maven_artifact.py
packaging/os/layman.py packaging/os/layman.py
packaging/os/yum_repository.py packaging/os/yum_repository.py
source_control/gitlab_group.py source_control/gitlab_group.py

View file

@ -28,31 +28,28 @@ version_added: "1.7"
author: Trond Hindenes author: Trond Hindenes
short_description: Installs/Uninstalls a installable package, either from local file system or url short_description: Installs/Uninstalls a installable package, either from local file system or url
description: description:
- Installs or uninstalls a package. Optionally uses a product_id to check if the package needs installing. You can find product ids for installed programs in the windows registry either in ``HKLM:Software\Microsoft\Windows\CurrentVersion\Uninstall`` or for 32 bit programs ``HKLM:Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall`` - Installs or uninstalls a package.
- 'Optionally uses a product_id to check if the package needs installing. You can find product ids for installed programs in the windows registry either in C(HKLM:Software\\Microsoft\\Windows\CurrentVersion\\Uninstall) or for 32 bit programs C(HKLM:Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall)'
options: options:
path: path:
description: description:
- Location of the package to be installed (either on file system, network share or url) - Location of the package to be installed (either on file system, network share or url)
required: true required: true
default: null
aliases: []
name: name:
description: description:
- name of the package. Just for logging reasons, will use the value of path if name isn't specified - name of the package. Just for logging reasons, will use the value of path if name isn't specified
required: false required: false
default: null default: null
aliases: []
product_id: product_id:
description: description:
- product id of the installed package (used for checking if already installed) - product id of the installed package (used for checking if already installed)
required: true required: true
default: null
aliases: [productid] aliases: [productid]
arguments: arguments:
description: description:
- Any arguments the installer needs - Any arguments the installer needs
default: null default: null
aliases: [] required: false
state: state:
description: description:
- Install or Uninstall - Install or Uninstall
@ -60,28 +57,27 @@ options:
- present - present
- absent - absent
default: present default: present
required: false
aliases: [ensure] aliases: [ensure]
user_name: user_name:
description: description:
- Username of an account with access to the package if its located on a file share. Only needed if the winrm user doesn't have access to the package. Also specify user_password for this to function properly. - Username of an account with access to the package if its located on a file share. Only needed if the winrm user doesn't have access to the package. Also specify user_password for this to function properly.
default: null default: null
aliases: [] required: false
user_password: user_password:
description: description:
- Password of an account with access to the package if its located on a file share. Only needed if the winrm user doesn't have access to the package. Also specify user_name for this to function properly. - Password of an account with access to the package if its located on a file share. Only needed if the winrm user doesn't have access to the package. Also specify user_name for this to function properly.
default: null default: null
aliases: [] required: false
''' '''
EXAMPLES = ''' EXAMPLES = '''
# Playbook example # Playbook example
- name: Install the vc thingy - name: Install the vc thingy
win_package: win_package:
name="Microsoft Visual C thingy" name="Microsoft Visual C thingy"
path="http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe" path="http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe"
Product_Id="{CF2BEA3C-26EA-32F8-AA9B-331F7E34BA97}" Product_Id="{CF2BEA3C-26EA-32F8-AA9B-331F7E34BA97}"
Arguments="/install /passive /norestart" Arguments="/install /passive /norestart"
''' '''