internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix undefined variables, basestring usage, and some associated python3 issues

Browse Source
This commit is contained in:
Toshio Kuratomi
2017-07-22 18:15:46 -07:00
parent 9f7b0dfc30
commit 225fa5d092
84 changed files with 652 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ansible/modules/cloud/openstack/os_keystone_domain_facts.py
View File

@@ -103,6 +103,9 @@ try:
except ImportError:
HAS_SHADE = False
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.openstack import openstack_full_argument_spec, openstack_module_kwargs
def main():
@@ -129,7 +132,7 @@ def main():
if name:
# Let's suppose user is passing domain ID
try:
domains = cloud.get_domain(name)
domains = opcloud.get_domain(name)
except:
domains = opcloud.search_domains(filters={'name': name})
@@ -142,8 +145,6 @@ def main():
except shade.OpenStackCloudException as e:
module.fail_json(msg=str(e))
from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *
if __name__ == '__main__':
main()

23
lib/ansible/modules/cloud/openstack/os_server_actions.py
View File

@@ -89,6 +89,9 @@ try:
except ImportError:
HAS_SHADE = False
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.openstack import openstack_full_argument_spec, openstack_module_kwargs
_action_map = {'stop': 'SHUTOFF',
'start': 'ACTIVE',
@@ -102,7 +105,7 @@ _action_map = {'stop': 'SHUTOFF',
_admin_actions = ['pause', 'unpause', 'suspend', 'resume', 'lock', 'unlock']
def _wait(timeout, cloud, server, action):
def _wait(timeout, cloud, server, action, module):
"""Wait for the server to reach the desired state for the given action."""
for count in shade._utils._iterate_timeout(
@@ -166,7 +169,7 @@ def main():
cloud.nova_client.servers.stop(server=server.id)
if wait:
_wait(timeout, cloud, server, action)
_wait(timeout, cloud, server, action, module)
module.exit_json(changed=True)
if action == 'start':
@@ -175,7 +178,7 @@ def main():
cloud.nova_client.servers.start(server=server.id)
if wait:
_wait(timeout, cloud, server, action)
_wait(timeout, cloud, server, action, module)
module.exit_json(changed=True)
if action == 'pause':
@@ -184,7 +187,7 @@ def main():
cloud.nova_client.servers.pause(server=server.id)
if wait:
_wait(timeout, cloud, server, action)
_wait(timeout, cloud, server, action, module)
module.exit_json(changed=True)
elif action == 'unpause':
@@ -193,7 +196,7 @@ def main():
cloud.nova_client.servers.unpause(server=server.id)
if wait:
_wait(timeout, cloud, server, action)
_wait(timeout, cloud, server, action, module)
module.exit_json(changed=True)
elif action == 'lock':
@@ -212,7 +215,7 @@ def main():
cloud.nova_client.servers.suspend(server=server.id)
if wait:
_wait(timeout, cloud, server, action)
_wait(timeout, cloud, server, action, module)
module.exit_json(changed=True)
elif action == 'resume':
@@ -221,7 +224,7 @@ def main():
cloud.nova_client.servers.resume(server=server.id)
if wait:
_wait(timeout, cloud, server, action)
_wait(timeout, cloud, server, action, module)
module.exit_json(changed=True)
elif action == 'rebuild':
@@ -233,14 +236,12 @@ def main():
# rebuild doesn't set a state, just do it
cloud.nova_client.servers.rebuild(server=server.id, image=image.id)
if wait:
_wait(timeout, cloud, server, action)
_wait(timeout, cloud, server, action, module)
module.exit_json(changed=True)
except shade.OpenStackCloudException as e:
module.fail_json(msg=str(e), extra_data=e.extra_data)
# this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *
if __name__ == '__main__':
main()