Various simple linting type cleanups on modules
This commit is contained in:
parent
4ec0ccd5ac
commit
aaf762573e
11 changed files with 8 additions and 14 deletions
|
@ -235,7 +235,6 @@ def create_image(module, ec2):
|
|||
for img in images:
|
||||
if img.name == name:
|
||||
module.exit_json(msg="AMI name already present", image_id=img.id, state=img.state, changed=False)
|
||||
sys.exit(0)
|
||||
else:
|
||||
module.fail_json(msg="Error in retrieving duplicate AMI details")
|
||||
else:
|
||||
|
@ -313,7 +312,6 @@ def deregister_image(module, ec2):
|
|||
module.fail_json(msg = "timed out waiting for image to be reregistered/deleted")
|
||||
|
||||
module.exit_json(msg="AMI deregister/delete operation complete", changed=True)
|
||||
sys.exit(0)
|
||||
|
||||
|
||||
def update_image(module, ec2):
|
||||
|
|
|
@ -179,7 +179,6 @@ def main():
|
|||
|
||||
if state == 'list':
|
||||
module.exit_json(changed=False, tags=tagdict)
|
||||
sys.exit(0)
|
||||
|
||||
# import module snippets
|
||||
from ansible.module_utils.basic import *
|
||||
|
|
|
@ -404,7 +404,7 @@ def modify_dot_attribute(module, ec2, instance, device_name):
|
|||
dot = instance.block_device_mapping[device_name].delete_on_termination
|
||||
except boto.exception.BotoServerError, e:
|
||||
module.fail_json(msg = "%s: %s" % (e.error_code, e.error_message))
|
||||
|
||||
|
||||
if delete_on_termination != dot:
|
||||
try:
|
||||
bdt = BlockDeviceType(delete_on_termination=delete_on_termination)
|
||||
|
@ -413,7 +413,7 @@ def modify_dot_attribute(module, ec2, instance, device_name):
|
|||
|
||||
ec2.modify_instance_attribute(instance_id=instance.id, attribute='blockDeviceMapping', value=bdm)
|
||||
|
||||
while instance.block_device_mapping[device_name].delete_on_termination != delete_on_termination:
|
||||
while instance.block_device_mapping[device_name].delete_on_termination != delete_on_termination:
|
||||
time.sleep(3)
|
||||
instance.update()
|
||||
changed = True
|
||||
|
|
|
@ -520,7 +520,6 @@ def main():
|
|||
|
||||
# Use this snippet to debug through conditionals:
|
||||
# module.exit_json(msg="Bucket return %s"%bucketrtn)
|
||||
# sys.exit(0)
|
||||
|
||||
# Lets check the src path.
|
||||
pathrtn = path_check(src)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python2
|
||||
#!/usr/bin/python
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
# This file is part of Ansible
|
||||
|
|
|
@ -146,7 +146,7 @@ def main():
|
|||
if mysqlvar is None:
|
||||
module.fail_json(msg="Cannot run without variable to operate with")
|
||||
if match('^[0-9a-z_]+$', mysqlvar) is None:
|
||||
module.fail_json(msg="invalid variable name \"%s\"" % mysqlvar)
|
||||
module.fail_json(msg="invalid variable name \"%s\"" % mysqlvar)
|
||||
if not mysqldb_found:
|
||||
module.fail_json(msg="the python mysqldb module is required")
|
||||
else:
|
||||
|
|
|
@ -274,7 +274,6 @@ def main():
|
|||
from ansible.module_utils.basic import *
|
||||
from ansible.module_utils.shell import *
|
||||
from ansible.module_utils.eos import *
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
||||
|
||||
|
|
|
@ -380,7 +380,6 @@ def main():
|
|||
module.exit_json(changed=changed, **args)
|
||||
|
||||
module.fail_json(msg='Unexpected position reached')
|
||||
sys.exit(0)
|
||||
|
||||
# import module snippets
|
||||
from ansible.module_utils.basic import *
|
||||
|
|
|
@ -1172,7 +1172,7 @@ class NetBsdService(Service):
|
|||
distribution = None
|
||||
|
||||
def get_service_tools(self):
|
||||
initpaths = [ '/etc/rc.d' ] # better: $rc_directories - how to get in here? Run: sh -c '. /etc/rc.conf ; echo $rc_directories'
|
||||
initpaths = [ '/etc/rc.d' ] # better: $rc_directories - how to get in here? Run: sh -c '. /etc/rc.conf ; echo $rc_directories'
|
||||
|
||||
for initdir in initpaths:
|
||||
initscript = "%s/%s" % (initdir,self.name)
|
||||
|
@ -1188,7 +1188,7 @@ class NetBsdService(Service):
|
|||
else:
|
||||
self.rcconf_value = "NO"
|
||||
|
||||
rcfiles = [ '/etc/rc.conf' ] # Overkill?
|
||||
rcfiles = [ '/etc/rc.conf' ] # Overkill?
|
||||
for rcfile in rcfiles:
|
||||
if os.path.isfile(rcfile):
|
||||
self.rcconf_file = rcfile
|
||||
|
|
|
@ -356,7 +356,6 @@ def main():
|
|||
result = SysctlModule(module)
|
||||
|
||||
module.exit_json(changed=result.changed)
|
||||
sys.exit(0)
|
||||
|
||||
# import module snippets
|
||||
from ansible.module_utils.basic import *
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# WANT_JSON
|
||||
# POWERSHELL_COMMON
|
||||
|
||||
########
|
||||
|
|
Loading…
Reference in a new issue