valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2014.7' into develop

Browse Source 
Conflicts:
	salt/modules/yumpkg.py
This commit is contained in:
Thomas S Hatch 2014-12-17 15:00:26 -07:00
commit 1dcc05b049
9 changed files with 136 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/master
View File

@ -635,6 +635,7 @@
# The level of messages to send to the log file.
# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
# If using 'log_granular_levels' this must be set to the highest desired level.
#log_level_logfile: warning
# The date and time format used in log messages. Allowed date/time formating
@ -651,7 +652,7 @@
# example sets the main salt library at the 'warning' level, but sets
# 'salt.modules' to log at the 'debug' level:
# log_granular_levels:
# 'salt': 'warning',
# 'salt': 'warning'
# 'salt.modules': 'debug'
#
#log_granular_levels: {}

3
conf/minion
View File

@ -494,6 +494,7 @@
# The level of messages to send to the log file.
# One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'.
# If using 'log_granular_levels' this must be set to the highest desired level.
# Default: 'warning'
#log_level_logfile:
@ -511,7 +512,7 @@
# example sets the main salt library at the 'warning' level, but sets
# 'salt.modules' to log at the 'debug' level:
# log_granular_levels:
# 'salt': 'warning',
# 'salt': 'warning'
# 'salt.modules': 'debug'
#
#log_granular_levels: {}

2
doc/topics/tutorials/multimaster_pki.rst
View File

@ -74,7 +74,7 @@ A custom name can be set for the signing key-pair by setting
.. code-block:: yaml
master_key_sign_name: <name_without_suffix>
master_sign_key_name: <name_without_suffix>
The master will then generate that key-pair upon restart and use it for
creating the public keys signature attached to the auth-reply.

4
salt/modules/aptpkg.py
View File

@ -567,9 +567,11 @@ def _uninstall(action='remove', name=None, pkgs=None, **kwargs):
return {}
cmd = ['apt-get', '-q', '-y', action]
cmd.extend(targets)
env = _parse_env(kwargs.get('env'))
env.update(DPKG_ENV_VARS.copy())
__salt__['cmd.run'](
cmd,
env=kwargs.get('env'),
env=env,
python_shell=False,
output_loglevel='trace'
)

8
salt/modules/lxc.py
View File

@ -1798,8 +1798,12 @@ def update_lxc_conf(name, lxc_conf, lxc_conf_unset):
if not row:
continue
for conf in row:
filtered_lxc_conf.append((conf.strip(),
row[conf].strip()))
try:
filtered_lxc_conf.append((conf.strip(),
row[conf].strip()))
except AttributeError:
filtered_lxc_conf.append((conf.strip(),
str(row[conf]).strip()))
ret['comment'] = 'lxc.conf is up to date'
lines = []
orig_config = fic.read()

128
salt/modules/tomcat.py
View File

@ -2,15 +2,32 @@
'''
Support for Tomcat
This module uses the manager webapp to manage Apache tomcat webapps
If the manager webapp is not configured some of the functions won't work
This module uses the manager webapp to manage Apache tomcat webapps.
If the manager webapp is not configured some of the functions won't work.
The following grains/pillar should be set::
.. note::
tomcat-manager:user: admin user name
tomcat-manager:passwd: password
The config format was changed in 2014.7.0, but backwards compatibility for
the old-style config will be in the 2014.7.1 release.
and also configure a user in the conf/tomcat-users.xml file::
The following grains/pillar should be set:
.. code-block:: yaml
tomcat-manager:
user: <username>
password: <passwd>
or the old format:
.. code-block:: yaml
tomcat-manager.user: <username>
tomcat-manager.password: <passwd>
Also configure a user in the conf/tomcat-users.xml file:
.. code-block:: xml
<?xml version='1.0' encoding='utf-8'?>
<tomcat-users>
@ -18,27 +35,27 @@ and also configure a user in the conf/tomcat-users.xml file::
<user username="tomcat" password="tomcat" roles="manager-script"/>
</tomcat-users>
Notes:
.. note::
- More information about tomcat manager:
http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html
- if you use only this module for deployments you've might want to strict
access to the manager only from localhost for more info:
http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html#Configuring_Manager_Application_Access
- Tested on:
- More information about tomcat manager:
http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html
- if you use only this module for deployments you've might want to strict
access to the manager only from localhost for more info:
http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html#Configuring_Manager_Application_Access
- Tested on:
JVM Vendor:
Sun Microsystems Inc.
JVM Version:
1.6.0_43-b01
OS Architecture:
amd64
OS Name:
Linux
OS Version:
2.6.32-358.el6.x86_64
Tomcat Version:
Apache Tomcat/7.0.37
JVM Vendor:
Sun Microsystems Inc.
JVM Version:
1.6.0_43-b01
OS Architecture:
amd64
OS Name:
Linux
OS Version:
2.6.32-358.el6.x86_64
Tomcat Version:
Apache Tomcat/7.0.37
'''
from __future__ import absolute_import
@ -68,6 +85,19 @@ __func_alias__ = {
'reload_': 'reload'
}
# Support old-style grains/pillar
# config as well as new.
__valid_configs = {
'user': [
'tomcat-manager.user',
'tomcat-manager:user'
],
'passwd': [
'tomcat-manager.passwd',
'tomcat-manager:passwd'
]
}
def __virtual__():
'''
@ -94,22 +124,26 @@ def __catalina_home():
def _get_credentials():
'''
Get the username and password from opts, grains & pillar
Get the username and password from opts, grains, or pillar
'''
ret = {
'user': False,
'passwd': False
}
# Loop through opts, grains, and pillar
# Return the first acceptable configuration found
for item in ret:
entry = 'tomcat-manager:{0}'.format(item)
for struct in [__opts__, __grains__, __pillar__]:
ret[item] = salt.utils.traverse_dict_and_list(struct, entry, '_|-')
if ret[item] == '_|-':
ret[item] = False
else:
break
# Look for the config key
# Support old-style config format and new
for config_key in __valid_configs[item]:
value = salt.utils.traverse_dict_and_list(struct,
config_key,
None)
if value:
ret[item] = value
break
return ret['user'], ret['passwd']
@ -665,3 +699,31 @@ def signal(signal=None):
__catalina_home(), valid_signals[signal]
)
__salt__['cmd.run'](cmd)
if __name__ == '__main__':
'''
Allow testing from the CLI
''' # pylint: disable=W0105
__opts__ = {}
__grains__ = {}
__pillar__ = {
'tomcat-manager.user': 'foobar',
'tomcat-manager.passwd': 'barfoo1!',
}
old_format_creds = _get_credentials()
__pillar__ = {
'tomcat-manager': {
'user': 'foobar',
'passwd': 'barfoo1!'
}
}
new_format_creds = _get_credentials()
if old_format_creds == new_format_creds:
print 'Config backwards compatible'
else:
print 'Config not backwards compatible'

8
salt/utils/event.py
View File

@ -794,21 +794,21 @@ class ReactWrap(object):
cmd = local
def runner(self, **kwargs):
def runner(self, fun, **kwargs):
'''
Wrap RunnerClient for executing :ref:`runner modules <all-salt.runners>`
'''
if 'runner' not in self.client_cache:
self.client_cache['runner'] = salt.runner.RunnerClient(self.opts)
self.pool.fire_async(self.client_cache['runner'].low, kwargs)
self.pool.fire_async(self.client_cache['runner'].low, args=(fun, kwargs))
def wheel(self, **kwargs):
def wheel(self, fun, **kwargs):
'''
Wrap Wheel to enable executing :ref:`wheel modules <all-salt.wheel>`
'''
if 'wheel' not in self.client_cache:
self.client_cache['wheel'] = salt.wheel.Wheel(self.opts)
self.pool.fire_async(self.client_cache['wheel'].low, kwargs)
self.pool.fire_async(self.client_cache['wheel'].low, args=(fun, kwargs))
class StateFire(object):

2
salt/utils/process.py
View File

@ -182,6 +182,8 @@ class ThreadPool(object):
except Queue.Empty:
continue
try:
log.debug('ThreadPool executing func: {0} with args:{1}'
' kwargs{2}'.format(func, args, kwargs))
func(*args, **kwargs)
except Exception as err:
log.debug(err, exc_info=True)

29
tests/unit/modules/zcbuildout_test.py
View File

@ -59,6 +59,7 @@ def download_to(url, dest):
fic.write(urlopen(url, timeout=10).read())
@skipIf(True, 'These tests are not running reliably')
class Base(TestCase):
@classmethod
def setUpClass(cls):
@ -114,6 +115,7 @@ class Base(TestCase):
shutil.rmtree(self.tdir)
@skipIf(True, 'These tests are not running reliably')
@skipIf(salt.utils.which_bin(KNOWN_VIRTUALENV_BINARY_NAMES) is None,
'The \'virtualenv\' packaged needs to be installed')
@skip_if_binaries_missing(['tar'])
@ -141,27 +143,37 @@ class BuildoutTestCase(Base):
raise Exception('foo')
ret1 = callback1(1, b=3)
self.assertEqual(ret1['status'], True)
self.assertEqual(ret1['logs_by_level']['warn'], ['wbar'])
self.assertEqual(ret1['comment'], '')
# These lines are throwing pylint errors - disabling for now since we are skipping
# these tests
#self.assertEqual(ret1['status'], True)
#self.assertEqual(ret1['logs_by_level']['warn'], ['wbar'])
#self.assertEqual(ret1['comment'], '')
self.assertTrue(
u''
u'OUTPUT:\n'
u'foo\n'
u''
in ret1['outlog']
# These lines are throwing pylint errors - disabling for now since we are skipping
# these tests
#in ret1['outlog']
)
self.assertTrue(u'Log summary:\n' in ret1['outlog'])
# These lines are throwing pylint errors - disabling for now since we are skipping
# these tests
#self.assertTrue(u'Log summary:\n' in ret1['outlog'])
self.assertTrue(
u'INFO: ibar\n'
u'WARN: wbar\n'
u'DEBUG: dbar\n'
u'ERROR: ebar\n'
in ret1['outlog']
# These lines are throwing pylint errors - disabling for now since we are skipping
# these tests
#in ret1['outlog']
)
self.assertTrue('by level' in ret1['outlog_by_level'])
self.assertEqual(ret1['out'], 'foo')
# These lines are throwing pylint errors - disabling for now since we are skipping
# these tests
#self.assertTrue('by level' in ret1['outlog_by_level'])
#self.assertEqual(ret1['out'], 'foo')
ret2 = buildout._salt_callback(callback2)(2, b=6)
self.assertEqual(ret2['status'], False)
self.assertTrue(
@ -452,6 +464,7 @@ class BuildoutOnlineTestCase(Base):
self.assertTrue('buildout -c buildout.cfg -n install a' in comment)
@skipIf(True, 'These tests are not running reliably')
class BuildoutAPITestCase(TestCase):
def test_merge(self):