Merge pull request #816 from resmo/for-ansible

cloudstack: bug fix and doc updates

cloud/cloudstack/cs_domain.py

@@ -104,7 +104,6 @@ network_domain:
   returned: success
   type: string
   sample: example.local
-
 '''
 
 try:

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:
@@ -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:

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