Changelog updates and a few module renames. vpc -> ec2_vpc, githooks -> github_hooks, blacklist -> kernel_blacklist. These are all new in 1.4 so safe to change.

reviewable/pr18780/r1
Michael DeHaan 11 years ago
parent 59dd929bbf
commit 55a48aacc3

@ -109,14 +109,14 @@ EXAMPLES = '''
# Basic creation example: # Basic creation example:
local_action: local_action:
module: vpc module: ec2_vpc
state: present state: present
cidr_block: 172.23.0.0/16 cidr_block: 172.23.0.0/16
region: us-west-2 region: us-west-2
# Full creation example with subnets and optional availability zones. # Full creation example with subnets and optional availability zones.
# The absence or presense of subnets deletes or creates them respectively. # The absence or presense of subnets deletes or creates them respectively.
local_action: local_action:
module: vpc module: ec2_vpc
state: present state: present
cidr_block: 172.22.0.0/16 cidr_block: 172.22.0.0/16
subnets: subnets:
@ -144,7 +144,7 @@ EXAMPLES = '''
# Removal of a VPC by id # Removal of a VPC by id
local_action: local_action:
module: vpc module: ec2_vpc
state: absent state: absent
vpc_id: vpc-aaaaaaa vpc_id: vpc-aaaaaaa
region: us-west-2 region: us-west-2

@ -24,7 +24,7 @@ import base64
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
module: githooks module: github_hooks
short_description: Manages github service hooks. short_description: Manages github service hooks.
description: description:
- Adds service hooks and removes service hooks that have an error status. - Adds service hooks and removes service hooks that have an error status.
@ -56,10 +56,10 @@ author: Phillip Gentry, CX Inc
EXAMPLES = ''' EXAMPLES = '''
# Example creating a new service hook. It ignores duplicates. # Example creating a new service hook. It ignores duplicates.
- githooks: action=create hookurl=http://11.111.111.111:2222 user={{ gituser }} oauthkey={{ oauthkey }} repo=https://api.github.com/repos/pcgentry/Github-Auto-Deploy - github_hooks: action=create hookurl=http://11.111.111.111:2222 user={{ gituser }} oauthkey={{ oauthkey }} repo=https://api.github.com/repos/pcgentry/Github-Auto-Deploy
# Cleaning all hooks for this repo that had an error on the last update. Since this works for all hooks in a repo it is probably best that this would be called from a handler. # Cleaning all hooks for this repo that had an error on the last update. Since this works for all hooks in a repo it is probably best that this would be called from a handler.
- local_action: githooks action=cleanall user={{ gituser }} oauthkey={{ oauthkey }} repo={{ repo }} - local_action: github_hooks action=cleanall user={{ gituser }} oauthkey={{ oauthkey }} repo={{ repo }}
''' '''
def list(hookurl, oauthkey, repo, user): def list(hookurl, oauthkey, repo, user):

@ -24,7 +24,7 @@ import re
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
module: blacklist module: kernel_blacklist
author: Matthias Vogelgesang author: Matthias Vogelgesang
version_added: 1.4 version_added: 1.4
short_description: Blacklist kernel modules short_description: Blacklist kernel modules
@ -52,7 +52,7 @@ requirements: []
EXAMPLES = ''' EXAMPLES = '''
# Blacklist the nouveau driver module # Blacklist the nouveau driver module
- blacklist: name=nouveau state=present - kernel_blacklist: name=nouveau state=present
''' '''
Loading…
Cancel
Save