From 11fdb822a4814ecc082d5bf359a63e0c2fcb80e6 Mon Sep 17 00:00:00 2001 From: Rene Moser Date: Wed, 6 Jan 2016 23:49:45 +0100 Subject: [PATCH] cloudstack: fixes and improvements cs_instance: fix case insensitivity cs_instance: remove duplicate code block cs_securitygroup_rule: fix KeyError on older ACS --- cloud/cloudstack/cs_instance.py | 8 +------- cloud/cloudstack/cs_securitygroup_rule.py | 6 ++++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/cloud/cloudstack/cs_instance.py b/cloud/cloudstack/cs_instance.py index 7b1eeafd4b0..73deb028be2 100644 --- a/cloud/cloudstack/cs_instance.py +++ b/cloud/cloudstack/cs_instance.py @@ -499,7 +499,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack): instances = self.cs.listVirtualMachines(**args) if instances: for v in instances['virtualmachine']: - if instance_name in [ v['name'], v['displayname'], v['id'] ]: + if instance_name.lower() in [ v['name'].lower(), v['displayname'].lower(), v['id'] ]: self.instance = v break return self.instance @@ -667,12 +667,6 @@ class AnsibleCloudStackInstance(AnsibleCloudStack): if self.module.params.get('ssh_key'): args_ssh_key['keypair'] = self.module.params.get('ssh_key') - # SSH key data - args_ssh_key = {} - args_ssh_key['id'] = instance['id'] - args_ssh_key['projectid'] = self.get_project(key='id') - if self.module.params.get('ssh_key'): - args_ssh_key['keypair'] = self.module.params.get('ssh_key') if self._has_changed(args_service_offering, instance) or \ self._has_changed(args_instance_update, instance) or \ diff --git a/cloud/cloudstack/cs_securitygroup_rule.py b/cloud/cloudstack/cs_securitygroup_rule.py index a088c6c2c1e..2a451933a01 100644 --- a/cloud/cloudstack/cs_securitygroup_rule.py +++ b/cloud/cloudstack/cs_securitygroup_rule.py @@ -309,14 +309,16 @@ class AnsibleCloudStackSecurityGroupRule(AnsibleCloudStack): res = None sg_type = self.module.params.get('type') if sg_type == 'ingress': - rule = self._get_rule(security_group['ingressrule']) + if 'ingressrule' in security_group: + rule = self._get_rule(security_group['ingressrule']) if not rule: self.result['changed'] = True if not self.module.check_mode: res = self.cs.authorizeSecurityGroupIngress(**args) elif sg_type == 'egress': - rule = self._get_rule(security_group['egressrule']) + if 'egressrule' in security_group: + rule = self._get_rule(security_group['egressrule']) if not rule: self.result['changed'] = True if not self.module.check_mode: