From 692045f693665f810736d0e07782e62bb4fb1f2d Mon Sep 17 00:00:00 2001
From: Scott Miller <scott.miller171@gmail.com>
Date: Mon, 29 Jun 2015 14:15:23 -0400
Subject: [PATCH 1/2] update docs for cloudformation
---
cloud/amazon/cloudformation.py | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/cloud/amazon/cloudformation.py b/cloud/amazon/cloudformation.py
index dee292aeba3..cccdd156f20 100644
--- a/cloud/amazon/cloudformation.py
+++ b/cloud/amazon/cloudformation.py
@@ -51,6 +51,7 @@ options:
template:
description:
- The local path of the cloudformation template. This parameter is mutually exclusive with 'template_url'. Either one of them is required if "state" parameter is "present"
+ Must give full path to the file, relative to the playbook. If using roles this may look like "roles/cloudformation/files/cloudformation-example.json"
required: false
default: null
aliases: []
@@ -115,6 +116,22 @@ EXAMPLES = '''
tags:
Stack: "ansible-cloudformation"
+# Basic role example
+- name: launch ansible cloudformation example
+ cloudformation:
+ stack_name: "ansible-cloudformation"
+ state: "present"
+ region: "us-east-1"
+ disable_rollback: true
+ template: "roles/cloudformation/files/cloudformation-example.json"
+ template_parameters:
+ KeyName: "jmartin"
+ DiskType: "ephemeral"
+ InstanceType: "m1.small"
+ ClusterSize: 3
+ tags:
+ Stack: "ansible-cloudformation"
+
# Removal example
- name: tear down old deployment
cloudformation:
From c3c2e6ab726f9ea28a7a5d37b2a466740843bb9a Mon Sep 17 00:00:00 2001
From: Scott Miller <scott.miller171@gmail.com>
Date: Sat, 4 Jul 2015 14:45:21 -0400
Subject: [PATCH 2/2] Update cloudformation.py
Fix for inaccurate phrasing
---
cloud/amazon/cloudformation.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cloud/amazon/cloudformation.py b/cloud/amazon/cloudformation.py
index cccdd156f20..abde0ec375c 100644
--- a/cloud/amazon/cloudformation.py
+++ b/cloud/amazon/cloudformation.py
@@ -51,7 +51,7 @@ options:
template:
description:
- The local path of the cloudformation template. This parameter is mutually exclusive with 'template_url'. Either one of them is required if "state" parameter is "present"
- Must give full path to the file, relative to the playbook. If using roles this may look like "roles/cloudformation/files/cloudformation-example.json"
+ Must give full path to the file, relative to the working directory. If using roles this may look like "roles/cloudformation/files/cloudformation-example.json"
required: false
default: null
aliases: []