cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #816 from resmo/for-ansible

Browse source 
cloudstack: bug fix and doc updates
This commit is contained in:
Brian Coca 2015-08-10 09:23:52 -04:00
commit ec060fa758
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cloud/cloudstack/cs_domain.py
View file

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

4
cloud/cloudstack/cs_instance.py
View file

@ -23,7 +23,7 @@ DOCUMENTATION = '''
module: cs_instance module: cs_instance
short_description: Manages instances and virtual machines on Apache CloudStack based clouds. short_description: Manages instances and virtual machines on Apache CloudStack based clouds.
description: description:
- Deploy, start, restart, stop and destroy instances. - Deploy, start, update, scale, restart, stop and destroy instances.
version_added: '2.0' version_added: '2.0'
author: "René Moser (@resmo)" author: "René Moser (@resmo)"
options: options:
@ -732,7 +732,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
if 'instancename' in instance: if 'instancename' in instance:
self.result['instance_name'] = instance['instancename'] self.result['instance_name'] = instance['instancename']
if 'publicip' in instance: if 'publicip' in instance:
self.result['public_ip'] = instance['public_ip'] self.result['public_ip'] = instance['publicip']
if 'passwordenabled' in instance: if 'passwordenabled' in instance:
self.result['password_enabled'] = instance['passwordenabled'] self.result['password_enabled'] = instance['passwordenabled']
if 'password' in instance: if 'password' in instance:

2
cloud/cloudstack/cs_template.py
View file

@ -181,7 +181,7 @@ EXAMPLES = '''
# Register a systemvm template # Register a systemvm template
- local_action: - local_action:
module: cs_template 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" url: "http://packages.shapeblue.com/systemvmtemplate/4.5/systemvm64template-4.5-vmware.ova"
hypervisor: VMware hypervisor: VMware
format: OVA format: OVA