cloudstack: remove duplicate import cs handling, already in utils.

pull/18777/head
Rene Moser 9 years ago committed by Matt Clay
parent 0953ef753d
commit 29f803b16a

@ -172,12 +172,6 @@ domain:
sample: ROOT sample: ROOT
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -365,9 +359,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_acc = AnsibleCloudStackAccount(module) acs_acc = AnsibleCloudStackAccount(module)

@ -102,12 +102,6 @@ affinity_type:
sample: host anti-affinity sample: host anti-affinity
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -214,9 +208,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_ag = AnsibleCloudStackAffinityGroup(module) acs_ag = AnsibleCloudStackAffinityGroup(module)

@ -226,12 +226,6 @@ pod:
sample: pod01 sample: pod01
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -406,9 +400,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_cluster = AnsibleCloudStackCluster(module) acs_cluster = AnsibleCloudStackCluster(module)

@ -148,12 +148,6 @@ storage:
sample: storage01 sample: storage01
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -278,9 +272,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_configuration = AnsibleCloudStackConfiguration(module) acs_configuration = AnsibleCloudStackConfiguration(module)
configuration = acs_configuration.present_configuration() configuration = acs_configuration.present_configuration()

@ -106,12 +106,6 @@ network_domain:
sample: example.local sample: example.local
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -254,9 +248,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_dom = AnsibleCloudStackDomain(module) acs_dom = AnsibleCloudStackDomain(module)

@ -203,12 +203,6 @@ network:
sample: my_network sample: my_network
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -405,9 +399,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_fw = AnsibleCloudStackFirewall(module) acs_fw = AnsibleCloudStackFirewall(module)

@ -397,12 +397,6 @@ instance_name:
import base64 import base64
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -967,9 +961,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_instance = AnsibleCloudStackInstance(module) acs_instance = AnsibleCloudStackInstance(module)

@ -178,12 +178,6 @@ cloudstack_instance.instance_name:
import base64 import base64
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -270,9 +264,6 @@ def main():
supports_check_mode=False, supports_check_mode=False,
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
cs_instance_facts = AnsibleCloudStackInstanceFacts(module=module).run() cs_instance_facts = AnsibleCloudStackInstanceFacts(module=module).run()
cs_facts_result = dict(changed=False, ansible_facts=cs_instance_facts) cs_facts_result = dict(changed=False, ansible_facts=cs_instance_facts)
module.exit_json(**cs_facts_result) module.exit_json(**cs_facts_result)

@ -102,12 +102,6 @@ project:
sample: example project sample: example project
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -185,9 +179,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_ig = AnsibleCloudStackInstanceGroup(module) acs_ig = AnsibleCloudStackInstanceGroup(module)

@ -127,13 +127,6 @@ domain:
sample: example domain sample: example domain
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -252,9 +245,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_ip_address = AnsibleCloudStackIPAddress(module) acs_ip_address = AnsibleCloudStackIPAddress(module)

@ -197,12 +197,6 @@ project:
sample: example project sample: example project
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -319,9 +313,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_iso = AnsibleCloudStackIso(module) acs_iso = AnsibleCloudStackIso(module)

@ -217,12 +217,6 @@ state:
sample: "Add" sample: "Add"
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -364,9 +358,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_lb_rule = AnsibleCloudStackLBRule(module) acs_lb_rule = AnsibleCloudStackLBRule(module)

@ -200,12 +200,6 @@ state:
sample: "Add" sample: "Add"
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -344,9 +338,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_lb_rule_member = AnsibleCloudStackLBRuleMember(module) acs_lb_rule_member = AnsibleCloudStackLBRuleMember(module)

@ -318,12 +318,6 @@ network_offering:
sample: DefaultIsolatedNetworkOfferingWithSourceNatService sample: DefaultIsolatedNetworkOfferingWithSourceNatService
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -560,9 +554,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_network = AnsibleCloudStackNetwork(module) acs_network = AnsibleCloudStackNetwork(module)

@ -150,12 +150,6 @@ zone:
sample: ch-gva-2 sample: ch-gva-2
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -286,9 +280,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_pod = AnsibleCloudStackPod(module) acs_pod = AnsibleCloudStackPod(module)
state = module.params.get('state') state = module.params.get('state')

@ -203,12 +203,6 @@ vm_guest_ip:
sample: 10.101.65.152 sample: 10.101.65.152
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -391,9 +385,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_pf = AnsibleCloudStackPortforwarding(module) acs_pf = AnsibleCloudStackPortforwarding(module)
state = module.params.get('state') state = module.params.get('state')

@ -141,12 +141,6 @@ tags:
sample: '[ { "key": "foo", "value": "bar" } ]' sample: '[ { "key": "foo", "value": "bar" } ]'
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -287,9 +281,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_project = AnsibleCloudStackProject(module) acs_project = AnsibleCloudStackProject(module)

@ -115,12 +115,6 @@ project:
sample: example project sample: example project
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -206,9 +200,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_resource_limit = AnsibleCloudStackResourceLimit(module) acs_resource_limit = AnsibleCloudStackResourceLimit(module)
resource_limit = acs_resource_limit.update_resource_limit() resource_limit = acs_resource_limit.update_resource_limit()

@ -160,12 +160,6 @@ account:
sample: admin sample: admin
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -358,9 +352,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_router = AnsibleCloudStackRouter(module) acs_router = AnsibleCloudStackRouter(module)

@ -111,12 +111,6 @@ account:
sample: example account sample: example account
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -201,9 +195,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_sg = AnsibleCloudStackSecurityGroup(module) acs_sg = AnsibleCloudStackSecurityGroup(module)

@ -180,12 +180,6 @@ end_port:
sample: 80 sample: 80
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -404,9 +398,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_sg_rule = AnsibleCloudStackSecurityGroupRule(module) acs_sg_rule = AnsibleCloudStackSecurityGroupRule(module)

@ -99,13 +99,6 @@ private_key:
sample: "-----BEGIN RSA PRIVATE KEY-----\nMIICXQIBAAKBgQCkeFYjI+4k8bWfIRMzp4pCzhlopNydbbwRu824P5ilD4ATWMUG\nvEtuCQ2Mp5k5Bma30CdYHgh2/SbxC5RxXSUKTUJtTKpoJUy8PAhb1nn9dnfkC2oU\naRVi9NRUgypTIZxMpgooHOxvAzWxbZCyh1W+91Ld3FNaGxTLqTgeevY84wIDAQAB\nAoGAcwQwgLyUwsNB1vmjWwE0QEmvHS4FlhZyahhi4hGfZvbzAxSWHIK7YUT1c8KU\n9XsThEIN8aJ3GvcoL3OAqNKRnoNb14neejVHkYRadhxqc0GVN6AUIyCqoEMpvhFI\nQrinM572ORzv5ffRjCTbvZcYlW+sqFKNo5e8pYIB8TigpFECQQDu7bg9vkvg8xPs\nkP1K+EH0vsR6vUfy+m3euXjnbJtiP7RoTkZk0JQMOmexgy1qQhISWT0e451wd62v\nJ7M0trl5AkEAsDivJnMIlCCCypwPN4tdNUYpe9dtidR1zLmb3SA7wXk5xMUgLZI9\ncWPjBCMt0KKShdDhQ+hjXAyKQLF7iAPuOwJABjdHCMwvmy2XwhrPjCjDRoPEBtFv\n0sFzJE08+QBZVogDwIbwy+SlRWArnHGmN9J6N+H8dhZD3U4vxZPJ1MBAOQJBAJxO\nCv1dt1Q76gbwmYa49LnWO+F+2cgRTVODpr5iYt5fOmBQQRRqzFkRMkFvOqn+KVzM\nQ6LKM6dn8BEl295vLhUCQQCVDWzoSk3GjL3sOjfAUTyAj8VAXM69llaptxWWySPM\nE9pA+8rYmHfohYFx7FD5/KWCO+sfmxTNB48X0uwyE8tO\n-----END RSA PRIVATE KEY-----\n" sample: "-----BEGIN RSA PRIVATE KEY-----\nMIICXQIBAAKBgQCkeFYjI+4k8bWfIRMzp4pCzhlopNydbbwRu824P5ilD4ATWMUG\nvEtuCQ2Mp5k5Bma30CdYHgh2/SbxC5RxXSUKTUJtTKpoJUy8PAhb1nn9dnfkC2oU\naRVi9NRUgypTIZxMpgooHOxvAzWxbZCyh1W+91Ld3FNaGxTLqTgeevY84wIDAQAB\nAoGAcwQwgLyUwsNB1vmjWwE0QEmvHS4FlhZyahhi4hGfZvbzAxSWHIK7YUT1c8KU\n9XsThEIN8aJ3GvcoL3OAqNKRnoNb14neejVHkYRadhxqc0GVN6AUIyCqoEMpvhFI\nQrinM572ORzv5ffRjCTbvZcYlW+sqFKNo5e8pYIB8TigpFECQQDu7bg9vkvg8xPs\nkP1K+EH0vsR6vUfy+m3euXjnbJtiP7RoTkZk0JQMOmexgy1qQhISWT0e451wd62v\nJ7M0trl5AkEAsDivJnMIlCCCypwPN4tdNUYpe9dtidR1zLmb3SA7wXk5xMUgLZI9\ncWPjBCMt0KKShdDhQ+hjXAyKQLF7iAPuOwJABjdHCMwvmy2XwhrPjCjDRoPEBtFv\n0sFzJE08+QBZVogDwIbwy+SlRWArnHGmN9J6N+H8dhZD3U4vxZPJ1MBAOQJBAJxO\nCv1dt1Q76gbwmYa49LnWO+F+2cgRTVODpr5iYt5fOmBQQRRqzFkRMkFvOqn+KVzM\nQ6LKM6dn8BEl295vLhUCQQCVDWzoSk3GjL3sOjfAUTyAj8VAXM69llaptxWWySPM\nE9pA+8rYmHfohYFx7FD5/KWCO+sfmxTNB48X0uwyE8tO\n-----END RSA PRIVATE KEY-----\n"
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
try: try:
import sshpubkeys import sshpubkeys
has_lib_sshpubkeys = True has_lib_sshpubkeys = True
@ -221,9 +214,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
if not has_lib_sshpubkeys: if not has_lib_sshpubkeys:
module.fail_json(msg="python library sshpubkeys required: pip install sshpubkeys") module.fail_json(msg="python library sshpubkeys required: pip install sshpubkeys")

@ -146,13 +146,6 @@ domain:
sample: example domain sample: example domain
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -285,9 +278,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_static_nat = AnsibleCloudStackStaticNat(module) acs_static_nat = AnsibleCloudStackStaticNat(module)

@ -375,12 +375,6 @@ project:
sample: Production sample: Production
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -643,9 +637,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_tpl = AnsibleCloudStackTemplate(module) acs_tpl = AnsibleCloudStackTemplate(module)

@ -197,12 +197,6 @@ domain:
sample: ROOT sample: ROOT
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -424,9 +418,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_acc = AnsibleCloudStackUser(module) acs_acc = AnsibleCloudStackUser(module)

@ -161,12 +161,6 @@ project:
sample: Production sample: Production
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -281,9 +275,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_vmsnapshot = AnsibleCloudStackVmSnapshot(module) acs_vmsnapshot = AnsibleCloudStackVmSnapshot(module)

@ -230,12 +230,6 @@ device_id:
sample: 1 sample: 1
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -471,9 +465,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_vol = AnsibleCloudStackVolume(module) acs_vol = AnsibleCloudStackVolume(module)

@ -226,12 +226,6 @@ tags:
sample: [ { "key": "foo", "value": "bar" } ] sample: [ { "key": "foo", "value": "bar" } ]
''' '''
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -386,9 +380,6 @@ def main():
supports_check_mode=True supports_check_mode=True
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
try: try:
acs_zone = AnsibleCloudStackZone(module) acs_zone = AnsibleCloudStackZone(module)

@ -138,12 +138,6 @@ cloudstack_zone.tags:
import base64 import base64
try:
from cs import CloudStack, CloudStackException, read_config
has_lib_cs = True
except ImportError:
has_lib_cs = False
# import cloudstack common # import cloudstack common
from ansible.module_utils.cloudstack import * from ansible.module_utils.cloudstack import *
@ -197,9 +191,6 @@ def main():
supports_check_mode=False, supports_check_mode=False,
) )
if not has_lib_cs:
module.fail_json(msg="python library cs required: pip install cs")
cs_zone_facts = AnsibleCloudStackZoneFacts(module=module).run() cs_zone_facts = AnsibleCloudStackZoneFacts(module=module).run()
cs_facts_result = dict(changed=False, ansible_facts=cs_zone_facts) cs_facts_result = dict(changed=False, ansible_facts=cs_zone_facts)
module.exit_json(**cs_facts_result) module.exit_json(**cs_facts_result)

Loading…
Cancel
Save