Merge pull request #25703 from cachedout/master_type_2015_5

Return to `str` for master_type for 2015.5

conf/minion

@@ -25,10 +25,10 @@
 # Minions can connect to multiple masters simultaneously (all masters
 # are "hot"), or can be configured to failover if a master becomes
 # unavailable.  Multiple hot masters are configured by setting this
-# value to "standard".  Failover masters can be requested by setting
+# value to "str".  Failover masters can be requested by setting
 # to "failover".  MAKE SURE TO SET master_alive_interval if you are
 # using failover.
-# master_type: standard
+# master_type: str
 
 # Poll interval in seconds for checking if the master is still there.  Only
 # respected if master_type above is "failover".

doc/ref/configuration/minion.rst

@@ -82,9 +82,9 @@ The option can can also be set to a list of masters, enabling
 
 .. versionadded:: 2014.7.0
 
-Default: ``standard``
+Default: ``str``
 
-The type of the :conf_minion:`master` variable. Can be ``standard``, ``failover`` or
+The type of the :conf_minion:`master` variable. Can be ``str``, ``failover`` or
 ``func``.
 
 .. code-block:: yaml

doc/topics/highavailability/index.rst

@@ -28,7 +28,7 @@ A tutorial on setting up multimaster with "hot" masters is here:
 Multimaster with Failover
 =========================
 
-Changing the ``master_type`` parameter from ``standard`` to ``failover`` will
+Changing the ``master_type`` parameter from ``str`` to ``failover`` will
 cause minions to connect to the first responding master in the list of masters.
 Every ``master_alive_check`` seconds the minions will check to make sure
 the current master is still responding.  If the master does not respond,

salt/config.py

@@ -298,7 +298,7 @@
 DEFAULT_MINION_OPTS = {
     'interface': '0.0.0.0',
     'master': 'salt',
-    'master_type': 'standard',
+    'master_type': 'str',
     'master_port': '4506',
     'master_finger': '',
     'master_shuffle': False,

salt/minion.py

@@ -761,7 +761,7 @@ def eval_master(self,
                     safe=True,
                     failed=False):
         '''
-        Evaluates and returns the current master address. In standard mode, just calls
+        Evaluates and returns the current master address. In str mode, just calls
         authenticate() with the given master address.
 
         With master_type=func evaluates the current master address from the given
@@ -775,7 +775,7 @@ def eval_master(self,
         (possibly failed) master will then be removed from the list of masters.
         '''
         # check if master_type was altered from its default
-        if opts['master_type'] != 'standard' and opts['__role'] != 'syndic':
+        if opts['master_type'] != 'str' and opts['__role'] != 'syndic':
             # check for a valid keyword
             if opts['master_type'] == 'func':
                 # split module and function and try loading the module