From d5f62798f09defbf65f0b682e909c0b946a0c163 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 28 Sep 2015 08:22:36 -0700 Subject: [PATCH] Docs fixes --- cloud/amazon/ec2_ami.py | 2 +- cloud/rackspace/rax_scaling_group.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cloud/amazon/ec2_ami.py b/cloud/amazon/ec2_ami.py index 016df7e6e55..60de91ebb72 100644 --- a/cloud/amazon/ec2_ami.py +++ b/cloud/amazon/ec2_ami.py @@ -73,7 +73,7 @@ options: version_added: "2.0" description: - An optional list of device hashes/dictionaries with custom configurations (same block-device-mapping parameters) - - Valid properties include: device_name, volume_type, size (in GB), delete_on_termination (boolean), no_device (boolean), snapshot_id, iops (for io1 volume_type) + - "Valid properties include: device_name, volume_type, size (in GB), delete_on_termination (boolean), no_device (boolean), snapshot_id, iops (for io1 volume_type)" required: false default: null delete_snapshot: diff --git a/cloud/rackspace/rax_scaling_group.py b/cloud/rackspace/rax_scaling_group.py index bdf12a79cbe..79b7395f400 100644 --- 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 - wait + wait: description: - wait for the scaling group to finish provisioning the minimum amount of servers @@ -117,7 +117,7 @@ options: description: - how long before wait gives up, in seconds default: 300 -author: Matt Martz +author: "Matt Martz (@sivel)" extends_documentation_fragment: rackspace '''