Commit Graph

71611 Commits

Author SHA1 Message Date
Anthony Shaw
64dfb07d53
refactor to combine the template file and the user context 2016-07-27 14:59:55 +10:00
Anthony Shaw
c9e255ece9 replace cookiecutter with my own recursive jinja2 copy 2016-07-27 14:13:43 +10:00
Anthony Shaw
5d84cdfbf8 salt uses YAML, why am I using JSON?! 2016-07-27 13:49:46 +10:00
Anthony Shaw
bbb5efb308 refactor the code to not use cookiecutter (1) 2016-07-27 09:39:54 +10:00
Anthony Shaw
b3ee6c60e5 rework all the templates to not use cookiecutter 2016-07-27 09:04:30 +10:00
Anthony Shaw
ffe3f51446
linting fixes 2016-07-25 15:58:54 +10:00
Anthony Shaw
ff60aec050 fix munged merge 2016-07-25 15:58:45 +10:00
Anthony Shaw
8bf5e03034
doc the run method in salt.utils.extend 2016-07-25 14:36:01 +10:00
Anthony Shaw
2dcedb1548 added state test template 2016-07-25 14:32:02 +10:00
Anthony Shaw
a73bbc03de
option for module test 2016-07-25 14:29:08 +10:00
Anthony Shaw
a0782b7240 added unit test template 2016-07-25 14:26:37 +10:00
Anthony Shaw
b43e087d56
update the state template 2016-07-25 14:18:14 +10:00
Anthony Shaw
9ccb9cc3a0
update the module template 2016-07-25 14:14:08 +10:00
Anthony Shaw
effc6942da
execution module templates 2016-07-25 14:12:17 +10:00
Anthony Shaw
aacd253c4c
explain what the command does 2016-07-25 13:59:07 +10:00
Anthony Shaw
425341152f
recursively merge directory trees 2016-07-25 13:52:51 +10:00
Anthony Shaw
ec6886dbf2 merge tree instead of copy 2016-07-25 13:50:37 +10:00
Anthony Shaw
df2d4f7798
name the arguments and allow description to be set on command line 2016-07-25 13:45:13 +10:00
Anthony Shaw
836002d3d0
use correct template names 2016-07-25 13:38:58 +10:00
Anthony Shaw
bffdd9387d add state template 2016-07-25 10:54:53 +10:00
Anthony Shaw
9dac0c76c7
take args from command line 2016-07-25 10:54:39 +10:00
Anthony Shaw
ee3ea218f8 renamed to extend, read module name and description at prompt 2016-07-25 09:40:02 +10:00
Anthony Shaw
ad77f799df
renamed the quickstart to extend 2016-07-25 09:01:09 +10:00
Anthony Shaw
d3016f0055
ask basic question 2016-07-24 20:59:49 +10:00
Anthony Shaw
c11f2349b1
import cookiecutter if installed and ask a basic question 2016-07-24 20:34:36 +10:00
Anthony Shaw
0f0aae86e8
setup basic entry point 2016-07-24 20:16:40 +10:00
Anthony Shaw
a3e37cc2d0 Merge branch 'develop' of github.com:saltstack/salt into develop 2016-07-24 20:08:47 +10:00
Mike Place
7e4ebc3961 Merge pull request #34913 from terminalmage/issue2707
Update unit test
2016-07-22 20:25:17 -06:00
Erik Johnson
92fffb06a7 Update unit test
This unit test asserts based on the args with which a function was
called, and the args were changed which broke the test. This fixes the
test.
2016-07-22 21:21:55 -05:00
Mike Place
3555d05bf0 Merge pull request #34912 from cachedout/fix_config_test
Config test no longer applies to new test config
2016-07-22 19:00:22 -06:00
Mike Place
baee2f2558 Config test no longer applies to new test config 2016-07-22 18:59:31 -06:00
Mike Place
1aee8b7dd4 Merge pull request #34906 from cachedout/set_run_salt_timeout
Set timeout for run_salt in test suite
2016-07-22 16:43:48 -06:00
Mike Place
caf0361bc1 Merge pull request #34807 from terminalmage/issue2707
Feature addition: preserve mode in file states
2016-07-22 16:43:31 -06:00
Mike Place
38ac79d8bb Merge pull request #34829 from gtmanfred/py3
[PY3] tests.unit.pillar
2016-07-22 16:33:47 -06:00
Mike Place
5e0c63c0eb Merge pull request #34886 from eradman/cron
Preserve trailing lines in crontab
2016-07-22 16:25:23 -06:00
Mike Place
365fca3c60 Merge pull request #34895 from skizunov/develop2
Fix console and file logging on Windows
2016-07-22 16:23:32 -06:00
Nicole Thomas
bdafa60e6a Lint #34897 (#34907) 2016-07-22 16:22:30 -06:00
Mike Place
345e3e56b8 Merge pull request #34899 from rallytime/integration-cli-tests
Fix integration/cli/*.py test failures when Running in Python 3
2016-07-22 16:22:11 -06:00
Jeremy McMillan
b1e5cdbe88 salt-cloud -f post_dns_record support (#34897)
refactor arguments in salt.cloud.clouds.digital_ocean.post_dns_record() to enable use with salt-cloud --function on command line

#34884
2016-07-22 16:20:57 -06:00
Mike Place
cdfd0161fc Set timeout for run_salt in test suite 2016-07-22 16:14:25 -06:00
Nicole Thomas
df372c8749 Merge pull request #34905 from rallytime/remove-tests
Remove tests that don't test anything
2016-07-22 16:13:57 -06:00
rallytime
56fb834718 Remove tests that don't test anything 2016-07-22 16:12:16 -06:00
Mike Place
ab84fd273e Merge pull request #34637 from cachedout/int_tests_interfaces
Int tests interfaces
2016-07-22 15:58:59 -06:00
rallytime
ed5b89655a Transform unicode string to bytes before hashing 2016-07-22 14:31:55 -06:00
rallytime
1031f19f3d Update batch integration tests to not be flaky in Python3 2016-07-22 14:19:15 -06:00
Thomas S Hatch
82f4ff6a83 Merge pull request #34889 from techhat/regpersist
Add load_reg and save_reg for Thorium
2016-07-22 13:52:20 -06:00
Mike Place
403854dac7 Merge pull request #34896 from skizunov/develop3
Fix unbound local variable error
2016-07-22 13:14:20 -06:00
Sergey Kizunov
9ee1ea8629 Fix unbound local variable error
I have occasionally come across this error while running a salt-minion on
Windows using Python 3.5.1 and the TCP transport:

'''
  File "...\salt\crypt.py", line 498, in _authenticate
    if not error:
UnboundLocalError: local variable 'error' referenced before assignment
[WARNING ] Minion received a SIGINT. Exiting.
'''

It seems like there is an overloaded use of the local variable called
`error`, each use with a different lifespan. Changed it so that `error`
is no longer overloaded. This has fixed the issue.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-07-22 14:02:46 -05:00
Sergey Kizunov
950cf79cd4 Fix console and file logging on Windows
On Windows, only the main process properly logged to console and to
file. Things worked on other OSes due to the logging configuration
being propogated via fork, something that won't work on Windows.

The new strategy for Windows is if multiprocessing mode is used,
all console and file logging will be performed through the
Multiprocessing Logging Listener except for the main process. The
main process does not send stuff to the Multiprocessing Logging Listener.
Hence the main process will still configure file and console logging
separately from the MP Logging Listener.
If multiprocessing mode is off, then logging will be done as before
(which should be ok since there is only one process).

salt/utils/parsers.py:
- Broke apart the logic that figures out the input options for
`log.setup_logfile_logger` and `log.setup_console_logger`. This
functionality is run before `self._setup_mp_logging_listener` so that
the options passed to the MP Logging Listener are appropriate for direct
use in the functions that setup the console and file logging in the
MP Logging Listener process.
- Moved the logic that verifies the path for the log file from
`cli/daemons.py` to be able to run it before creating the MP Logging
Listener. Its original place in `cli/daemons.py` would run after the
MP Logging Listener is created.

salt/log/setup.py:
- Invoke `setup_console_logger` and `setup_logfile_logger` using the
appropriate options if running on Windows.

salt/minion.py:
- No longer need to invoke the functions to setup the console and file
logging on Windows multiprocessing mode due to the MP Logging
Listener taking care of that on Windows.

salt/cli/daemons.py:
- Moved the logic that verifies the path for the log file to
`utils/parsers.py`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-07-22 13:57:43 -05:00
Joseph Hall
590de80010 Fix __opts__ 2016-07-22 11:42:51 -06:00