Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2

Conflicts:
    doc/man/salt.1
    doc/ref/cli/salt.rst

doc/man/salt.1

@@ -97,9 +97,10 @@ the started execution and complete.
 New in version 0.17.
 
 .sp
-Choose the format of the state output. The options are \fIfull\fP,
-\fIterse\fP, \fImixed\fP, \fIchanges\fP, and \fIfilter\fP\&. Default: full
-.UNINDENT
+Override the configured \fBstate_output\fP value for minion output. One of
+\fBfull\fP, \fBterse\fP, \fBmixed\fP, \fBchanges\fP or \fBfilter\fP\&.
+Default: \fBfull\fB\&.
+
 .INDENT 0.0
 .TP
 .B \-\-subset=SUBSET

doc/ref/cli/salt.rst

@@ -46,8 +46,9 @@ Options
 
     .. versionadded:: 0.17
 
-    Choose the format of the state output. The options are `full`,
-    `terse`, `mixed`, `changes`, and `filter`. Default: full
+    Override the configured ``state_output`` value for minion output. One of
+    ``full``, ``terse``, ``mixed``, ``changes`` or ``filter``.  Default:
+    ``full``.
 
 .. option:: --subset=SUBSET
 

doc/ref/configuration/minion.rst

@@ -122,6 +122,21 @@ Python's :func:`random.shuffle <python2:random.shuffle>` method.
 
     master_shuffle: True
 
+.. conf_minion:: retry_dns
+
+``retry_dns``
+---------------
+
+Default: ``30``
+
+Set the number of seconds to wait before attempting to resolve
+the master hostname if name resolution fails. Defaults to 30 seconds.
+Set to zero if the minion should shutdown and not retry.
+
+.. code-block:: yaml
+    
+    retry_dns: 30
+
 .. conf_minion:: master_port
 
 ``master_port``

pkg/salt-minion.service

@@ -5,6 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 ExecStart=/usr/bin/salt-minion
+KillMode=process
 
 [Install]
 WantedBy=multi-user.target

salt/cloud/__init__.py

@@ -1329,8 +1329,13 @@ class Cloud(object):
         if not vm_overrides:
             vm_overrides = {}
 
-        with salt.utils.fopen(os.path.join(salt.syspaths.CONFIG_DIR, 'cloud'), 'r') as mcc:
+        try:
+            with salt.utils.fopen(self.opts['conf_file'], 'r') as mcc:
                 main_cloud_config = yaml.safe_load(mcc)
+        except KeyError:
+            main_cloud_config = {}
+        except IOError:
+            main_cloud_config = {}
 
         profile_details = self.opts['profiles'][profile]
         alias, driver = profile_details['provider'].split(':')

salt/modules/upstart.py

@@ -411,8 +411,15 @@ def status(name, sig=None):
         return bool(__salt__['status.pid'](sig))
     cmd = ['service', name, 'status']
     if _service_is_upstart(name):
-        return 'start/running' in __salt__['cmd.run'](cmd, python_shell=False)
-    return not bool(__salt__['cmd.retcode'](cmd, python_shell=False))
+        # decide result base on cmd output, thus ignore retcode,
+        # which makes cmd output not at error lvl even when cmd fail.
+        return 'start/running' in __salt__['cmd.run'](cmd, python_shell=False,
+                                                      ignore_retcode=True)
+    # decide result base on retcode, thus ignore output (set quite)
+    # because there is no way to avoid logging at error lvl when
+    # service is not running - retcode != 0 (which is totally relevant).
+    return not bool(__salt__['cmd.retcode'](cmd, python_shell=False,
+                                            quite=True))
 
 
 def _get_service_exec():

salt/output/highstate.py

@@ -16,16 +16,20 @@ state_verbose:
     instruct the highstate outputter to omit displaying anything in green, this
     means that nothing with a result of True and no changes will not be printed
 state_output:
-    The highstate outputter has five output modes, `full`, `terse`, `mixed`,
-    `changes` and `filter`. The default is set to full, which will display many
-    lines of detailed information for each executed chunk. If the `state_output`
-    option is set to `terse` then the output is greatly simplified and shown in
-    only one line.  If `mixed` is used, then terse output will be used unless a
-    state failed, in which case full output will be used.  If `changes` is used,
-    then terse output will be used if there was no error and no changes,
-    otherwise full output will be used. If `filter` is used, then either or both
-    of two different filters can be used: `exclude` or `terse`. These can be set
-    as such from the command line, or in the Salt config as
+    The highstate outputter has five output modes, ``full``, ``terse``,
+    ``mixed``, ``changes`` and ``filter``.
+
+    * The default is set to ``full``, which will display many lines of detailed
+      information for each executed chunk.
+    * If ``terse`` is used, then the output is greatly simplified and shown in
+      only one line.
+    * If ``mixed`` is used, then terse output will be used unless a state
+      failed, in which case full output will be used.
+    * If ``changes`` is used, then terse output will be used if there was no
+      error and no changes, otherwise full output will be used.
+    * If ``filter`` is used, then either or both of two different filters can be
+      used: ``exclude`` or ``terse``.
+      These can be set as such from the command line, or in the Salt config as
       `state_output_exclude` or `state_output_terse`, respectively. The values to
       exclude must be a comma-separated list of `True`, `False` and/or `None`.
       Because of parsing nuances, if only one of these is used, it must still

salt/utils/parsers.py

@@ -1042,8 +1042,9 @@ class OutputOptionsMixIn(object):
         group.add_option(
             '--state-output', '--state_output',
             default='full',
-            help=('Override the configured state_output value for minion output'
-                  '. Default: full')
+            help=('Override the configured state_output value for minion '
+                  'output. One of full, terse, mixed, changes or filter. '
+                  'Default: full.')
         )
 
         for option in self.output_options_group.option_list: