Merge pull request #1462 from resmo/for-ansible

[2.0] cloudstack: cs_instance: fix case insensitivity

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 \

cloud/cloudstack/cs_securitygroup_rule.py

@@ -309,6 +309,7 @@ class AnsibleCloudStackSecurityGroupRule(AnsibleCloudStack):
         res  = None
         sg_type = self.module.params.get('type')
         if sg_type == 'ingress':
+            if 'ingressrule' in security_group:
                 rule = self._get_rule(security_group['ingressrule'])
             if not rule:
                 self.result['changed'] = True
@@ -316,6 +317,7 @@ class AnsibleCloudStackSecurityGroupRule(AnsibleCloudStack):
                     res = self.cs.authorizeSecurityGroupIngress(**args)
 
         elif sg_type == 'egress':
+            if 'egressrule' in security_group:
                 rule = self._get_rule(security_group['egressrule'])
             if not rule:
                 self.result['changed'] = True