Merge pull request #1523 from gregdek/devel

Updating cloud modules with proper github author information
11 years ago · 5ef1dc746d
parent 05a2ef106f 28a869a030
commit 5ef1dc746d
74 changed files with 104 additions and 55 deletions
--- a/cloud/amazon/cloudformation.py
+++ b/cloud/amazon/cloudformation.py
@ -94,7 +94,7 @@ options:
    required: false
    version_added: "2.0"

-author: James S. Martin
+author: "James S. Martin (@jsmartin)"
 extends_documentation_fragment: aws
 '''

--- a/cloud/amazon/ec2.py
+++ b/cloud/amazon/ec2.py
@ -226,7 +226,10 @@ options:
    default: null
    aliases: []

-author: Seth Vidal, Tim Gerla, Lester Wade
+author: 
+    - "Tim Gerla (@tgerla)"
+    - "Lester Wade (@lwade)"
+    - "Seth Vidal"
 extends_documentation_fragment: aws
 '''

--- a/cloud/amazon/ec2_ami.py
+++ b/cloud/amazon/ec2_ami.py
@ -87,7 +87,7 @@ options:
    default: null
    version_added: "2.0"

-author: Evan Duffield <eduffield@iacquire.com>
+author: "Evan Duffield (@scicoin-project) <eduffield@iacquire.com>"
 extends_documentation_fragment: aws
 '''

--- a/cloud/amazon/ec2_ami_find.py
+++ b/cloud/amazon/ec2_ami_find.py
@ -25,7 +25,7 @@ description:
  - Can search AMIs with different owners
  - Can search by matching tag(s), by AMI name and/or other criteria
  - Results can be sorted and sliced
-author: Tom Bamford
+author: "Tom Bamford (@tombamford)"
 notes:
  - This module is not backwards compatible with the previous version of the ec2_search_ami module which worked only for Ubuntu AMIs listed on cloud-images.ubuntu.com.
  - See the example below for a suggestion of how to search by distro/release.
--- a/cloud/amazon/ec2_asg.py
+++ b/cloud/amazon/ec2_asg.py
@ -21,7 +21,7 @@ description:
  - Can create or delete AWS Autoscaling Groups
  - Works with the ec2_lc module to manage Launch Configurations
 version_added: "1.6"
-author: Gareth Rushgrove
+author: "Gareth Rushgrove (@garethr)"
 options:
  state:
    description:
--- a/cloud/amazon/ec2_eip.py
+++ b/cloud/amazon/ec2_eip.py
@ -44,7 +44,7 @@ options:
    version_added: "1.6"

 extends_documentation_fragment: aws
-author: Lorin Hochstein <lorin@nimbisservices.com>
+author: "Lorin Hochstein (@lorin) <lorin@nimbisservices.com>"
 notes:
   - This module will return C(public_ip) on success, which will contain the
     public IP address associated with the instance.
--- a/cloud/amazon/ec2_elb.py
+++ b/cloud/amazon/ec2_elb.py
@ -25,7 +25,7 @@ description:
    if state=absent is passed as an argument.
  - Will be marked changed when called only if there are ELBs found to operate on.
 version_added: "1.2"
-author: John Jarvis
+author: "John Jarvis (@jarv)"
 options:
  state:
    description:
--- a/cloud/amazon/ec2_elb_lb.py
+++ b/cloud/amazon/ec2_elb_lb.py
@ -22,7 +22,7 @@ description:
  - Will be marked changed when called only if state is changed.
 short_description: Creates or destroys Amazon ELB.
 version_added: "1.5"
-author: Jim Dalton
+author: "Jim Dalton (@jsdalton)"
 options:
  state:
    description:
--- a/cloud/amazon/ec2_facts.py
+++ b/cloud/amazon/ec2_facts.py
@ -36,7 +36,7 @@ description:
       The module must be called from within the EC2 instance itself.
 notes:
    - Parameters to filter on ec2_facts may be added later.
-author: "Silviu Dicu <silviudicu@gmail.com>"
+author: "Silviu Dicu (@silviud) <silviudicu@gmail.com>"
 '''

 EXAMPLES = '''
--- a/cloud/amazon/ec2_group.py
+++ b/cloud/amazon/ec2_group.py
@ -5,6 +5,7 @@
 DOCUMENTATION = '''
 ---
 module: ec2_group
+author: "Andrew de Quincey (@adq)"
 version_added: "1.3"
 short_description: maintain an ec2 VPC security group.
 description:
--- a/cloud/amazon/ec2_key.py
+++ b/cloud/amazon/ec2_key.py
@ -46,7 +46,7 @@ options:
    version_added: "1.6"

 extends_documentation_fragment: aws
-author: Vincent Viallet
+author: "Vincent Viallet (@zbal)"
 '''

 EXAMPLES = '''
--- a/cloud/amazon/ec2_lc.py
+++ b/cloud/amazon/ec2_lc.py
@ -26,7 +26,7 @@ notes:
    after it is changed will not modify the launch configuration on AWS. You must create a new config and assign
    it to the ASG instead."
 version_added: "1.6"
-author: Gareth Rushgrove
+author: "Gareth Rushgrove (@garethr)"
 options:
  state:
    description:
--- a/cloud/amazon/ec2_metric_alarm.py
+++ b/cloud/amazon/ec2_metric_alarm.py
@ -21,7 +21,7 @@ description:
 - Can create or delete AWS metric alarms
 - Metrics you wish to alarm on must already exist
 version_added: "1.6"
-author: Zacharie Eakin
+author: "Zacharie Eakin (@zeekin)"
 options:
    state:
        description:
--- a/cloud/amazon/ec2_scaling_policy.py
+++ b/cloud/amazon/ec2_scaling_policy.py
@ -7,7 +7,7 @@ description:
  - Can create or delete scaling policies for autoscaling groups
  - Referenced autoscaling groups must already exist
 version_added: "1.6"
-author: Zacharie Eakin
+author: "Zacharie Eakin (@zeekin)"
 options:
  state:
    description:
--- a/cloud/amazon/ec2_snapshot.py
+++ b/cloud/amazon/ec2_snapshot.py
@ -75,7 +75,7 @@ options:
    required: false
    version_added: "1.9"

-author: Will Thames
+author: "Will Thames (@willthames)"
 extends_documentation_fragment: aws
 '''

--- a/cloud/amazon/ec2_tag.py
+++ b/cloud/amazon/ec2_tag.py
@ -42,7 +42,7 @@ options:
    default: null
    aliases: ['aws_region', 'ec2_region']

-author: Lester Wade
+author: "Lester Wade (@lwade)"
 extends_documentation_fragment: aws
 '''

--- a/cloud/amazon/ec2_vol.py
+++ b/cloud/amazon/ec2_vol.py
@ -107,7 +107,7 @@ options:
    default: present
    choices: ['absent', 'present', 'list']
    version_added: "1.6"
-author: Lester Wade
+author: "Lester Wade (@lwade)"
 extends_documentation_fragment: aws
 '''

--- a/cloud/amazon/ec2_vpc.py
+++ b/cloud/amazon/ec2_vpc.py
@ -100,7 +100,7 @@ options:
    required: true
    default: null
    aliases: ['aws_region', 'ec2_region']
-author: Carson Gee
+author: "Carson Gee (@carsongee)"
 extends_documentation_fragment: aws
 '''

--- a/cloud/amazon/elasticache.py
+++ b/cloud/amazon/elasticache.py
@ -22,7 +22,7 @@ description:
  - Manage cache clusters in Amazon Elasticache.
  - Returns information about the specified cache cluster.
 version_added: "1.4"
-author: Jim Dalton
+author: "Jim Dalton (@jsdalton)"
 options:
  state:
    description:
--- a/cloud/amazon/iam.py
+++ b/cloud/amazon/iam.py
@ -97,7 +97,9 @@ options:
    aliases: [ 'ec2_access_key', 'access_key' ]
 notes:
  - 'Currently boto does not support the removal of Managed Policies, the module will error out if your user/group/role has managed policies when you try to do state=absent. They will need to be removed manually.'
-author: Jonathan I. Davila and Paul Seiffert (@defionscode)
+author: 
+    - "Jonathan I. Davila (@defionscode)"
+    - "Paul Seiffert (@seiffert)"
 extends_documentation_fragment: aws
 '''

--- a/cloud/amazon/iam_policy.py
+++ b/cloud/amazon/iam_policy.py
@ -72,7 +72,7 @@ options:
 requirements: [ "boto" ]
 notes:
  - 'Currently boto does not support the removal of Managed Policies, the module will not work removing/adding managed policies.'
-author: Jonathan I. Davila
+author: "Jonathan I. Davila (@defionscode)"
 extends_documentation_fragment: aws
 '''

--- a/cloud/amazon/rds.py
+++ b/cloud/amazon/rds.py
@ -244,7 +244,10 @@ options:
 requirements:
    - "python >= 2.6"
    - "boto"
-author: Bruce Pennypacker, Will Thames
+author: 
+    - "Bruce Pennypacker (@bpennypacker)"
+    - "Will Thames (@willthames")
+
 '''

 # FIXME: the command stuff needs a 'state' like alias to make things consistent -- MPD
--- a/cloud/amazon/rds_param_group.py
+++ b/cloud/amazon/rds_param_group.py
@ -67,7 +67,7 @@ options:
    required: true
    default: null
    aliases: ['aws_region', 'ec2_region']
-author: Scott Anderson
+author: "Scott Anderson (@tastychutney)"
 extends_documentation_fragment: aws
 '''

--- a/cloud/amazon/rds_subnet_group.py
+++ b/cloud/amazon/rds_subnet_group.py
@ -53,7 +53,7 @@ options:
    required: true
    default: null
    aliases: ['aws_region', 'ec2_region']
-author: Scott Anderson
+author: "Scott Anderson (@tastychutney)"
 extends_documentation_fragment: aws
 '''

--- a/cloud/amazon/route53.py
+++ b/cloud/amazon/route53.py
@ -93,7 +93,7 @@ options:
    required: false
    default: false
    version_added: "1.9"
-author: Bruce Pennypacker
+author: "Bruce Pennypacker (@bpennypacker)"
 extends_documentation_fragment: aws
 '''

--- a/cloud/amazon/s3.py
+++ b/cloud/amazon/s3.py
@ -110,7 +110,9 @@ options:
    version_added: "1.3"

 requirements: [ "boto" ]
-author: Lester Wade, Ralph Tice
+author: 
+    - "Lester Wade (@lwade)"
+    - "Ralph Tice (@ralph-tice)"
 extends_documentation_fragment: aws
 '''

--- a/cloud/azure/azure.py
+++ b/cloud/azure/azure.py
@ -114,7 +114,7 @@ options:
 requirements:
    - "python >= 2.6"
    - "azure >= 0.7.1"
-author: John Whitbeck
+author: "John Whitbeck (@jwhitbeck)"
 '''

 EXAMPLES = '''
--- a/cloud/digital_ocean/digital_ocean.py
+++ b/cloud/digital_ocean/digital_ocean.py
@ -22,6 +22,7 @@ short_description: Create/delete a droplet/SSH_key in DigitalOcean
 description:
     - Create/delete a droplet in DigitalOcean and optionally wait for it to be 'running', or deploy an SSH key.
 version_added: "1.3"
+author: "Vincent Viallet (@zbal)"
 options:
  command:
    description:
--- a/cloud/digital_ocean/digital_ocean_domain.py
+++ b/cloud/digital_ocean/digital_ocean_domain.py
@ -22,6 +22,7 @@ short_description: Create/delete a DNS record in DigitalOcean
 description:
     - Create/delete a DNS record in DigitalOcean.
 version_added: "1.6"
+author: "Michael Gregson (@mgregson)"
 options:
  state:
    description:
--- a/cloud/digital_ocean/digital_ocean_sshkey.py
+++ b/cloud/digital_ocean/digital_ocean_sshkey.py
@ -22,6 +22,7 @@ short_description: Create/delete an SSH key in DigitalOcean
 description:
     - Create/delete an SSH key.
 version_added: "1.6"
+author: "Michael Gregson (@mgregson)"
 options:
  state:
    description:
--- a/cloud/docker/docker.py
+++ b/cloud/docker/docker.py
@ -256,7 +256,11 @@ options:
    default: false
    version_added: "1.9"

-author: Cove Schneider, Joshua Conner, Pavel Antonov, Ash Wilson
+author: 
+    - "Cove Schneider (@cove)"
+    - "Joshua Conner (@joshuaconner)"
+    - "Pavel Antonov (@softzilla)"
+    - "Ash Wilson (@smashwilson)"
 requirements:
    - "python >= 2.6"
    - "docker-py >= 0.3.0"
--- a/cloud/docker/docker_image.py
+++ b/cloud/docker/docker_image.py
@ -23,7 +23,7 @@
 DOCUMENTATION = '''
 ---
 module: docker_image
-author: Pavel Antonov
+author: "Pavel Antonov (@softzilla)"
 version_added: "1.5"
 short_description: manage docker images
 description:
--- a/cloud/google/gc_storage.py
+++ b/cloud/google/gc_storage.py
@ -84,7 +84,7 @@ requirements:
    - "python >= 2.6"
    - "boto >= 2.9"

-author: benno@ansible.com Note. Most of the code has been taken from the S3 module.
+author: "Benno Joy (@bennojoy)"

 '''

--- a/cloud/google/gce.py
+++ b/cloud/google/gce.py
@ -142,7 +142,7 @@ requirements:
    - "apache-libcloud >= 0.13.3"
 notes:
  - Either I(name) or I(instance_names) is required.
-author: Eric Johnson <erjohnso@google.com>
+author: "Eric Johnson (@erjohnso) <erjohnso@google.com>"
 '''

 EXAMPLES = '''
--- a/cloud/google/gce_lb.py
+++ b/cloud/google/gce_lb.py
@ -134,7 +134,7 @@ options:
 requirements:
    - "python >= 2.6"
    - "apache-libcloud >= 0.13.3"
-author: Eric Johnson <erjohnso@google.com>
+author: "Eric Johnson (@erjohnso) <erjohnso@google.com>"
 '''

 EXAMPLES = '''
--- a/cloud/google/gce_net.py
+++ b/cloud/google/gce_net.py
@ -105,7 +105,7 @@ options:
 requirements:
    - "python >= 2.6"
    - "apache-libcloud >= 0.13.3"
-author: Eric Johnson <erjohnso@google.com>
+author: "Eric Johnson (@erjohnso) <erjohnso@google.com>"
 '''

 EXAMPLES = '''
--- a/cloud/google/gce_pd.py
+++ b/cloud/google/gce_pd.py
@ -120,7 +120,7 @@ options:
 requirements:
    - "python >= 2.6"
    - "apache-libcloud >= 0.13.3"
-author: Eric Johnson <erjohnso@google.com>
+author: "Eric Johnson (@erjohnso) <erjohnso@google.com>"
 '''

 EXAMPLES = '''
--- a/cloud/linode/linode.py
+++ b/cloud/linode/linode.py
@ -92,7 +92,7 @@ requirements:
    - "python >= 2.6"
    - "linode-python"
    - "pycurl"
-author: Vincent Viallet
+author: "Vincent Viallet (@zbal)"
 notes:
  - LINODE_API_KEY env variable can be used instead
 '''
--- a/cloud/openstack/keystone_user.py
+++ b/cloud/openstack/keystone_user.py
@ -75,7 +75,7 @@ options:
 requirements:
    - "python >= 2.6"
    -  python-keystoneclient
-author: Lorin Hochstein
+author: "Lorin Hochstein (@lorin)"
 '''

 EXAMPLES = '''
--- a/cloud/openstack/nova_keypair.py
+++ b/cloud/openstack/nova_keypair.py
@ -29,6 +29,9 @@ DOCUMENTATION = '''
 ---
 module: nova_keypair
 version_added: "1.2"
+author: 
+    - "Benno Joy (@bennojoy)"
+    - "Michael DeHaan"
 short_description: Add/Delete key pair from nova
 description:
   - Add or Remove key pair from nova .
--- a/cloud/openstack/os_auth.py
+++ b/cloud/openstack/os_auth.py
@ -27,6 +27,7 @@ DOCUMENTATION = '''
 module: os_auth
 short_description: Retrieve an auth token
 version_added: "2.0"
+author: "Monty Taylor (@emonty)"
 description:
    - Retrieve an auth token from an OpenStack Cloud
 requirements:
--- a/cloud/openstack/os_client_config.py
+++ b/cloud/openstack/os_client_config.py
@ -26,7 +26,7 @@ description:
  - Get I(openstack) client config data from clouds.yaml or environment
 version_added: "2.0"
 requirements: [ os-client-config ]
-author: Monty Taylor
+author: "Monty Taylor (@emonty)"
 '''

 EXAMPLES = '''
--- a/cloud/openstack/os_image.py
+++ b/cloud/openstack/os_image.py
@ -30,6 +30,7 @@ module: os_image
 short_description: Add/Delete images from OpenStack Cloud
 extends_documentation_fragment: openstack
 version_added: "2.0"
+author: "Monty Taylor (@emonty)"
 description:
   - Add or Remove images from the OpenStack Image Repository
 options:
--- a/cloud/openstack/os_network.py
+++ b/cloud/openstack/os_network.py
@ -28,6 +28,7 @@ module: os_network
 short_description: Creates/Removes networks from OpenStack
 extends_documentation_fragment: openstack
 version_added: "2.0"
+author: "Monty Taylor (@emonty)"
 description:
   - Add or Remove network from OpenStack.
 options:
--- a/cloud/openstack/os_server.py
+++ b/cloud/openstack/os_server.py
@ -33,6 +33,7 @@ module: os_server
 short_description: Create/Delete Compute Instances from OpenStack
 extends_documentation_fragment: openstack
 version_added: "2.0"
+author: "Monty Taylor (@emonty)"
 description:
   - Create or Remove compute instances from OpenStack.
 options:
--- a/cloud/openstack/os_server_actions.py
+++ b/cloud/openstack/os_server_actions.py
@ -31,6 +31,7 @@ module: os_server_actions
 short_description: Perform actions on Compute Instances from OpenStack
 extends_documentation_fragment: openstack
 version_added: "2.0"
+author: "Jesse Keating (@j2sol)"
 description:
   - Perform server actions on an existing compute instance from OpenStack.
     This module does not return any data other than changed true/false.
--- a/cloud/openstack/os_server_facts.py
+++ b/cloud/openstack/os_server_facts.py
@ -27,6 +27,7 @@ DOCUMENTATION = '''
 module: os_server_facts
 short_description: Retrieve facts about a compute instance
 version_added: "2.0"
+author: "Monty Taylor (@emonty)"
 description:
    - Retrieve facts about a server instance from OpenStack.
 notes:
--- a/cloud/openstack/os_server_volume.py
+++ b/cloud/openstack/os_server_volume.py
@ -31,6 +31,7 @@ module: os_server_volume
 short_description: Attach/Detach Volumes from OpenStack VM's
 extends_documentation_fragment: openstack
 version_added: "2.0"
+author: "Monty Taylor (@emonty)"
 description:
   - Attach or Detach volumes from OpenStack VM's
 options:
--- a/cloud/openstack/os_subnet.py
+++ b/cloud/openstack/os_subnet.py
@ -29,6 +29,7 @@ module: os_subnet
 short_description: Add/Remove subnet to an OpenStack network
 extends_documentation_fragment: openstack
 version_added: "2.0"
+author: "Monty Taylor (@emonty)"
 description:
   - Add or Remove a subnet to an OpenStack network
 options:
--- a/cloud/openstack/os_volume.py
+++ b/cloud/openstack/os_volume.py
@ -29,6 +29,7 @@ module: os_volume
 short_description: Create/Delete Cinder Volumes
 extends_documentation_fragment: openstack
 version_added: "2.0"
+author: "Monty Taylor (@emonty)"
 description:
   - Create or Remove cinder block storage volumes
 options:
--- a/cloud/openstack/quantum_floating_ip.py
+++ b/cloud/openstack/quantum_floating_ip.py
@ -33,6 +33,9 @@ DOCUMENTATION = '''
 ---
 module: quantum_floating_ip
 version_added: "1.2"
+author:
+    - "Benno Joy (@bennojoy)"
+    - "Brad P. Crochet (@bcrochet)"
 short_description: Add/Remove floating IP from an instance
 description:
   - Add or Remove a floating IP to an instance
--- a/cloud/openstack/quantum_floating_ip_associate.py
+++ b/cloud/openstack/quantum_floating_ip_associate.py
@ -32,6 +32,7 @@ DOCUMENTATION = '''
 ---
 module: quantum_floating_ip_associate
 version_added: "1.2"
+author: "Benno Joy (@bennojoy)"
 short_description: Associate or disassociate a particular floating IP with an instance
 description:
   - Associates or disassociates a specific floating IP with a particular instance
--- a/cloud/openstack/quantum_router.py
+++ b/cloud/openstack/quantum_router.py
@ -30,6 +30,7 @@ DOCUMENTATION = '''
 ---
 module: quantum_router
 version_added: "1.2"
+author: "Benno Joy (@bennojoy)"
 short_description: Create or Remove router from openstack
 description:
   - Create or Delete routers from OpenStack
--- a/cloud/openstack/quantum_router_gateway.py
+++ b/cloud/openstack/quantum_router_gateway.py
@ -30,6 +30,7 @@ DOCUMENTATION = '''
 ---
 module: quantum_router_gateway
 version_added: "1.2"
+author: "Benno Joy (@bennojoy)"
 short_description: set/unset a gateway interface for the router with the specified external network
 description:
   - Creates/Removes a gateway interface from the router, used to associate a external network with a router to route external traffic.
--- a/cloud/openstack/quantum_router_interface.py
+++ b/cloud/openstack/quantum_router_interface.py
@ -30,6 +30,7 @@ DOCUMENTATION = '''
 ---
 module: quantum_router_interface
 version_added: "1.2"
+author: "Benno Joy (@bennojoy)"
 short_description: Attach/Dettach a subnet's interface to a router
 description:
   - Attach/Dettach a subnet interface to a router, to provide a gateway for the subnet.
--- a/cloud/rackspace/rax.py
+++ b/cloud/rackspace/rax.py
@ -182,7 +182,9 @@ options:
    description:
      - how long before wait gives up, in seconds
    default: 300
-author: Jesse Keating, Matt Martz
+author: 
+    - "Jesse Keating (@j2sol)"
+    - "Matt Martz (@sivel)"
 notes:
  - I(exact_count) can be "destructive" if the number of running servers in
    the I(group) is larger than that specified in I(count). In such a case, the
--- a/cloud/rackspace/rax_cbs.py
+++ b/cloud/rackspace/rax_cbs.py
@ -79,7 +79,9 @@ options:
    description:
      - how long before wait gives up, in seconds
    default: 300
-author: Christopher H. Laco, Matt Martz
+author: 
+    - "Christopher H. Laco (@claco)"
+    - "Matt Martz (@sivel)"
 extends_documentation_fragment: rackspace.openstack
 '''

--- a/cloud/rackspace/rax_cbs_attachments.py
+++ b/cloud/rackspace/rax_cbs_attachments.py
@ -58,7 +58,9 @@ options:
    description:
      - how long before wait gives up, in seconds
    default: 300
-author: Christopher H. Laco, Matt Martz
+author: 
+    - "Christopher H. Laco (@claco)"
+    - "Matt Martz (@sivel)"
 extends_documentation_fragment: rackspace.openstack
 '''

--- a/cloud/rackspace/rax_cdb.py
+++ b/cloud/rackspace/rax_cdb.py
@ -52,7 +52,7 @@ options:
    description:
      - how long before wait gives up, in seconds
    default: 300
-author: Simon JAILLET
+author: "Simon JAILLET (@jails)"
 extends_documentation_fragment: rackspace
 '''

--- a/cloud/rackspace/rax_cdb_database.py
+++ b/cloud/rackspace/rax_cdb_database.py
@ -44,7 +44,7 @@ options:
      - Indicate desired state of the resource
    choices: ['present', 'absent']
    default: present
-author: Simon JAILLET
+author: "Simon JAILLET (@jails)"
 extends_documentation_fragment: rackspace
 '''

--- a/cloud/rackspace/rax_cdb_user.py
+++ b/cloud/rackspace/rax_cdb_user.py
@ -51,7 +51,7 @@ options:
      - Indicate desired state of the resource
    choices: ['present', 'absent']
    default: present
-author: Simon JAILLET
+author: "Simon JAILLET (@jails)"
 extends_documentation_fragment: rackspace
 '''

--- a/cloud/rackspace/rax_dns.py
+++ b/cloud/rackspace/rax_dns.py
@ -48,7 +48,7 @@ notes:
  - "It is recommended that plays utilizing this module be run with
    C(serial: 1) to avoid exceeding the API request limit imposed by
    the Rackspace CloudDNS API"
-author: Matt Martz
+author: "Matt Martz (@sivel)"
 extends_documentation_fragment: rackspace
 '''

--- a/cloud/rackspace/rax_dns_record.py
+++ b/cloud/rackspace/rax_dns_record.py
@ -84,7 +84,7 @@ notes:
    supplied
  - As of version 1.7, the C(type) field is required and no longer defaults to an C(A) record.
  - C(PTR) record support was added in version 1.7
-author: Matt Martz
+author: "Matt Martz (@sivel)"
 extends_documentation_fragment: rackspace
 '''

--- a/cloud/rackspace/rax_facts.py
+++ b/cloud/rackspace/rax_facts.py
@ -35,7 +35,7 @@ options:
    description:
      - Server name to retrieve facts for
    default: null
-author: Matt Martz
+author: "Matt Martz (@sivel)"
 extends_documentation_fragment: rackspace.openstack
 '''

--- a/cloud/rackspace/rax_files.py
+++ b/cloud/rackspace/rax_files.py
@ -76,7 +76,7 @@ options:
  web_index:
    description:
       - Sets an object to be presented as the HTTP index page when accessed by the CDN URL
-author: Paul Durivage
+author: "Paul Durivage (@angstwad)"
 extends_documentation_fragment: rackspace
 '''

--- a/cloud/rackspace/rax_files_objects.py
+++ b/cloud/rackspace/rax_files_objects.py
@ -92,7 +92,7 @@ options:
      - file
      - meta
    default: file
-author: Paul Durivage
+author: "Paul Durivage (@angstwad)"
 extends_documentation_fragment: rackspace
 '''

--- a/cloud/rackspace/rax_identity.py
+++ b/cloud/rackspace/rax_identity.py
@ -29,7 +29,9 @@ options:
      - Indicate desired state of the resource
    choices: ['present', 'absent']
    default: present
-author: Christopher H. Laco, Matt Martz
+author: 
+    - "Christopher H. Laco (@claco)"
+    - "Matt Martz (@sivel)"
 extends_documentation_fragment: rackspace.openstack
 '''

--- a/cloud/rackspace/rax_keypair.py
+++ b/cloud/rackspace/rax_keypair.py
@ -39,7 +39,7 @@ options:
      - present
      - absent
    default: present
-author: Matt Martz
+author: "Matt Martz (@sivel)"
 notes:
  - Keypairs cannot be manipulated, only created and deleted. To "update" a
    keypair you must first delete and then recreate.
--- a/cloud/rackspace/rax_meta.py
+++ b/cloud/rackspace/rax_meta.py
@ -39,7 +39,7 @@ options:
    description:
      - A hash of metadata to associate with the instance
    default: null
-author: Matt Martz
+author: "Matt Martz (@sivel)"
 extends_documentation_fragment: rackspace.openstack
 '''

--- a/cloud/rackspace/rax_network.py
+++ b/cloud/rackspace/rax_network.py
@ -39,7 +39,9 @@ options:
    description:
     - cidr of the network being created
    default: null
-author: Christopher H. Laco, Jesse Keating
+author: 
+    - "Christopher H. Laco (@claco)"
+    - "Jesse Keating (@j2sol)"
 extends_documentation_fragment: rackspace.openstack
 '''

--- a/cloud/rackspace/rax_queue.py
+++ b/cloud/rackspace/rax_queue.py
@ -35,7 +35,9 @@ options:
      - present
      - absent
    default: present
-author: Christopher H. Laco, Matt Martz
+author: 
+    - "Christopher H. Laco (@claco)"
+    - "Matt Martz (@sivel)"
 extends_documentation_fragment: rackspace
 '''

--- a/cloud/rackspace/rax_scaling_group.py
+++ b/cloud/rackspace/rax_scaling_group.py
@ -105,7 +105,7 @@ options:
      - Data to be uploaded to the servers config drive. This option implies
        I(config_drive). Can be a file path or a string
    version_added: 1.8
-author: Matt Martz
+author: "Matt Martz (@sivel)"
 extends_documentation_fragment: rackspace
 '''

--- a/cloud/rackspace/rax_scaling_policy.py
+++ b/cloud/rackspace/rax_scaling_policy.py
@ -73,7 +73,7 @@ options:
      - present
      - absent
    default: present
-author: Matt Martz
+author: "Matt Martz (@sivel)"
 extends_documentation_fragment: rackspace
 '''

--- a/cloud/vmware/vsphere_guest.py
+++ b/cloud/vmware/vsphere_guest.py
@ -119,7 +119,7 @@ options:
 notes:
  - This module should run from a system that can access vSphere directly.
    Either by using local_action, or using delegate_to.
-author: Richard Hoop <wrhoop@gmail.com>
+author: "Richard Hoop (@rhoop) <wrhoop@gmail.com>"
 requirements:
  - "python >= 2.6"
  - pysphere