PEP 8 E111 & E114 cleanup. (#20838)

contrib/inventory/abiquo.py

@@ -130,18 +130,18 @@ def generate_inv_from_api(enterprise_entity,config):
             if (config.getboolean('defaults', 'public_ip_only')) == True:
                 for link in vmcollection['links']:
                     if (link['type']=='application/vnd.abiquo.publicip+json' and link['rel']=='ip'):
-                      vm_nic = link['title']
-                      break
+                        vm_nic = link['title']
+                        break
                     else:
-                      vm_nic = None
+                        vm_nic = None
             # Otherwise, assigning defined network interface IP address
             else:
                 for link in vmcollection['links']:
                     if (link['rel']==config.get('defaults', 'default_net_interface')):
-                      vm_nic = link['title']
-                      break
+                        vm_nic = link['title']
+                        break
                     else:
-                      vm_nic = None
+                        vm_nic = None
 
             vm_state = True
             # From abiquo.ini: Only adding to inventory VMs deployed

contrib/inventory/docker.py

@@ -735,7 +735,7 @@ class DockerInventory(object):
 
             cert_path = def_cert_path or self._args.cert_path or self._env_args.cert_path
             if cert_path and cert_path == self._env_args.cert_path:
-                    cert_path = os.path.join(cert_path, 'cert.pem')
+                cert_path = os.path.join(cert_path, 'cert.pem')
 
             cacert_path = def_cacert_path or self._args.cacert_path or self._env_args.cert_path
             if cacert_path and cacert_path == self._env_args.cert_path:

contrib/inventory/ec2.py

@@ -308,13 +308,13 @@ class Ec2Inventory(object):
         if self.all_instances:
             self.ec2_instance_states = ec2_valid_instance_states
         elif config.has_option('ec2', 'instance_states'):
-          for instance_state in config.get('ec2', 'instance_states').split(','):
-            instance_state = instance_state.strip()
-            if instance_state not in ec2_valid_instance_states:
-              continue
-            self.ec2_instance_states.append(instance_state)
+            for instance_state in config.get('ec2', 'instance_states').split(','):
+                instance_state = instance_state.strip()
+                if instance_state not in ec2_valid_instance_states:
+                    continue
+                self.ec2_instance_states.append(instance_state)
         else:
-          self.ec2_instance_states = ['running']
+            self.ec2_instance_states = ['running']
 
         # Return all RDS instances? (if RDS is enabled)
         if config.has_option('ec2', 'all_rds_instances') and self.rds_enabled:

contrib/inventory/nsot.py

@@ -151,7 +151,7 @@ from click.exceptions import UsageError
 from six import string_types
 
 def warning(*objs):
-        print("WARNING: ", *objs, file=sys.stderr)
+    print("WARNING: ", *objs, file=sys.stderr)
 
 
 class NSoTInventory(object):

contrib/inventory/softlayer.py

@@ -169,7 +169,7 @@ class SoftLayerInventory(object):
 
         # Inventory: group by tag
         for tag in instance['tagReferences']:
-             self.push(self.inventory, tag['tag']['name'], dest)
+            self.push(self.inventory, tag['tag']['name'], dest)
 
     def get_virtual_servers(self):
         '''Get all the CCI instances'''

contrib/inventory/spacewalk.py

@@ -187,7 +187,7 @@ if options.list:
 
                 groups[group_name].add(system['spacewalk_server_name'])
                 if system['spacewalk_server_name'] in host_vars and not system['spacewalk_server_name'] in meta[ "hostvars" ]:
-                        meta[ "hostvars" ][ system['spacewalk_server_name'] ] = host_vars[ system['spacewalk_server_name'] ]
+                    meta[ "hostvars" ][ system['spacewalk_server_name'] ] = host_vars[ system['spacewalk_server_name'] ]
 
     except (OSError) as e:
         print('Problem executing the command "%s system-groups-systems": %s' %

contrib/inventory/vbox.py

@@ -24,10 +24,10 @@ except ImportError:
     import simplejson as json
 
 class SetEncoder(json.JSONEncoder):
-   def default(self, obj):
-      if isinstance(obj, set):
-         return list(obj)
-      return json.JSONEncoder.default(self, obj)
+    def default(self, obj):
+        if isinstance(obj, set):
+            return list(obj)
+        return json.JSONEncoder.default(self, obj)
 
 VBOX="VBoxManage"
 

contrib/inventory/zone.py

@@ -27,10 +27,10 @@ result['all'] = {}
 pipe = Popen(['zoneadm', 'list', '-ip'], stdout=PIPE, universal_newlines=True)
 result['all']['hosts'] = []
 for l in pipe.stdout.readlines():
-  # 1:work:running:/zones/work:3126dc59-9a07-4829-cde9-a816e4c5040e:native:shared
-  s = l.split(':')
-  if s[1] != 'global':
-    result['all']['hosts'].append(s[1])
+    # 1:work:running:/zones/work:3126dc59-9a07-4829-cde9-a816e4c5040e:native:shared
+    s = l.split(':')
+    if s[1] != 'global':
+        result['all']['hosts'].append(s[1])
 
 result['all']['vars'] = {}
 result['all']['vars']['ansible_connection'] = 'zone'