PEP 8 indent cleanup. (#20800)

* PEP 8 E121 cleanup.

* PEP 8 E126 cleanup.

* PEP 8 E122 cleanup.

lib/ansible/modules/cloud/openstack/_glance_image.py

@@ -173,7 +173,7 @@ def _get_glance_client(module, kwargs):
     token = _ksclient.auth_token
     endpoint =_get_endpoint(module, _ksclient, kwargs.get('endpoint_type'))
     kwargs = {
-            'token': token,
+        'token': token,
     }
     try:
         client = glanceclient.Client('1', endpoint, **kwargs)
@@ -194,12 +194,12 @@ def _glance_image_present(module, params, client):
 
 def _glance_image_create(module, params, client):
     kwargs = {
-                'name':             params.get('name'),
-                'disk_format':      params.get('disk_format'),
-                'container_format': params.get('container_format'),
-                'owner':            params.get('owner'),
-                'is_public':        params.get('is_public'),
-                'copy_from':        params.get('copy_from'),
+        'name':             params.get('name'),
+        'disk_format':      params.get('disk_format'),
+        'container_format': params.get('container_format'),
+        'owner':            params.get('owner'),
+        'is_public':        params.get('is_public'),
+        'copy_from':        params.get('copy_from'),
     }
     try:
         timeout = float(params.get('timeout'))

lib/ansible/modules/cloud/openstack/_keystone_user.py

@@ -332,19 +332,19 @@ def main():
 
     argument_spec = openstack_argument_spec()
     argument_spec.update(dict(
-            tenant_description=dict(required=False),
-            email=dict(required=False),
-            user=dict(required=False),
-            tenant=dict(required=False),
-            password=dict(required=False),
-            role=dict(required=False),
-            state=dict(default='present', choices=['present', 'absent']),
-            endpoint=dict(required=False,
+        tenant_description=dict(required=False),
+        email=dict(required=False),
+        user=dict(required=False),
+        tenant=dict(required=False),
+        password=dict(required=False),
+        role=dict(required=False),
+        state=dict(default='present', choices=['present', 'absent']),
+        endpoint=dict(required=False,
                           default="http://127.0.0.1:35357/v2.0"),
-            token=dict(required=False),
-            login_user=dict(required=False),
-            login_password=dict(required=False),
-            login_tenant_name=dict(required=False)
+        token=dict(required=False),
+        login_user=dict(required=False),
+        login_password=dict(required=False),
+        login_tenant_name=dict(required=False)
     ))
     # keystone operations themselves take an endpoint, not a keystone auth_url
     del(argument_spec['auth_url'])

lib/ansible/modules/cloud/openstack/_nova_compute.py

@@ -428,12 +428,12 @@ def _create_server(module, nova):
     flavor_id = _get_flavor_id(module, nova)
     bootargs = [module.params['name'], image_id, flavor_id]
     bootkwargs = {
-                'nics' : module.params['nics'],
-                'meta' : module.params['meta'],
-                'security_groups': module.params['security_groups'].split(','),
-                #userdata is unhyphenated in novaclient, but hyphenated here for consistency with the ec2 module:
-                'userdata': module.params['user_data'],
-                'config_drive': module.params['config_drive'],
+        'nics' : module.params['nics'],
+        'meta' : module.params['meta'],
+        'security_groups': module.params['security_groups'].split(','),
+        #userdata is unhyphenated in novaclient, but hyphenated here for consistency with the ec2 module:
+        'userdata': module.params['user_data'],
+        'config_drive': module.params['config_drive'],
     }
 
     for optional_param in ('region_name', 'key_name', 'availability_zone', 'scheduler_hints'):

lib/ansible/modules/cloud/openstack/_quantum_floating_ip.py

@@ -136,8 +136,8 @@ def _get_neutron_client(module, kwargs):
     token = _ksclient.auth_token
     endpoint = _get_endpoint(module, _ksclient)
     kwargs = {
-            'token': token,
-            'endpoint_url': endpoint
+        'token': token,
+        'endpoint_url': endpoint
     }
     try:
         neutron = client.Client('2.0', **kwargs)
@@ -174,7 +174,7 @@ def _get_port_info(neutron, module, instance_id, internal_network_name=None):
         subnets = neutron.list_subnets(**kwargs)
         subnet_id = subnets['subnets'][0]['id']
     kwargs = {
-            'device_id': instance_id,
+        'device_id': instance_id,
     }
     try:
         ports = neutron.list_ports(**kwargs)
@@ -193,7 +193,7 @@ def _get_port_info(neutron, module, instance_id, internal_network_name=None):
 
 def _get_floating_ip(module, neutron, fixed_ip_address, network_name):
     kwargs = {
-            'fixed_ip_address': fixed_ip_address
+        'fixed_ip_address': fixed_ip_address
     }
     try:
         ips = neutron.list_floatingips(**kwargs)
@@ -214,9 +214,9 @@ def _check_ips_network(neutron, net_id, network_name):
 
 def _create_floating_ip(neutron, module, port_id, net_id, fixed_ip):
     kwargs = {
-            'port_id': port_id,
-            'floating_network_id': net_id,
-            'fixed_ip_address': fixed_ip
+        'port_id': port_id,
+        'floating_network_id': net_id,
+        'fixed_ip_address': fixed_ip
     }
     try:
         result = neutron.create_floatingip({'floatingip': kwargs})
@@ -251,10 +251,10 @@ def main():
 
     argument_spec = openstack_argument_spec()
     argument_spec.update(dict(
-            network_name                    = dict(required=True),
-            instance_name                   = dict(required=True),
-            state                           = dict(default='present', choices=['absent', 'present']),
-            internal_network_name           = dict(default=None),
+        network_name                    = dict(required=True),
+        instance_name                   = dict(required=True),
+        state                           = dict(default='present', choices=['absent', 'present']),
+        internal_network_name           = dict(default=None),
     ))
     module = AnsibleModule(argument_spec=argument_spec)
 

lib/ansible/modules/cloud/openstack/_quantum_floating_ip_associate.py

@@ -125,8 +125,8 @@ def _get_neutron_client(module, kwargs):
     token = _ksclient.auth_token
     endpoint = _get_endpoint(module, _ksclient)
     kwargs = {
-            'token': token,
-            'endpoint_url': endpoint
+        'token': token,
+        'endpoint_url': endpoint
     }
     try:
         neutron = client.Client('2.0', **kwargs)
@@ -191,9 +191,9 @@ def main():
 
     argument_spec = openstack_argument_spec()
     argument_spec.update(dict(
-            ip_address                      = dict(required=True),
-            instance_name                   = dict(required=True),
-            state                           = dict(default='present', choices=['absent', 'present'])
+        ip_address                      = dict(required=True),
+        instance_name                   = dict(required=True),
+        state                           = dict(default='present', choices=['absent', 'present'])
     ))
     module = AnsibleModule(argument_spec=argument_spec)
 

lib/ansible/modules/cloud/openstack/_quantum_network.py

@@ -167,8 +167,8 @@ def _get_neutron_client(module, kwargs):
     token = _ksclient.auth_token
     endpoint = _get_endpoint(module, _ksclient)
     kwargs = {
-            'token': token,
-            'endpoint_url': endpoint
+        'token': token,
+        'endpoint_url': endpoint
     }
     try:
         neutron = client.Client('2.0', **kwargs)
@@ -192,8 +192,8 @@ def _set_tenant_id(module):
 
 def _get_net_id(neutron, module):
     kwargs = {
-            'tenant_id': _os_tenant_id,
-            'name': module.params['name'],
+        'tenant_id': _os_tenant_id,
+        'name': module.params['name'],
     }
     try:
         networks = neutron.list_networks(**kwargs)
@@ -251,15 +251,15 @@ def main():
 
     argument_spec = openstack_argument_spec()
     argument_spec.update(dict(
-            name                            = dict(required=True),
-            tenant_name                     = dict(default=None),
-            provider_network_type           = dict(default=None, choices=['local', 'vlan', 'flat', 'gre']),
-            provider_physical_network       = dict(default=None),
-            provider_segmentation_id        = dict(default=None),
-            router_external                 = dict(default=False, type='bool'),
-            shared                          = dict(default=False, type='bool'),
-            admin_state_up                  = dict(default=True, type='bool'),
-            state                           = dict(default='present', choices=['absent', 'present'])
+        name                            = dict(required=True),
+        tenant_name                     = dict(default=None),
+        provider_network_type           = dict(default=None, choices=['local', 'vlan', 'flat', 'gre']),
+        provider_physical_network       = dict(default=None),
+        provider_segmentation_id        = dict(default=None),
+        router_external                 = dict(default=False, type='bool'),
+        shared                          = dict(default=False, type='bool'),
+        admin_state_up                  = dict(default=True, type='bool'),
+        state                           = dict(default='present', choices=['absent', 'present'])
     ))
     module = AnsibleModule(argument_spec=argument_spec)
 

lib/ansible/modules/cloud/openstack/_quantum_router.py

@@ -129,8 +129,8 @@ def _get_neutron_client(module, kwargs):
     token = _ksclient.auth_token
     endpoint = _get_endpoint(module, _ksclient)
     kwargs = {
-            'token': token,
-            'endpoint_url': endpoint
+        'token': token,
+        'endpoint_url': endpoint
     }
     try:
         neutron = client.Client('2.0', **kwargs)
@@ -154,8 +154,8 @@ def _set_tenant_id(module):
 
 def _get_router_id(module, neutron):
     kwargs = {
-            'name': module.params['name'],
-            'tenant_id': _os_tenant_id,
+        'name': module.params['name'],
+        'tenant_id': _os_tenant_id,
     }
     try:
         routers = neutron.list_routers(**kwargs)
@@ -167,9 +167,9 @@ def _get_router_id(module, neutron):
 
 def _create_router(module, neutron):
     router = {
-            'name': module.params['name'],
-            'tenant_id': _os_tenant_id,
-            'admin_state_up': module.params['admin_state_up'],
+        'name': module.params['name'],
+        'tenant_id': _os_tenant_id,
+        'admin_state_up': module.params['admin_state_up'],
     }
     try:
         new_router = neutron.create_router(dict(router=router))

lib/ansible/modules/cloud/openstack/_quantum_router_gateway.py

@@ -123,8 +123,8 @@ def _get_neutron_client(module, kwargs):
     token = _ksclient.auth_token
     endpoint = _get_endpoint(module, _ksclient)
     kwargs = {
-            'token': token,
-            'endpoint_url': endpoint
+        'token': token,
+        'endpoint_url': endpoint
     }
     try:
         neutron = client.Client('2.0', **kwargs)
@@ -134,7 +134,7 @@ def _get_neutron_client(module, kwargs):
 
 def _get_router_id(module, neutron):
     kwargs = {
-            'name': module.params['router_name'],
+        'name': module.params['router_name'],
     }
     try:
         routers = neutron.list_routers(**kwargs)
@@ -191,9 +191,9 @@ def main():
 
     argument_spec = openstack_argument_spec()
     argument_spec.update(dict(
-            router_name        = dict(required=True),
-            network_name       = dict(required=True),
-            state              = dict(default='present', choices=['absent', 'present']),
+        router_name        = dict(required=True),
+        network_name       = dict(required=True),
+        state              = dict(default='present', choices=['absent', 'present']),
     ))
     module = AnsibleModule(argument_spec=argument_spec)
     if not HAVE_DEPS:

lib/ansible/modules/cloud/openstack/_quantum_router_interface.py

@@ -132,8 +132,8 @@ def _get_neutron_client(module, kwargs):
     token = _ksclient.auth_token
     endpoint = _get_endpoint(module, _ksclient)
     kwargs = {
-            'token': token,
-            'endpoint_url': endpoint
+        'token': token,
+        'endpoint_url': endpoint
     }
     try:
         neutron = client.Client('2.0', **kwargs)
@@ -171,8 +171,8 @@ def _get_router_id(module, neutron):
 def _get_subnet_id(module, neutron):
     subnet_id = None
     kwargs = {
-            'tenant_id': _os_tenant_id,
-            'name': module.params['subnet_name'],
+        'tenant_id': _os_tenant_id,
+        'name': module.params['subnet_name'],
     }
     try:
         subnets = neutron.list_subnets(**kwargs)
@@ -184,8 +184,8 @@ def _get_subnet_id(module, neutron):
 
 def _get_port_id(neutron, module, router_id, subnet_id):
     kwargs = {
-            'tenant_id': _os_tenant_id,
-            'device_id': router_id,
+        'tenant_id': _os_tenant_id,
+        'device_id': router_id,
     }
     try:
         ports = neutron.list_ports(**kwargs)
@@ -222,10 +222,10 @@ def _remove_interface_router(neutron, module, router_id, subnet_id):
 def main():
     argument_spec = openstack_argument_spec()
     argument_spec.update(dict(
-            router_name                     = dict(required=True),
-            subnet_name                     = dict(required=True),
-            tenant_name                     = dict(default=None),
-            state                           = dict(default='present', choices=['absent', 'present']),
+        router_name                     = dict(required=True),
+        subnet_name                     = dict(required=True),
+        tenant_name                     = dict(default=None),
+        state                           = dict(default='present', choices=['absent', 'present']),
     ))
     module = AnsibleModule(argument_spec=argument_spec)
     if not HAVE_DEPS:

lib/ansible/modules/cloud/openstack/_quantum_subnet.py

@@ -168,8 +168,8 @@ def _get_neutron_client(module, kwargs):
     token     = _ksclient.auth_token
     endpoint  = _get_endpoint(module, _ksclient)
     kwargs = {
-            'token':        token,
-            'endpoint_url': endpoint
+        'token':        token,
+        'endpoint_url': endpoint
     }
     try:
         neutron = client.Client('2.0', **kwargs)
@@ -227,14 +227,14 @@ def _get_subnet_id(module, neutron):
 def _create_subnet(module, neutron):
     neutron.format = 'json'
     subnet = {
-            'name':            module.params['name'],
-            'ip_version':      module.params['ip_version'],
-            'enable_dhcp':     module.params['enable_dhcp'],
-            'tenant_id':       _os_tenant_id,
-            'gateway_ip':      module.params['gateway_ip'],
-            'dns_nameservers': module.params['dns_nameservers'],
-            'network_id':      _os_network_id,
-            'cidr':            module.params['cidr'],
+        'name':            module.params['name'],
+        'ip_version':      module.params['ip_version'],
+        'enable_dhcp':     module.params['enable_dhcp'],
+        'tenant_id':       _os_tenant_id,
+        'gateway_ip':      module.params['gateway_ip'],
+        'dns_nameservers': module.params['dns_nameservers'],
+        'network_id':      _os_network_id,
+        'cidr':            module.params['cidr'],
     }
     if module.params['allocation_pool_start'] and module.params['allocation_pool_end']:
         allocation_pools = [
@@ -269,17 +269,17 @@ def main():
 
     argument_spec = openstack_argument_spec()
     argument_spec.update(dict(
-            name                    = dict(required=True),
-            network_name            = dict(required=True),
-            cidr                    = dict(required=True),
-            tenant_name             = dict(default=None),
-            state                   = dict(default='present', choices=['absent', 'present']),
-            ip_version              = dict(default='4', choices=['4', '6']),
-            enable_dhcp             = dict(default='true', type='bool'),
-            gateway_ip              = dict(default=None),
-            dns_nameservers         = dict(default=None),
-            allocation_pool_start   = dict(default=None),
-            allocation_pool_end     = dict(default=None),
+        name                    = dict(required=True),
+        network_name            = dict(required=True),
+        cidr                    = dict(required=True),
+        tenant_name             = dict(default=None),
+        state                   = dict(default='present', choices=['absent', 'present']),
+        ip_version              = dict(default='4', choices=['4', '6']),
+        enable_dhcp             = dict(default='true', type='bool'),
+        gateway_ip              = dict(default=None),
+        dns_nameservers         = dict(default=None),
+        allocation_pool_start   = dict(default=None),
+        allocation_pool_end     = dict(default=None),
     ))
     module = AnsibleModule(argument_spec=argument_spec)
     if not HAVE_DEPS:

lib/ansible/modules/cloud/openstack/os_auth.py

@@ -64,8 +64,8 @@ def main():
         module.exit_json(
             changed=False,
             ansible_facts=dict(
-              auth_token=cloud.auth_token,
-              service_catalog=cloud.service_catalog))
+                auth_token=cloud.auth_token,
+                service_catalog=cloud.service_catalog))
     except shade.OpenStackCloudException as e:
         module.fail_json(msg=str(e))
 

lib/ansible/modules/cloud/openstack/os_quota.py

@@ -345,9 +345,9 @@ def _system_state_change(module, project_quota_output):
     """
 
     changes_required, quota_change_request = _system_state_change_details(
-            module,
-            project_quota_output
-        )
+        module,
+        project_quota_output
+    )
 
     if changes_required:
         return True
@@ -452,9 +452,9 @@ def main():
                 module.exit_json(changed=_system_state_change(module, project_quota_output))
 
             changes_required, quota_change_request = _system_state_change_details(
-                    module,
-                    project_quota_output
-                )
+                module,
+                project_quota_output
+            )
 
             if changes_required:
                 for quota_type in quota_change_request.keys():

lib/ansible/modules/cloud/openstack/os_recordset.py

@@ -215,10 +215,10 @@ def main():
                                                zone, pre_update_recordset)
                 if changed:
                     zone = cloud.update_recordset(
-                                zone, name + '.' + zone,
-                                records=records,
-                                description=description,
-                                ttl=ttl)
+                        zone, name + '.' + zone,
+                        records=records,
+                        description=description,
+                        ttl=ttl)
             module.exit_json(changed=changed, recordset=recordset)
 
         elif state == 'absent':

lib/ansible/modules/cloud/openstack/os_zone.py

@@ -212,9 +212,9 @@ def main():
                                                masters, pre_update_zone)
                 if changed:
                     zone = cloud.update_zone(
-                                name, email=email,
-                                description=description,
-                                ttl=ttl, masters=masters)
+                        name, email=email,
+                        description=description,
+                        ttl=ttl, masters=masters)
             module.exit_json(changed=changed, zone=zone)
 
         elif state == 'absent':