From e71daafd8ea4ec703296383adc422e5d47982502 Mon Sep 17 00:00:00 2001
From: Rene Moser <mail@renemoser.net>
Date: Sat, 8 Aug 2015 15:40:05 +0200
Subject: [PATCH 1/2] cloudstack: fix KeyError: 'public_ip' in cs_instance

---
 cloud/cloudstack/cs_instance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloud/cloudstack/cs_instance.py b/cloud/cloudstack/cs_instance.py
index f8bef7c89e2..2204ad8dd16 100644
--- a/cloud/cloudstack/cs_instance.py
+++ b/cloud/cloudstack/cs_instance.py
@@ -732,7 +732,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
             if 'instancename' in instance:
                 self.result['instance_name'] = instance['instancename']
             if 'publicip' in instance:
-                self.result['public_ip'] = instance['public_ip']
+                self.result['public_ip'] = instance['publicip']
             if 'passwordenabled' in instance:
                 self.result['password_enabled'] = instance['passwordenabled']
             if 'password' in instance:

From cbb2e9699328695be21422b0647fc5ffa44872e6 Mon Sep 17 00:00:00 2001
From: Rene Moser <mail@renemoser.net>
Date: Sat, 8 Aug 2015 15:43:32 +0200
Subject: [PATCH 2/2] cloudstack: doc fixes

---
 cloud/cloudstack/cs_domain.py   | 1 -
 cloud/cloudstack/cs_instance.py | 2 +-
 cloud/cloudstack/cs_template.py | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cloud/cloudstack/cs_domain.py b/cloud/cloudstack/cs_domain.py
index 0860aa3c49e..3b048eddbb5 100644
--- a/cloud/cloudstack/cs_domain.py
+++ b/cloud/cloudstack/cs_domain.py
@@ -104,7 +104,6 @@ network_domain:
   returned: success
   type: string
   sample: example.local
-
 '''
 
 try:
diff --git a/cloud/cloudstack/cs_instance.py b/cloud/cloudstack/cs_instance.py
index 2204ad8dd16..f17269848e6 100644
--- a/cloud/cloudstack/cs_instance.py
+++ b/cloud/cloudstack/cs_instance.py
@@ -23,7 +23,7 @@ DOCUMENTATION = '''
 module: cs_instance
 short_description: Manages instances and virtual machines on Apache CloudStack based clouds.
 description:
-    - Deploy, start, restart, stop and destroy instances.
+    - Deploy, start, update, scale, restart, stop and destroy instances.
 version_added: '2.0'
 author: "René Moser (@resmo)"
 options:
diff --git a/cloud/cloudstack/cs_template.py b/cloud/cloudstack/cs_template.py
index 8e56aafaa7e..11e2cc747cc 100644
--- a/cloud/cloudstack/cs_template.py
+++ b/cloud/cloudstack/cs_template.py
@@ -181,7 +181,7 @@ EXAMPLES = '''
 # Register a systemvm template
 - local_action:
     module: cs_template
-    name: systemvm-4.5
+    name: systemvm-vmware-4.5
     url: "http://packages.shapeblue.com/systemvmtemplate/4.5/systemvm64template-4.5-vmware.ova"
     hypervisor: VMware
     format: OVA