From 9ff63f2338282a7ec432b47ea8094876102b25cc Mon Sep 17 00:00:00 2001 From: Rene Moser Date: Thu, 14 May 2015 00:03:17 +0200 Subject: [PATCH] cloudstack: remove self.result, is defined in super class from utils --- lib/ansible/modules/extras/cloud/cloudstack/cs_account.py | 1 - .../modules/extras/cloud/cloudstack/cs_affinitygroup.py | 4 ---- lib/ansible/modules/extras/cloud/cloudstack/cs_firewall.py | 4 ---- lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py | 1 - .../modules/extras/cloud/cloudstack/cs_instancegroup.py | 1 - lib/ansible/modules/extras/cloud/cloudstack/cs_iso.py | 4 ---- lib/ansible/modules/extras/cloud/cloudstack/cs_portforward.py | 2 -- .../modules/extras/cloud/cloudstack/cs_securitygroup.py | 4 ---- .../modules/extras/cloud/cloudstack/cs_securitygroup_rule.py | 3 --- lib/ansible/modules/extras/cloud/cloudstack/cs_sshkeypair.py | 4 ---- lib/ansible/modules/extras/cloud/cloudstack/cs_vmsnapshot.py | 4 ---- 11 files changed, 32 deletions(-) diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py index dd47a3f93d3..313c786dee3 100644 --- a/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py +++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py @@ -97,7 +97,6 @@ extends_documentation_fragment: cloudstack ''' EXAMPLES = ''' ---- # create an account in domain 'CUSTOMERS' local_action: module: cs_account diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_affinitygroup.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_affinitygroup.py index 1fd631d5826..da8f5b0f24f 100644 --- a/lib/ansible/modules/extras/cloud/cloudstack/cs_affinitygroup.py +++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_affinitygroup.py @@ -65,7 +65,6 @@ extends_documentation_fragment: cloudstack ''' EXAMPLES = ''' ---- # Create a affinity group - local_action: module: cs_affinitygroup @@ -113,9 +112,6 @@ class AnsibleCloudStackAffinityGroup(AnsibleCloudStack): def __init__(self, module): AnsibleCloudStack.__init__(self, module) - self.result = { - 'changed': False, - } self.affinity_group = None diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_firewall.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_firewall.py index de63d7073e5..7baf2ee5fe8 100644 --- a/lib/ansible/modules/extras/cloud/cloudstack/cs_firewall.py +++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_firewall.py @@ -87,7 +87,6 @@ extends_documentation_fragment: cloudstack ''' EXAMPLES = ''' ---- # Allow inbound port 80/tcp from 1.2.3.4 to 4.3.2.1 - local_action: module: cs_firewall @@ -170,9 +169,6 @@ class AnsibleCloudStackFirewall(AnsibleCloudStack): def __init__(self, module): AnsibleCloudStack.__init__(self, module) - self.result = { - 'changed': False, - } self.firewall_rule = None diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py index 464fb9a2f47..bf4ae023971 100644 --- a/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py +++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py @@ -164,7 +164,6 @@ extends_documentation_fragment: cloudstack ''' EXAMPLES = ''' ---- # Create a instance on CloudStack from an ISO # NOTE: Names of offerings and ISOs depending on the CloudStack configuration. - local_action: diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_instancegroup.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_instancegroup.py index d74648d2313..dc216733c63 100644 --- a/lib/ansible/modules/extras/cloud/cloudstack/cs_instancegroup.py +++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_instancegroup.py @@ -56,7 +56,6 @@ extends_documentation_fragment: cloudstack ''' EXAMPLES = ''' ---- # Create an instance group - local_action: module: cs_instancegroup diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_iso.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_iso.py index c300cd71330..b987d121ab8 100644 --- a/lib/ansible/modules/extras/cloud/cloudstack/cs_iso.py +++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_iso.py @@ -98,7 +98,6 @@ extends_documentation_fragment: cloudstack ''' EXAMPLES = ''' ---- # Register an ISO if ISO name does not already exist. - local_action: module: cs_iso @@ -184,9 +183,6 @@ class AnsibleCloudStackIso(AnsibleCloudStack): def __init__(self, module): AnsibleCloudStack.__init__(self, module) - self.result = { - 'changed': False, - } self.iso = None def register_iso(self): diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_portforward.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_portforward.py index 5d0cab6d170..c54bf532093 100644 --- a/lib/ansible/modules/extras/cloud/cloudstack/cs_portforward.py +++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_portforward.py @@ -106,7 +106,6 @@ extends_documentation_fragment: cloudstack ''' EXAMPLES = ''' ---- # 1.2.3.4:80 -> web01:8080 - local_action: module: cs_portforward @@ -144,7 +143,6 @@ EXAMPLES = ''' public_port: 22 private_port: 22 state: absent - ''' RETURN = ''' diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup.py index ac9b0935830..7a4350c8343 100644 --- a/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup.py +++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup.py @@ -49,7 +49,6 @@ extends_documentation_fragment: cloudstack ''' EXAMPLES = ''' ---- # Create a security group - local_action: module: cs_securitygroup @@ -92,9 +91,6 @@ class AnsibleCloudStackSecurityGroup(AnsibleCloudStack): def __init__(self, module): AnsibleCloudStack.__init__(self, module) - self.result = { - 'changed': False, - } self.security_group = None diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup_rule.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup_rule.py index 46b1eb1e545..f1ad16ffec6 100644 --- a/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup_rule.py +++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup_rule.py @@ -193,9 +193,6 @@ class AnsibleCloudStackSecurityGroupRule(AnsibleCloudStack): def __init__(self, module): AnsibleCloudStack.__init__(self, module) - self.result = { - 'changed': False, - } def _tcp_udp_match(self, rule, protocol, start_port, end_port): diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_sshkeypair.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_sshkeypair.py index 1e3233dd76e..995e0b5b81a 100644 --- a/lib/ansible/modules/extras/cloud/cloudstack/cs_sshkeypair.py +++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_sshkeypair.py @@ -63,7 +63,6 @@ extends_documentation_fragment: cloudstack ''' EXAMPLES = ''' ---- # create a new private / public key pair: - local_action: cs_sshkeypair name=linus@example.com register: key @@ -114,9 +113,6 @@ class AnsibleCloudStackSshKey(AnsibleCloudStack): def __init__(self, module): AnsibleCloudStack.__init__(self, module) - self.result = { - 'changed': False, - } self.ssh_key = None diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_vmsnapshot.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_vmsnapshot.py index 607bd65d2ed..6dede5d4062 100644 --- a/lib/ansible/modules/extras/cloud/cloudstack/cs_vmsnapshot.py +++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_vmsnapshot.py @@ -80,7 +80,6 @@ extends_documentation_fragment: cloudstack ''' EXAMPLES = ''' ---- # Create a VM snapshot of disk and memory before an upgrade - local_action: module: cs_vmsnapshot @@ -174,9 +173,6 @@ class AnsibleCloudStackVmSnapshot(AnsibleCloudStack): def __init__(self, module): AnsibleCloudStack.__init__(self, module) - self.result = { - 'changed': False, - } def get_snapshot(self):