Merge branch '2019.2' into merge-2018.3

salt/cloud/clouds/opennebula.py

@@ -782,7 +782,7 @@ def get_template_image(kwargs=None, call=None):
         ret = list_templates()[name]['template']['disk']['image']
     except KeyError:
         raise SaltCloudSystemExit(
-            'The image for template \'{1}\' could not be found.'.format(name)
+            'The image for template \'{0}\' could not be found.'.format(name)
         )
 
     return ret

salt/modules/azurearm_compute.py

@@ -125,7 +125,7 @@ def availability_set_create_or_update(name, resource_group, **kwargs):  # pylint
     try:
         setmodel = __utils__['azurearm.create_object_model']('compute', 'AvailabilitySet', **kwargs)
     except TypeError as exc:
-        result = {'error': 'The object model could not be built. ({1})'.format(str(exc))}
+        result = {'error': 'The object model could not be built. ({0})'.format(str(exc))}
         return result
 
     try:

salt/states/zfs.py

@@ -440,7 +440,7 @@ def _dataset_present(dataset_type, name, volume_size=None, sparse=False, create_
     ## check we have valid filesystem name/volume name/clone snapshot
     if not __utils__['zfs.is_dataset'](name):
         ret['result'] = False
-        ret['comment'] = 'invalid dataset name: {1}'.format(name)
+        ret['comment'] = 'invalid dataset name: {0}'.format(name)
         return ret
 
     if cloned_from and not __utils__['zfs.is_snapshot'](cloned_from):

salt/utils/schema.py

@@ -1443,7 +1443,7 @@ class NotItem(SchemaItem):
         if not isinstance(self.item, (Schema, SchemaItem)):
             raise RuntimeError(
                 'The passed item be of type Schema, SchemaItem or '
-                'BaseSchemaItem, not \'{1}\''.format(type(self.item))
+                'BaseSchemaItem, not \'{0}\''.format(type(self.item))
             )
 
     def serialize(self):