valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2016.3' into 'carbon'

Browse Source 
No conflicts.
This commit is contained in:
rallytime 2016-09-30 10:13:39 -06:00
commit 555ae9aa9b
4 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
doc/ref/configuration/logging/index.rst
View File

@ -36,18 +36,29 @@ shown in the table below.
<https://docs.python.org/2/library/multiprocessing.html#logging>`_
``subwarning``, 25 and ``subdebug``, 5.
Level Numeric value Description
======== ============= ========================================================================
quiet 1000 Nothing should be logged at this level
critical 50 Critical errors
error 40 Errors
warning 30 Warnings
info 20 Normal log information
profile 15 Profiling information on salt performance
debug 10 Information useful for debugging both salt implementations and salt code
trace 5 More detailed code debugging information
garbage 1 Even more debugging information
all 0 Everything
+----------+---------------+--------------------------------------------------------------------------+
| Level | Numeric value | Description |
+==========+===============+==========================================================================+
| quiet | 1000 | Nothing should be logged at this level |
+----------+---------------+--------------------------------------------------------------------------+
| critical | 50 | Critical errors |
+----------+---------------+--------------------------------------------------------------------------+
| error | 40 | Errors |
+----------+---------------+--------------------------------------------------------------------------+
| warning | 30 | Warnings |
+----------+---------------+--------------------------------------------------------------------------+
| info | 20 | Normal log information |
+----------+---------------+--------------------------------------------------------------------------+
| profile | 15 | Profiling information on salt performance |
+----------+---------------+--------------------------------------------------------------------------+
| debug | 10 | Information useful for debugging both salt implementations and salt code |
+----------+---------------+--------------------------------------------------------------------------+
| trace | 5 | More detailed code debugging information |
+----------+---------------+--------------------------------------------------------------------------+
| garbage | 1 | Even more debugging information |
+----------+---------------+--------------------------------------------------------------------------+
| all | 0 | Everything |
+----------+---------------+--------------------------------------------------------------------------+
Available Configuration Settings
================================

13
salt/states/file.py
View File

@ -3122,7 +3122,8 @@ def replace(name,
prepend_if_not_found=False,
not_found_content=None,
backup='.bak',
show_changes=True):
show_changes=True,
ignore_if_missing=False):
r'''
Maintain an edit in a file.
@ -3204,6 +3205,13 @@ def replace(name,
diff. This may not normally be a concern, but could impact
performance if used with large files.
ignore_if_missing : False
.. versionadded:: 2016.3.5
Controls what to do if the file is missing. If set to ``False``, the
state will display an error raised by the execution module. If set to
``True``, the state will simply report no changes.
For complex regex patterns, it can be useful to avoid the need for complex
quoting and escape sequences by making use of YAML's multiline string
syntax.
@ -3247,7 +3255,8 @@ def replace(name,
not_found_content=not_found_content,
backup=backup,
dry_run=__opts__['test'],
show_changes=show_changes)
show_changes=show_changes,
ignore_if_missing=ignore_if_missing)
if changes:
ret['pchanges']['diff'] = changes

2
salt/utils/minions.py
View File

@ -576,7 +576,7 @@ class CkMinions(object):
# Add in possible ip addresses of a locally connected minion
addrs.discard('127.0.0.1')
addrs.discard('0.0.0.0')
addrs.update(set(salt.utils.network.ip_addrs()))
addrs.update(set(salt.utils.network.ip_addrs(include_loopback=include_localhost)))
if subset:
search = subset
for id_ in search:

5
tests/integration/modules/pkg.py
View File

@ -63,11 +63,10 @@ class PkgModuleTest(integration.ModuleCase,
try:
repo = None
if os_grain == 'Ubuntu':
repo = 'ppa:silvenga/3proxy'
uri = 'http://ppa.launchpad.net/silvenga/3proxy/ubuntu'
repo = 'ppa:otto-kesselgulasch/gimp-edge'
uri = 'http://ppa.launchpad.net/otto-kesselgulasch/gimp-edge/ubuntu'
ret = self.run_function('pkg.mod_repo', [repo, 'comps=main'])
self.assertNotEqual(ret, {})
self.assertIn('deb '+uri, ret.keys()[0])
ret = self.run_function('pkg.get_repo', [repo])
self.assertEqual(ret['uri'], uri)
elif os_grain == 'CentOS':