@@ -446,7 +446,7 @@ class AzureInventory(object):

     def _parse_cli_args(self):

         # Parse command line arguments

         parser = argparse.ArgumentParser(

-                description='Produce an Ansible Inventory file for an Azure subscription')

+            description='Produce an Ansible Inventory file for an Azure subscription')

         parser.add_argument('--list', action='store_true', default=True,

                            help='List instances (default: True)')

         parser.add_argument('--debug', action='store_true', default=False,

@@ -199,8 +199,8 @@ class CloudStackInventory(object):

                 group_name = group['name']

                 if group_name and not group_name in data:

                     data[group_name] = {

-                            'hosts': []

-                        }

+                        'hosts': []

+                    }

         hosts = self.cs.listVirtualMachines(projectid=project_id, domainid=domain_id)

         if not hosts:

@@ -252,10 +252,10 @@ class ConsulInventory(object):

                       ok = 'passing' == check['Status']

                       if ok:

                         suffix = self.config.get_availability_suffix(

-                                    'available_suffix', '_available')

+                            'available_suffix', '_available')

                       else:

                         suffix = self.config.get_availability_suffix(

-                                    'unavailable_suffix', '_unavailable')

+                            'unavailable_suffix', '_unavailable')

                       self.add_node_to_map(self.nodes_by_availability,

                                             service_name + suffix, node['Node'])

@@ -353,12 +353,12 @@ or environment variables (DO_API_TOKEN)\n''')

     def build_inventory(self):

         '''Build Ansible inventory of droplets'''

         self.inventory = {

-                            'all': {

-                                    'hosts': [],

-                                    'vars': self.group_variables

-                                   },

-                            '_meta': {'hostvars': {}}

-                        }

+            'all': {

+                'hosts': [],

+                'vars': self.group_variables

+                },

+            '_meta': {'hostvars': {}}

+            }

         # add all droplets by id and name

         for droplet in self.data['droplets']:

@@ -379,22 +379,22 @@ or environment variables (DO_API_TOKEN)\n''')

             # groups that are always present

             for group in [

-                            'region_' + droplet['region']['slug'],

-                            'image_' + str(droplet['image']['id']),

-                            'size_' + droplet['size']['slug'],

-                            'distro_' + self.to_safe(droplet['image']['distribution']),

-                            'status_' + droplet['status'],

+                'region_' + droplet['region']['slug'],

+                'image_' + str(droplet['image']['id']),

+                'size_' + droplet['size']['slug'],

+                'distro_' + self.to_safe(droplet['image']['distribution']),

+                'status_' + droplet['status'],

-                        ]:

+                ]:

                 if group not in self.inventory:

                     self.inventory[group] = { 'hosts': [ ], 'vars': {} }

                 self.inventory[group]['hosts'].append(dest)

             # groups that are not always present

             for group in [

-                            droplet['image']['slug'],

-                            droplet['image']['name']

-                         ]:

+                droplet['image']['slug'],

+                droplet['image']['name']

+                ]:

                 if group:

                     image = 'image_' + self.to_safe(group)

                     if image not in self.inventory:

@@ -676,7 +676,7 @@ class DockerInventory(object):

             # use hosts from config file

             for host in hosts_list:

                 docker_host = host.get('host') or def_host or self._args.docker_host or \

-                              self._env_args.docker_host or DEFAULT_DOCKER_HOST

+                    self._env_args.docker_host or DEFAULT_DOCKER_HOST

                 api_version = host.get('version') or def_version or self._args.api_version or \

                     self._env_args.api_version or DEFAULT_DOCKER_API_VERSION

                 tls_hostname = host.get('tls_hostname') or def_tls_hostname or self._args.tls_hostname or \

@@ -816,7 +816,7 @@ class DockerInventory(object):

         default_config = basename + '.yml'

         parser = argparse.ArgumentParser(

-                description='Return Ansible inventory for one or more Docker hosts.')

+            description='Return Ansible inventory for one or more Docker hosts.')

         parser.add_argument('--list', action='store_true', default=True,

                            help='List all containers (default: True)')

         parser.add_argument('--debug', action='store_true', default=False,

@@ -323,7 +323,7 @@ class GceInventory(object):

         ''' Command line argument processing '''

         parser = argparse.ArgumentParser(

-                description='Produce an Ansible Inventory file based on GCE')

+            description='Produce an Ansible Inventory file based on GCE')

         parser.add_argument('--list', action='store_true', default=True,

                            help='List instances (default: True)')

         parser.add_argument('--host', action='store',

@@ -109,7 +109,7 @@ def print_host(host):

 def get_args(args_list):

     parser = argparse.ArgumentParser(

-            description='ansible inventory script parsing .ssh/config')

+        description='ansible inventory script parsing .ssh/config')

     mutex_group = parser.add_mutually_exclusive_group(required=True)

     help_list = 'list all hosts from .ssh/config inventory'

     mutex_group.add_argument('--list', action='store_true', help=help_list)

@@ -230,17 +230,17 @@ htmlhelp_basename = 'Ansibledoc'

 # -- Options for LaTeX output ---------------------------------------------

 latex_elements = {

-# The paper size ('letterpaper' or 'a4paper').

-#'papersize': 'letterpaper',

+    # The paper size ('letterpaper' or 'a4paper').

+    #'papersize': 'letterpaper',

-# The font size ('10pt', '11pt' or '12pt').

-#'pointsize': '10pt',

+    # The font size ('10pt', '11pt' or '12pt').

+    #'pointsize': '10pt',

-# Additional stuff for the LaTeX preamble.

-#'preamble': '',

+    # Additional stuff for the LaTeX preamble.

+    #'preamble': '',

-# Latex figure (float) alignment

-#'figure_align': 'htbp',

+    # Latex figure (float) alignment

+    #'figure_align': 'htbp',

 }

 # Grouping the document tree into LaTeX files. List of tuples

@@ -203,7 +203,7 @@ htmlhelp_basename = 'Poseidodoc'

 # (source start file, target name, title, author, document class

 # [howto/manual]).

 latex_documents = [

-  ('index', 'ansible.tex', 'Ansible 2.2 Documentation', AUTHOR, 'manual'),

+    ('index', 'ansible.tex', 'Ansible 2.2 Documentation', AUTHOR, 'manual'),

 ]

 # The name of an image file (relative to this directory) to place at the top of

@@ -203,7 +203,7 @@ htmlhelp_basename = 'Poseidodoc'

 # (source start file, target name, title, author, document class

 # [howto/manual]).

 latex_documents = [

-  ('index', 'ansible.tex', 'Ansible 1.2 Documentation',

+    ('index', 'ansible.tex', 'Ansible 1.2 Documentation',

    AUTHOR, 'manual'),

 ]

@@ -238,21 +238,21 @@ htmlhelp_basename = 'dev_guidedoc'

 # -- Options for LaTeX output ---------------------------------------------

 latex_elements = {

-     # The paper size ('letterpaper' or 'a4paper').

-     #

-     # 'papersize': 'letterpaper',

+    # The paper size ('letterpaper' or 'a4paper').

+    #

+    # 'papersize': 'letterpaper',

-     # The font size ('10pt', '11pt' or '12pt').

-     #

-     # 'pointsize': '10pt',

+    # The font size ('10pt', '11pt' or '12pt').

+    #

+    # 'pointsize': '10pt',

-     # Additional stuff for the LaTeX preamble.

-     #

-     # 'preamble': '',

+    # Additional stuff for the LaTeX preamble.

+    #

+    # 'preamble': '',

-     # Latex figure (float) alignment

-     #

-     # 'figure_align': 'htbp',

+    # Latex figure (float) alignment

+    #

+    # 'figure_align': 'htbp',

 }

 # Grouping the document tree into LaTeX files. List of tuples

@@ -48,11 +48,11 @@ def main():

     # create play with tasks

     play_source = dict(

-            name = "Ansible Play",

-            hosts = host_list,

-            gather_facts = 'no',

-            tasks = [ dict(action=dict(module='command', args=dict(cmd='/usr/bin/uptime'))) ]

-        )

+        name = "Ansible Play",

+        hosts = host_list,

+        gather_facts = 'no',

+        tasks = [ dict(action=dict(module='command', args=dict(cmd='/usr/bin/uptime'))) ]

+    )

     play = Play().load(play_source, variable_manager=variable_manager, loader=loader)

     # actually run it

@@ -60,12 +60,12 @@ def main():

     callback = ResultsCollector()

     try:

         tqm = TaskQueueManager(

-                inventory=inventory,

-                variable_manager=variable_manager,

-                loader=loader,

-                options=options,

-                passwords=passwords,

-            )

+            inventory=inventory,

+            variable_manager=variable_manager,

+            loader=loader,

+            options=options,

+            passwords=passwords,

+        )

         tqm._stdout_callback = callback

         result = tqm.run(play)

     finally:

@@ -15,23 +15,23 @@ import json

 import sys

 filelist = [

-        '/etc/oracle-release',

-        '/etc/slackware-version',

-        '/etc/redhat-release',

-        '/etc/vmware-release',

-        '/etc/openwrt_release',

-        '/etc/system-release',

-        '/etc/alpine-release',

-        '/etc/release',

-        '/etc/arch-release',

-        '/etc/os-release',

-        '/etc/SuSE-release',

-        '/etc/gentoo-release',

-        '/etc/os-release',

-        '/etc/lsb-release',

-        '/etc/altlinux-release',

-        '/etc/os-release',

-        '/etc/coreos/update.conf',

+    '/etc/oracle-release',

+    '/etc/slackware-version',

+    '/etc/redhat-release',

+    '/etc/vmware-release',

+    '/etc/openwrt_release',

+    '/etc/system-release',

+    '/etc/alpine-release',

+    '/etc/release',

+    '/etc/arch-release',

+    '/etc/os-release',

+    '/etc/SuSE-release',

+    '/etc/gentoo-release',

+    '/etc/os-release',

+    '/etc/lsb-release',

+    '/etc/altlinux-release',

+    '/etc/os-release',

+    '/etc/coreos/update.conf',

 ]

 fcont = {}

@@ -187,15 +187,15 @@ class AdHocCLI(CLI):

         self._tqm = None

         try:

             self._tqm = TaskQueueManager(

-                    inventory=inventory,

-                    variable_manager=variable_manager,

-                    loader=loader,

-                    options=self.options,

-                    passwords=passwords,

-                    stdout_callback=cb,

-                    run_additional_callbacks=C.DEFAULT_LOAD_CALLBACK_PLUGINS,

-                    run_tree=run_tree,

-                )

+                inventory=inventory,

+                variable_manager=variable_manager,

+                loader=loader,

+                options=self.options,

+                passwords=passwords,

+                stdout_callback=cb,

+                run_additional_callbacks=C.DEFAULT_LOAD_CALLBACK_PLUGINS,

+                run_tree=run_tree,

+            )

             result = self._tqm.run(play)

         finally:

@@ -198,15 +198,15 @@ class ConsoleCLI(CLI, cmd.Cmd):

             self._tqm = None

             try:

                 self._tqm = TaskQueueManager(

-                        inventory=self.inventory,

-                        variable_manager=self.variable_manager,

-                        loader=self.loader,

-                        options=self.options,

-                        passwords=self.passwords,

-                        stdout_callback=cb,

-                        run_additional_callbacks=C.DEFAULT_LOAD_CALLBACK_PLUGINS,

-                        run_tree=False,

-                    )

+                    inventory=self.inventory,

+                    variable_manager=self.variable_manager,

+                    loader=self.loader,

+                    options=self.options,

+                    passwords=self.passwords,

+                    stdout_callback=cb,

+                    run_additional_callbacks=C.DEFAULT_LOAD_CALLBACK_PLUGINS,

+                    run_tree=False,

+                )

                 result = self._tqm.run(play)

             finally:

@@ -42,7 +42,7 @@ if _system_six:

             not hasattr(_system_six, 'byte2int') or

             not hasattr(_system_six, 'add_metaclass') or

             not hasattr(_system_six.moves, 'urllib')

-            ):

+           ):

         _system_six = False

@@ -177,7 +177,7 @@ class PlayIterator:

         setup_task.name = 'Gathering Facts'

         setup_task.tags   = ['always']

         setup_task.args   = {

-          'gather_subset': gather_subset,

+            'gather_subset': gather_subset,

         }

         if gather_timeout:

             setup_task.args['gather_timeout'] = gather_timeout

@@ -35,26 +35,26 @@ BOOLEANS = BOOLEANS_TRUE + BOOLEANS_FALSE

 SIZE_RANGES = { 'Y': 1<<80, 'Z': 1<<70, 'E': 1<<60, 'P': 1<<50, 'T': 1<<40, 'G': 1<<30, 'M': 1<<20, 'K': 1<<10, 'B': 1 }

 FILE_ATTRIBUTES = {

-  'A': 'noatime',

-  'a': 'append',

-  'c': 'compressed',

-  'C': 'nocow',

-  'd': 'nodump',

-  'D': 'dirsync',

-  'e': 'extents',

-  'E': 'encrypted',

-  'h': 'blocksize',

-  'i': 'immutable',

-  'I': 'indexed',

-  'j': 'journalled',

-  'N': 'inline',

-  's': 'zero',

-  'S': 'synchronous',

-  't': 'notail',

-  'T': 'blockroot',

-  'u': 'undelete',

-  'X': 'compressedraw',

-  'Z': 'compresseddirty',

+    'A': 'noatime',

+    'a': 'append',

+    'c': 'compressed',

+    'C': 'nocow',

+    'd': 'nodump',

+    'D': 'dirsync',

+    'e': 'extents',

+    'E': 'encrypted',

+    'h': 'blocksize',

+    'i': 'immutable',

+    'I': 'indexed',

+    'j': 'journalled',

+    'N': 'inline',

+    's': 'zero',

+    'S': 'synchronous',

+    't': 'notail',

+    'T': 'blockroot',

+    'u': 'undelete',

+    'X': 'compressedraw',

+    'Z': 'compresseddirty',

 }

 # ansible modules can be written in any language.  To simplify

@@ -728,19 +728,19 @@ class AnsibleModule(object):

         self._set_defaults(pre=True)

         self._CHECK_ARGUMENT_TYPES_DISPATCHER = {

-                'str': self._check_type_str,

-                'list': self._check_type_list,

-                'dict': self._check_type_dict,

-                'bool': self._check_type_bool,

-                'int': self._check_type_int,

-                'float': self._check_type_float,

-                'path': self._check_type_path,

-                'raw': self._check_type_raw,

-                'jsonarg': self._check_type_jsonarg,

-                'json': self._check_type_jsonarg,

-                'bytes': self._check_type_bytes,

-                'bits': self._check_type_bits,

-            }

+            'str': self._check_type_str,

+            'list': self._check_type_list,

+            'dict': self._check_type_dict,

+            'bool': self._check_type_bool,

+            'int': self._check_type_int,

+            'float': self._check_type_float,

+            'path': self._check_type_path,

+            'raw': self._check_type_raw,

+            'jsonarg': self._check_type_jsonarg,

+            'json': self._check_type_jsonarg,

+            'bytes': self._check_type_bytes,

+            'bits': self._check_type_bits,

+        }

         if not bypass_checks:

             self._check_required_arguments()

             self._check_argument_types()

@@ -1078,22 +1078,22 @@ class LinuxHardware(Hardware):

             memstats['swap:used'] = memstats['swaptotal'] - memstats['swapfree']

         self.facts['memory_mb'] = {

-                     'real' : {

-                         'total': memstats.get('memtotal'),

-                         'used': memstats.get('real:used'),

-                         'free': memstats.get('memfree'),

-                     },

-                     'nocache' : {

-                         'free': memstats.get('nocache:free'),

-                         'used': memstats.get('nocache:used'),

-                     },

-                     'swap' : {

-                         'total': memstats.get('swaptotal'),

-                         'free': memstats.get('swapfree'),

-                         'used': memstats.get('swap:used'),

-                         'cached': memstats.get('swapcached'),

-                     },

-                 }

+            'real' : {

+                'total': memstats.get('memtotal'),

+                'used': memstats.get('real:used'),

+                'free': memstats.get('memfree'),

+                },

+            'nocache' : {

+                'free': memstats.get('nocache:free'),

+                'used': memstats.get('nocache:used'),

+                },

+            'swap' : {

+                'total': memstats.get('swaptotal'),

+                'free': memstats.get('swapfree'),

+                'used': memstats.get('swap:used'),

+                'cached': memstats.get('swapcached'),

+                },

+            }

     def get_cpu_facts(self):

         i = 0

@@ -1212,15 +1212,15 @@ class LinuxHardware(Hardware):

                             "CompactPCI", "AdvancedTCA", "Blade" ]

             DMI_DICT = {

-                    'bios_date': '/sys/devices/virtual/dmi/id/bios_date',

-                    'bios_version': '/sys/devices/virtual/dmi/id/bios_version',

-                    'form_factor': '/sys/devices/virtual/dmi/id/chassis_type',

-                    'product_name': '/sys/devices/virtual/dmi/id/product_name',

-                    'product_serial': '/sys/devices/virtual/dmi/id/product_serial',

-                    'product_uuid': '/sys/devices/virtual/dmi/id/product_uuid',

-                    'product_version': '/sys/devices/virtual/dmi/id/product_version',

-                    'system_vendor': '/sys/devices/virtual/dmi/id/sys_vendor'

-                    }

+                'bios_date': '/sys/devices/virtual/dmi/id/bios_date',

+                'bios_version': '/sys/devices/virtual/dmi/id/bios_version',

+                'form_factor': '/sys/devices/virtual/dmi/id/chassis_type',

+                'product_name': '/sys/devices/virtual/dmi/id/product_name',

+                'product_serial': '/sys/devices/virtual/dmi/id/product_serial',

+                'product_uuid': '/sys/devices/virtual/dmi/id/product_uuid',

+                'product_version': '/sys/devices/virtual/dmi/id/product_version',

+                'system_vendor': '/sys/devices/virtual/dmi/id/sys_vendor'

+                }

             for (key,path) in DMI_DICT.items():

                 data = get_file_content(path)

@@ -1239,15 +1239,15 @@ class LinuxHardware(Hardware):

             # Fall back to using dmidecode, if available

             dmi_bin = self.module.get_bin_path('dmidecode')

             DMI_DICT = {

-                    'bios_date': 'bios-release-date',

-                    'bios_version': 'bios-version',

-                    'form_factor': 'chassis-type',

-                    'product_name': 'system-product-name',

-                    'product_serial': 'system-serial-number',

-                    'product_uuid': 'system-uuid',

-                    'product_version': 'system-version',

-                    'system_vendor': 'system-manufacturer'

-                    }

+                'bios_date': 'bios-release-date',

+                'bios_version': 'bios-version',

+                'form_factor': 'chassis-type',

+                'product_name': 'system-product-name',

+                'product_serial': 'system-serial-number',

+                'product_uuid': 'system-uuid',

+                'product_version': 'system-version',

+                'system_vendor': 'system-manufacturer'

+                }

             for (k, v) in DMI_DICT.items():

                 if dmi_bin is not None:

                     (rc, out, err) = self.module.run_command('%s -s %s' % (dmi_bin, v))

@@ -77,7 +77,7 @@ def _get_gcp_ansible_credentials(module):

 def _get_gcp_environ_var(var_name, default_value):

     """Wrapper around os.environ.get call."""

     return os.environ.get(

-            var_name, default_value)

+        var_name, default_value)

 def _get_gcp_environment_credentials(service_account_email, credentials_file, project_id):

     """Helper to look in environment variables for credentials."""

@@ -315,7 +315,7 @@ def get_google_cloud_credentials(module, scopes=[]):

                 credentials = credentials.with_scopes(scopes)

         else:

             credentials = google.auth.default(

-                    scopes=scopes)[0]

+                scopes=scopes)[0]

         return (credentials, conn_params)

     except Exception as e:

@@ -103,7 +103,7 @@ class Nxapi(NxapiConfigMixin):

             command_type = self.OUTPUT_TO_COMMAND_TYPE[output]

         except KeyError:

             msg = 'invalid format, received %s, expected one of %s' % \

-                    (output, ','.join(self.OUTPUT_TO_COMMAND_TYPE.keys()))

+                (output, ','.join(self.OUTPUT_TO_COMMAND_TYPE.keys()))

             self._error(msg=msg)

         if isinstance(commands, (list, set, tuple)):

@@ -141,7 +141,7 @@ class Rhsm(RegistrationBase):

         # Quick version...

         if False:

             return os.path.isfile('/etc/pki/consumer/cert.pem') and \

-                   os.path.isfile('/etc/pki/consumer/key.pem')

+                os.path.isfile('/etc/pki/consumer/key.pem')

         args = ['subscription-manager', 'identity']

         rc, stdout, stderr = self.module.run_command(args, check_rc=False)

@@ -698,19 +698,19 @@ def terminate_vpc(module, vpc_conn, vpc_id=None, cidr=None):

 def main():

     argument_spec = ec2_argument_spec()

     argument_spec.update(dict(

-            cidr_block = dict(),

-            instance_tenancy = dict(choices=['default', 'dedicated'], default='default'),

-            wait = dict(type='bool', default=False),

-            wait_timeout = dict(default=300),

-            dns_support = dict(type='bool', default=True),

-            dns_hostnames = dict(type='bool', default=True),

-            subnets = dict(type='list'),

-            vpc_id = dict(),

-            internet_gateway = dict(type='bool', default=False),

-            resource_tags = dict(type='dict', required=True),

-            route_tables = dict(type='list'),

-            state = dict(choices=['present', 'absent'], default='present'),

-        )

+        cidr_block = dict(),

+        instance_tenancy = dict(choices=['default', 'dedicated'], default='default'),

+        wait = dict(type='bool', default=False),

+        wait_timeout = dict(default=300),

+        dns_support = dict(type='bool', default=True),

+        dns_hostnames = dict(type='bool', default=True),

+        subnets = dict(type='list'),

+        vpc_id = dict(),

+        internet_gateway = dict(type='bool', default=False),

+        resource_tags = dict(type='dict', required=True),

+        route_tables = dict(type='list'),

+        state = dict(choices=['present', 'absent'], default='present'),

+    )

     )

     module = AnsibleModule(

@@ -15,9 +15,9 @@

 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.

 ANSIBLE_METADATA = {

-  'version': '1.0',

-  'status': ['preview'],

-  'supported_by': 'committer'

+    'version': '1.0',

+    'status': ['preview'],

+    'supported_by': 'committer'

 }

 DOCUMENTATION = '''

@@ -236,14 +236,14 @@ def assert_policy_shape(policy):

 def main():

     argument_spec = ansible.module_utils.ec2.ec2_argument_spec()

     argument_spec.update(dict(

-            mode = dict(choices=['grant', 'deny'], default='grant'),

-            key_alias = dict(required=False, type='str'),

-            key_arn = dict(required=False, type='str'),

-            role_name = dict(required=False, type='str'),

-            role_arn = dict(required=False, type='str'),

-            grant_types = dict(required=False, type='list'),

-            clean_invalid_entries = dict(type='bool', default=True),

-        )

+        mode = dict(choices=['grant', 'deny'], default='grant'),

+        key_alias = dict(required=False, type='str'),

+        key_arn = dict(required=False, type='str'),

+        role_name = dict(required=False, type='str'),

+        role_arn = dict(required=False, type='str'),

+        grant_types = dict(required=False, type='list'),

+        clean_invalid_entries = dict(type='bool', default=True),

+    )

     )

     module = AnsibleModule(

@@ -390,18 +390,18 @@ def get_stack_facts(cfn, stack_name):

 def main():

     argument_spec = ansible.module_utils.ec2.ec2_argument_spec()

     argument_spec.update(dict(

-            stack_name=dict(required=True),

-            template_parameters=dict(required=False, type='dict', default={}),

-            state=dict(default='present', choices=['present', 'absent']),

-            template=dict(default=None, required=False, type='path'),

-            notification_arns=dict(default=None, required=False),

-            stack_policy=dict(default=None, required=False),

-            disable_rollback=dict(default=False, type='bool'),

-            template_url=dict(default=None, required=False),

-            template_format=dict(default=None, choices=['json', 'yaml'], required=False),

-            role_arn=dict(default=None, required=False),

-            tags=dict(default=None, type='dict')

-        )

+        stack_name=dict(required=True),

+        template_parameters=dict(required=False, type='dict', default={}),

+        state=dict(default='present', choices=['present', 'absent']),

+        template=dict(default=None, required=False, type='path'),

+        notification_arns=dict(default=None, required=False),

+        stack_policy=dict(default=None, required=False),

+        disable_rollback=dict(default=False, type='bool'),

+        template_url=dict(default=None, required=False),

+        template_format=dict(default=None, choices=['json', 'yaml'], required=False),

+        role_arn=dict(default=None, required=False),

+        tags=dict(default=None, type='dict')

+    )

     )

     module = AnsibleModule(

@@ -413,7 +413,7 @@ def main():

     # collect the parameters that are passed to boto3. Keeps us from having so many scalars floating around.

     stack_params = {

-      'Capabilities': ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],

+        'Capabilities': ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],

     }

     state = module.params['state']

     stack_params['StackName'] = module.params['stack_name']

@@ -1135,18 +1135,18 @@ def create_instances(module, ec2, vpc, override_count=None):

             if not spot_price:

                 if assign_public_ip and private_ip:

                     params.update(dict(

-                      min_count          = count_remaining,

-                      max_count          = count_remaining,

-                      client_token       = id,

-                      placement_group    = placement_group,

+                        min_count          = count_remaining,

+                        max_count          = count_remaining,

+                        client_token       = id,

+                        placement_group    = placement_group,

                     ))

                 else:

                     params.update(dict(

-                      min_count          = count_remaining,

-                      max_count          = count_remaining,

-                      client_token       = id,

-                      placement_group    = placement_group,

-                      private_ip_address = private_ip,

+                        min_count          = count_remaining,

+                        max_count          = count_remaining,

+                        client_token       = id,

+                        placement_group    = placement_group,

+                        private_ip_address = private_ip,

                     ))

                 # For ordinary (not spot) instances, we can select 'stop'

@@ -1537,56 +1537,56 @@ def restart_instances(module, ec2, instance_ids, state, instance_tags):

 def main():

     argument_spec = ec2_argument_spec()

     argument_spec.update(dict(

-            key_name = dict(aliases = ['keypair']),

-            id = dict(),

-            group = dict(type='list', aliases=['groups']),

-            group_id = dict(type='list'),

-            zone = dict(aliases=['aws_zone', 'ec2_zone']),

-            instance_type = dict(aliases=['type']),

-            spot_price = dict(),

-            spot_type = dict(default='one-time', choices=["one-time", "persistent"]),

-            spot_launch_group = dict(),

-            image = dict(),

-            kernel = dict(),

-            count = dict(type='int', default='1'),

-            monitoring = dict(type='bool', default=False),

-            ramdisk = dict(),

-            wait = dict(type='bool', default=False),

-            wait_timeout = dict(default=300),

-            spot_wait_timeout = dict(default=600),

-            placement_group = dict(),

-            user_data = dict(),

-            instance_tags = dict(type='dict'),

-            vpc_subnet_id = dict(),

-            assign_public_ip = dict(type='bool', default=False),

-            private_ip = dict(),

-            instance_profile_name = dict(),

-            instance_ids = dict(type='list', aliases=['instance_id']),

-            source_dest_check = dict(type='bool', default=True),

-            termination_protection = dict(type='bool', default=None),

-            state = dict(default='present', choices=['present', 'absent', 'running', 'restarted', 'stopped']),

-            instance_initiated_shutdown_behavior=dict(default=None, choices=['stop', 'terminate']),

-            exact_count = dict(type='int', default=None),

-            count_tag = dict(),

-            volumes = dict(type='list'),

-            ebs_optimized = dict(type='bool', default=False),

-            tenancy = dict(default='default'),

-            network_interfaces = dict(type='list', aliases=['network_interface'])

-        )

+        key_name = dict(aliases = ['keypair']),

+        id = dict(),

+        group = dict(type='list', aliases=['groups']),

+        group_id = dict(type='list'),

+        zone = dict(aliases=['aws_zone', 'ec2_zone']),

+        instance_type = dict(aliases=['type']),

+        spot_price = dict(),

+        spot_type = dict(default='one-time', choices=["one-time", "persistent"]),

+        spot_launch_group = dict(),

+        image = dict(),

+        kernel = dict(),

+        count = dict(type='int', default='1'),

+        monitoring = dict(type='bool', default=False),

+        ramdisk = dict(),

+        wait = dict(type='bool', default=False),

+        wait_timeout = dict(default=300),

+        spot_wait_timeout = dict(default=600),

+        placement_group = dict(),

+        user_data = dict(),

+        instance_tags = dict(type='dict'),

+        vpc_subnet_id = dict(),

+        assign_public_ip = dict(type='bool', default=False),

+        private_ip = dict(),

+        instance_profile_name = dict(),

+        instance_ids = dict(type='list', aliases=['instance_id']),

+        source_dest_check = dict(type='bool', default=True),

+        termination_protection = dict(type='bool', default=None),