Brian Adriance
ec5b31ef8c
Merge branch 'develop' into saltcloud-vmware-nested-folders
2017-11-30 15:05:54 -05:00
Nicole Thomas
2503a6f150
Merge branch 'develop' into verify_env
2017-11-30 14:53:35 -05:00
Erik Johnson
5156edce45
Prevent saltenv from being manually specified when running states
...
This uses the newly-added "lock_saltenv" minion config option.
2017-11-30 13:18:37 -06:00
Erik Johnson
683e2cc502
Rename 'environment' config option to 'saltenv'
...
'environment' predates the 'saltenv' nomenclature, and since we have
been using saltenv on the CLI for years, and now also have pillarenv, it
makes sense to make this change.
2017-11-30 13:08:49 -06:00
Thomas S Hatch
0ab85361c0
Merge branch 'mstats' of github.com:thatch45/salt into mstats
2017-11-30 11:41:49 -07:00
Thomas S Hatch
52ab561c4c
Add some extra docs
2017-11-30 11:40:40 -07:00
Thomas S Hatch
bff22e5b0b
fix soem bugs and make a better event tag
2017-11-30 11:35:33 -07:00
Thomas S Hatch
cb0a0d57ce
Add some basic docs
2017-11-30 11:11:31 -07:00
Thomas S Hatch
2ab0f06030
clean up spurious logs etc
2017-11-30 11:06:55 -07:00
Thomas S Hatch
737433b47f
It works!
2017-11-30 11:05:12 -07:00
Mike Place
76beabb9f2
Merge pull request #44765 from mstarostik/develop
...
Allow for omission of HWADDR from ifcfg-* file
2017-11-30 09:52:00 -07:00
Thomas S Hatch
9e0501c3f0
initial add of state system and orchestration pauses
2017-11-30 09:47:31 -07:00
rallytime
dc3097cedd
Write a unittest for error message raised with missing "." in function
2017-11-30 11:05:22 -05:00
Ari Maniatis
094d21afb2
Better exception
...
After spending an hour trying to figure out why I had a key error in an orchestration state I realised that saltstack requires a runner id with a dot. A clearer error message will save the next person wasting the same time.
2017-11-30 11:05:22 -05:00
Mircea Ulinic
dce017b3f7
Make tests happy
2017-11-30 15:50:11 +00:00
Michael Calmer
3be96f7903
lint fix
2017-11-30 16:48:58 +01:00
Mircea Ulinic
b7df7e75cf
HACK: directly return the master_uri when master_ip is not in the opts (though I don't know how it can't be, but be it)
2017-11-30 15:22:50 +00:00
Nicole Thomas
2c313668cd
Merge branch 'develop' into mstats
2017-11-30 09:36:18 -05:00
Malte Starostik
0acc850991
Allow for omission of HWADDR from ifcfg-* file
...
Allow
- addr: none
in network.managed to omit the HWADDR from the generated ifcfg-* file.
This allows to manage interfaces solely by their name, keeping their
configuration over MAC changes.
For the sake of completeness, also accept
- addr: auto
to explicitly request the default behaviour with no "addr" specified.
2017-11-30 14:08:50 +01:00
Mircea Ulinic
3ebdb54542
Add Thorium load execution and runner functions
2017-11-30 12:35:23 +00:00
Claudius Zingerli
7e20e5fd6d
Add phusion container initd detection
2017-11-30 12:00:00 +01:00
Michael Calmer
bc5f6a1da4
use single quotes
2017-11-30 09:24:03 +01:00
Erik Johnson
7049089762
Fix calls to verify_env
...
https://github.com/saltstack/salt/pull/44584 deprecated pki_dir but left
several references. These lines can be safely removed since
sensitive_dirs is already being used in each of these refs.
2017-11-29 19:45:19 -06:00
Thomas S Hatch
4a808827c8
Add a default config entry to the master config
2017-11-29 17:14:17 -07:00
Thomas S Hatch
3ef6beeb66
clean up and add basic config
2017-11-29 17:11:23 -07:00
Erik Johnson
74a18f387f
Update orchestration unit tests
2017-11-29 15:51:53 -06:00
Nicole Thomas
63e4b6970c
Merge pull request #44715 from spenceation/panos-2017-11-28
...
Added new functions PANOS functions.
2017-11-29 14:20:17 -05:00
rallytime
cf97cd8034
Bump deprecation notice in utils/args from Oxygen to Fluorine
2017-11-29 12:24:47 -05:00
Erik Johnson
943a524e77
Add wheel/runner return to changes dict for orchestration
2017-11-29 10:31:06 -06:00
Erik Johnson
0e37ad39c3
Add retcode documentation to orchestrate docs
2017-11-29 10:20:22 -06:00
Michael Calmer
9b67ec0d3d
use 'replace' strategy for invalid encodings
2017-11-29 16:57:31 +01:00
Michael Calmer
89e0781be7
ignore invalid characters when getting decoding error in cmd run
2017-11-29 16:53:36 +01:00
Erik Johnson
ecdd273231
Add info about runner/wheel retcodes to Oxygen release notes
2017-11-29 09:47:56 -06:00
Nicole Thomas
1855f3fe12
Merge pull request #43783 from garethgreenaway/43647_fix_InitiatorName_in_comments
...
[develop] Fix to grains/core.py
2017-11-29 09:05:59 -05:00
spenceation
443f58f2a1
Fixed LINT issues.
2017-11-29 08:33:58 -05:00
Anthony Shaw
4c2a7dfdd1
update version number
2017-11-29 16:12:56 +11:00
Nicole Thomas
061ac1b3ab
Merge pull request #44612 from zachmoody/netbox-module
...
Add NetBox execution module
2017-11-29 00:01:41 -05:00
Erik Johnson
18905cf32b
Add integration test for triggering orchestration failure via context
2017-11-28 22:03:11 -06:00
Erik Johnson
5e8eff9ff1
Add __context__ to runner/wheel loader instances
...
This allows us to use __context__ to set a retcode, which the client can
use to set the 'success' value.
2017-11-28 21:57:37 -06:00
Gareth J. Greenaway
73bae346cd
Swapping logic in _windows_iqn back to previous method to ensure tests pass.
2017-11-28 18:39:12 -08:00
Thomas S Hatch
4bde80b907
fix ref to the event bus
2017-11-28 16:49:55 -07:00
Thomas S Hatch
8446138b4c
Add prototype of master stats
2017-11-28 16:47:54 -07:00
Gareth J. Greenaway
89b546c075
Merge branch 'develop' into netbox-module
2017-11-28 15:25:42 -08:00
Anthony Shaw
3611e08a27
import absolute paths
2017-11-29 10:00:41 +11:00
Gareth J. Greenaway
5d387d55fc
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-11-28 13:37:00 -08:00
Gareth J. Greenaway
6ee18e4f38
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-11-28 13:35:11 -08:00
Anthony Shaw
a029f70cff
merge inbound, resolve conflict and remove unfinished state test module
2017-11-29 08:21:53 +11:00
Nicole Thomas
5bc454821b
Merge branch 'develop' into fixpip
2017-11-28 16:00:51 -05:00
slaws
8d7704dca8
Merge branch 'develop' into add-vault-approle
2017-11-28 20:41:40 +01:00
spenceation
678da78a61
Added new functions:
...
- get_dos_blocks
- get_local_admins
- test_fib_route
- test_security_policy
2017-11-28 13:47:17 -05:00
