valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,797 Commits 24 Branches 182 Tags 341 MiB
db3cc8dcee
Commit Graph

69797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thayne Harbaugh
a46750c8c5 Various tests to validate proper `salt-master` exit status: 
* Test when ``user`` config setting is an invalid user.

* Test when an unknown argument is given.

* Test Correct ``salt-master`` daemon start up.
 2016-06-02 17:03:59 -06:00
Thayne Harbaugh
68a9912d3a Refactor `testprogram` framework to minimize explicit setup and improve reuse. 
* Add a ``testprogram.TestProgramCase()`` to simplify test classes

  + Has ``setUp()`` and ``tearDown()`` to create ephemeral test directory
    (really should be moved to salttesting.TestCase)

  + Common ``assert_exit_status()`` for validating and reporting failures in
    exit status.

* Add missing ``testprogram.TestDaemonSaltProxy`` class

* Remove specific setting of ``program`` parameter in initialization of
  ``TestDaemonSaltMinion`` since ``testprogram.TestSaltProgramMeta`` already
  handles that unless a specific override is required.

* Automatically set ``user`` in config for master, minion and proxy test
  classes if a specific user is not specified.

* Automatically set ``PYTHONPATH`` as ``sys.path`` unless it is specified.
 2016-06-02 16:51:54 -06:00
Thayne Harbaugh
e057c0c9d0 Ensure that option parser messages have a newline. 
It's possible that this might add newlines where they aren't desired.  If this
is the case then all of the shutdown messages for the classes in
salt/cli/daemons.py require an explicit '\n'.
 2016-06-02 16:38:14 -06:00
Mike Place
7c6216c3fc Merge pull request #33700 from sodium-chloride/develop-2016-0602-0155 
Fix incorrect args passed to timezone.set_hwclock
 2016-06-02 11:33:01 -07:00
Mike Place
2210e85f40 Merge pull request #33716 from eyj/format_msec 
Fix millisecond formatting to avoid 1000 as four-digit milliseconds
 2016-06-02 11:32:10 -07:00
Mike Place
64c7dd7032 Merge pull request #33626 from evonzee/feature/issue-15749 
Feature/issue 15749
 2016-06-02 11:23:36 -07:00
Mike Place
132420c03e Merge pull request #33568 from FerrySchuller/patch-1 
Zabbix returner
 2016-06-02 11:20:58 -07:00
Mike Place
e5843ccd9e Merge pull request #33707 from eyj/sentry_return 
Add options to sentry_returner
 2016-06-02 11:18:36 -07:00
Mike Place
38515a01f8 Merge pull request #33664 from DSRCompany/issues/26311_single_schedule 
Single schedule for MultiMinion, EventBus managed by MultiMinion.
 2016-06-02 10:42:00 -07:00
Jεan Sacren
43cc4a8aff Fix speed issue 
Erik Johnson pointed out the speed issue with compelling numbers:

>>> import timeit
>>> t1 = timeit.Timer('clock == "localtime"', 'clock = "localtime"')
>>> t2 = timeit.Timer('clock.__eq__("localtime")', 'clock = "localtime"')
>>> t1.repeat()
[0.061421871185302734, 0.0285952091217041, 0.026736021041870117]
>>> t2.repeat()
[0.1310901641845703, 0.09536910057067871, 0.09479284286499023]

I'll absolutely fix it by using the simple '==' operator.

Thank you!
 2016-06-02 11:38:37 -06:00
Mike Place
b39d623176 Merge pull request #33689 from rvandegrift/dont-copy-minion-public-keys 
During minion verification, read directly from public key file
 2016-06-02 10:31:40 -07:00
Mike Place
98aba3d3b1 Merge pull request #33675 from techhat/armattach 
Allow attaching data disks to VM during creation
 2016-06-02 10:25:48 -07:00
Mike Place
48fc51cb7b Merge pull request #33695 from plastikos/bug-minion_exit_status 
[Bug] minion exit status
 2016-06-02 10:13:55 -07:00
Mike Place
f1150a6893 Merge pull request #33693 from plastikos/improvement-simplify_module_path 
[Trivial] It's silly to use a python module path when the function is in the file.
 2016-06-02 09:40:26 -07:00
Mike Place
3d76590c6e Merge pull request #33699 from m03/add-initial-win_pki 
Add modules to utilize PowerShell PKI
 2016-06-02 09:38:21 -07:00
EYJ
beea8cc376 Fix millisecond formatting to avoid 1000 as four-digit milliseconds 2016-06-02 17:43:27 +02:00
plastikos
e5877113bb imported patch improvement-trivial_docstring (#33692) 2016-06-02 10:47:25 -04:00
Dmitry Kuzmenko
66bd75cd3b New schedule tests and fixes 2016-06-02 17:14:50 +03:00
Dmitry Kuzmenko
5821b39ab8 Single schedule for MultiMinion, EventBus managed by MultiMinion. 
Reworked the schedule and MultiMinion design:
1. MultiMinion renamed to MinionManager
2. MinionManager manages:
        a) Minions
        b) EventBus
3. Minions are subscribed to events with MinionEvent
4. Single Minion is now a multiminion with multiplicity of 1
5. Schedule is now a singleton
6. Own master alive schedule job for each master
(__master_alive_<master-id>)
7. All previously persisted __master_alive* jobs are cleared up on Minion start.
 2016-06-02 17:14:50 +03:00
Nasenbaer
de9332fd69 Add options to sentry_returner 
Options to ignore non error messages, configure raven via dsn, hide pillar. Also add failed states in a separate dict for convenience.
 2016-06-02 16:03:42 +02:00
Jεan Sacren
ed4c988ef6 Fix incorrect args passed to timezone.set_hwclock 
On Gentoo, we should check the value passed in to timezone.set_hwclock
and only allow 'UTC' or 'localtime' for argument. If incorrect value is
passed in, it could subsequently fry the important config file.

There is another closely related issue on Gentoo. The value to set
'clock' variable in the config file is either 'UTC' or 'local'. In case
of localtime arg, we should convert the value of 'localtime' to 'local'
when setting that 'clock' variable.
 2016-06-02 01:56:55 -06:00
remy.d1
6e576d8111 rename find_no... to find_non... 2016-06-02 09:15:36 +02:00
remy.d1
4e5e05342e Merge branch 'develop' of https://github.com/saltstack/salt into custom-net-ps-modules 2016-06-02 09:14:35 +02:00
Morrie Winnett
29964a50ee Add modules to utilize PowerShell PKI 2016-06-02 00:11:57 -07:00
eric vz
1e7e953442 remove unneeded warning log 2016-06-01 21:04:08 -05:00
eric vz
f0aa35a367 Fix version numbers for added/changed 2016-06-01 20:39:39 -05:00
Thayne Harbaugh
15b831cf24 Ensure that all usage errors exit with status EX_USAGE 2016-06-01 18:21:49 -06:00
Thayne Harbaugh
0f8757b70d Propogate the process.exitcode - otherwise process always exits with EX_OK 2016-06-01 18:21:49 -06:00
Thayne Harbaugh
1fdb232af3 Test that correct salt-minion start-up exits with EX_OK 2016-06-01 18:21:49 -06:00
Thayne Harbaugh
920f062193 Test that an unknown argument to salt-minion exits with EX_USAGE 2016-06-01 18:21:49 -06:00
Thayne Harbaugh
b5e66ad853 Test that a non-existent user for salt-minion exits with EX_NOUSER 
Add common exit status assert function.
 2016-06-01 18:21:49 -06:00
Thayne Harbaugh
11a9e1e839 Various improvements to the TestProgram classes: 
* Add debug logging when a program is started
  * Set a flag once a TestDaemon has been shutdown(); check flag in is_running()
  * Add .config_path property
  * salt.utils.process.clean_proc() only works with multiprocessing - replace it
  * Automatically add --config-dir for TestSaltDaemon if it isn't already specified
 2016-06-01 18:21:49 -06:00
Thayne Harbaugh
33048c75b5 It's silly to use a python module path when the function is in the file. 2016-06-01 17:24:23 -06:00
Joseph Hall
84fdb252f7 Py3 fix 2016-06-01 16:58:48 -06:00
Ross Vandegrift
08d9dafd5c During minion verification, read directly from public key file 
By avoiding temp file on every minion verification, I/O load can be
reduced considerably.
 2016-06-01 17:51:07 -04:00
Mike Place
178feef40f Merge pull request #33660 from hrumph/develop 
Addition of only_on_pending_reboot param to reboot and shutdown functs + other minor fixes
 2016-06-01 14:04:55 -07:00
Mike Place
4123298538 Merge pull request #33657 from jeanpralo/dockerng-get-default-docker-auth 
use default docker auth file as prior auth system
 2016-06-01 14:02:10 -07:00
Mike Place
05d2951246 Merge pull request #33601 from mchugh19/slack-fix 
Fix slack engine to run on python2.6
 2016-06-01 13:48:19 -07:00
Jean Praloran
90dfe751b3 fix lint problem 2016-06-02 08:39:55 +12:00
Jean Praloran
81239c6a93 fix error catching when reading the file 2016-06-02 08:39:55 +12:00
Jean Praloran
a39b4861a4 use default docker auth file as prior auth system 2016-06-02 08:39:54 +12:00
Mike Place
64ba252256 Merge pull request #33650 from terminalmage/issue29954 
Feature: add per-saltenv configuration parameter support
 2016-06-01 13:34:30 -07:00
Ferry Schuller
238c53b6cc Removed unused import salt.utils.jid. 2016-06-01 21:43:13 +02:00
Mike Place
d5ff1bc21e Merge pull request #33663 from ksvasan/develop 
Fix the unlock bug with zk_concurrency module
 2016-06-01 11:59:03 -07:00
Joseph Hall
a3f1983c3b Add missing import 2016-06-01 12:24:32 -06:00
Joseph Hall
3db2258237 Increase lun count for each device 2016-06-01 12:24:32 -06:00
Joseph Hall
6d344e8b2d Allow attaching data disks to VM during creation 2016-06-01 12:24:32 -06:00
Sebastian Braun
5a73631f0f version checking had a logical error 
The current version of rabbitmq, 3.6.2 was not matched
 2016-06-01 20:23:08 +02:00
Mike Place
9d433da5fb Merge pull request #33641 from glomium/issue33588 
check rabbitmq version and use different api to validate a users pass…
 2016-06-01 10:28:56 -07:00
Mike Place
e37c6e3dd0 Merge pull request #33644 from mchugh19/hipchat-normalize-trigger 
Handle trigger the same way as slack engine
 2016-06-01 09:58:27 -07:00