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

Merge pull request #898 from resmo/feature/temlate-cross-zones

Browse source 
cloudstack: cs_template: add new arg cross_zones
This commit is contained in:
Brian Coca 2015-08-31 15:40:52 -04:00
commit 9e8f24ff47
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cloud/cloudstack/cs_template.py
View file

@ -86,6 +86,12 @@ options:
- Only used if C(state) is present. - Only used if C(state) is present.
required: false required: false
default: false default: false
cross_zones:
description:
- Whether the template should be syned across zones.
- Only used if C(state) is present.
required: false
default: false
project: project:
description: description:
- Name of the project the template to be registered in. - Name of the project the template to be registered in.
@ -185,9 +191,8 @@ EXAMPLES = '''
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
zone: tokio-ix cross_zones: yes
os_type: Debian GNU/Linux 7(64-bit) os_type: Debian GNU/Linux 7(64-bit)
is_routing: yes
# Create a template from a stopped virtual machine's volume # Create a template from a stopped virtual machine's volume
- local_action: - local_action:
@ -456,11 +461,15 @@ class AnsibleCloudStackTemplate(AnsibleCloudStack):
args['isrouting'] = self.module.params.get('is_routing') args['isrouting'] = self.module.params.get('is_routing')
args['sshkeyenabled'] = self.module.params.get('sshkey_enabled') args['sshkeyenabled'] = self.module.params.get('sshkey_enabled')
args['hypervisor'] = self.get_hypervisor() args['hypervisor'] = self.get_hypervisor()
args['zoneid'] = self.get_zone(key='id')
args['domainid'] = self.get_domain(key='id') args['domainid'] = self.get_domain(key='id')
args['account'] = self.get_account(key='name') args['account'] = self.get_account(key='name')
args['projectid'] = self.get_project(key='id') args['projectid'] = self.get_project(key='id')
if not self.module.params.get('cross_zones'):
args['zoneid'] = self.get_zone(key='id')
else:
args['zoneid'] = -1
if not self.module.check_mode: if not self.module.check_mode:
res = self.cs.registerTemplate(**args) res = self.cs.registerTemplate(**args)
if 'errortext' in res: if 'errortext' in res:
@ -473,11 +482,13 @@ class AnsibleCloudStackTemplate(AnsibleCloudStack):
args = {} args = {}
args['isready'] = self.module.params.get('is_ready') args['isready'] = self.module.params.get('is_ready')
args['templatefilter'] = self.module.params.get('template_filter') args['templatefilter'] = self.module.params.get('template_filter')
args['zoneid'] = self.get_zone(key='id')
args['domainid'] = self.get_domain(key='id') args['domainid'] = self.get_domain(key='id')
args['account'] = self.get_account(key='name') args['account'] = self.get_account(key='name')
args['projectid'] = self.get_project(key='id') args['projectid'] = self.get_project(key='id')
if not self.module.params.get('cross_zones'):
args['zoneid'] = self.get_zone(key='id')
# if checksum is set, we only look on that. # if checksum is set, we only look on that.
checksum = self.module.params.get('checksum') checksum = self.module.params.get('checksum')
if not checksum: if not checksum:
@ -543,6 +554,7 @@ def main():
details = dict(default=None), details = dict(default=None),
bits = dict(type='int', choices=[ 32, 64 ], default=64), bits = dict(type='int', choices=[ 32, 64 ], default=64),
state = dict(choices=['present', 'absent'], default='present'), state = dict(choices=['present', 'absent'], default='present'),
cross_zones = dict(type='bool', choices=BOOLEANS, default=False),
zone = dict(default=None), zone = dict(default=None),
domain = dict(default=None), domain = dict(default=None),
account = dict(default=None), account = dict(default=None),