Commit Graph

77810 Commits

Author SHA1 Message Date
Morgan Willcock
ea6b7ed5af lint fixes 2017-02-13 11:00:01 +00:00
Morgan Willcock
c4a85c73aa Suggest use of shutdown states in-place of the shutdown modules 2017-02-11 21:22:27 +00:00
Morgan Willcock
6f1699d062 Add reboot and shutdown states to win_system 2017-02-11 20:56:53 +00:00
Mike Place
0a8c7e451b Merge pull request #39148 from a-schuurman/feature/dockerng-module-ipv4
Added ipv4 arg to connect_container_to_network
2017-02-03 10:15:17 -07:00
Mike Place
fa525567cf Merge pull request #39150 from rallytime/python3-compat-fixes
Python 3 Test Fixes
2017-02-03 10:13:58 -07:00
Jorge Schrauwen
387b10be25 zone state for Solaris 10/illumos (#39155)
* create zone state, zone.running, and zone.stopped

* renamed zone.running and zone.stopped, minor lint fixes

* cleanup message in zonecfg to make it clear for the zone state

* zone.property_present state

* zonecfg.set_property - should handle true/false parsed as boolean

* zonecfg module should be more consistant with message

* zone.property_absent implemented

* fix more minor issues in zonecfg when values get parsed as bool

* zonecfg fix spelling error

* improved zonecfg error message handling

* zonecfg parser should also do the reverse

* more improvements in zonecfg for parsing values

* small tweak to zonecfg simplyfy code for the zone state

* Add resource_present to zone state

* zonecfg lint fixes

* resource_absent state, lint fixed, test support

* zonecfg should be a bit more careful when removing the exported config

* zone.export state

* zone.import state

* zone.absent implemented

* zone.attached and zone.detached implemented

* very minor consistency fixes

* added zone.installed and zone.uninstalled, made zone.detached and zone.halted not fail on missing zone

* handle bool values in _parse_value

* add useful cleanup internal function to  zonecfg

* zonecfg - cleaned up _parse_value, added _sanitize_value and _dump_cfg for debugging

* zone.absent - uninstall would sometimes not do the right thing. some work on zone.present

* zone.present implemented path for when config does not yet exist

* zone.present supports updating properties

* zonecfg should support resources that do not have selectors

* zonecfg should also debug log remove_resource its config

* zone.present - implemented, after 2 refactors

* Finish documentation
2017-02-03 10:05:02 -07:00
Mike Place
4b7e82f01f Merge pull request #39160 from nobourbakist/fix-usermod-args
[Bugfix] fix argument order for usermod call
2017-02-03 09:45:45 -07:00
Frank Madro
699f302628 [Bugfix] fix argument order for usermod call
The argument order for the usermod -p call was reversed.
2017-02-03 15:26:34 +01:00
rallytime
4595f81685 [PY3] Sort return data and mock data for testing stability 2017-02-02 22:56:00 +00:00
rallytime
ee2edda14e [PY3] Test comment contents more carefully for list stability
Stabilizes these tests by avoiding errors when cheese, crackers
order changes in the comment and gives errors like:

-  'comment': 'Kernel modules crackers, cheese are already present',
?                                     --------

+  'comment': 'Kernel modules cheese, crackers are already present',
?                            ++++++++
2017-02-02 22:34:20 +00:00
a-schuurman
cddcb99a53 Added ipv4 arg to connect_container_to_network 2017-02-02 22:58:19 +01:00
Mike Place
f58ccdde6a Merge pull request #39093 from cachedout/zd_1151
Add a function to list extmods
2017-02-02 14:08:19 -07:00
Mike Place
d76ebdaaed Accidentially overwrote lint commit 2017-02-02 14:08:07 -07:00
Mike Place
56cb200cf8 Merge pull request #39027 from cloudflare/REDIS-CACHE
Redis cache plugin
2017-02-02 13:27:26 -07:00
Mike Place
8a24cad919 Merge pull request #39004 from markuskramerIgitt/compile_offline3
Compile offline3
2017-02-02 13:20:38 -07:00
Mike Place
c69dd4778b
Avoid reserved kw 2017-02-02 13:06:47 -07:00
Mike Place
b3ad1eebd7 Merge pull request #39092 from jacobweinstock/add-pillar-data-override-in-state-sls-id
add ability to override pillar data during state.sls_id run.
2017-02-02 12:33:08 -07:00
Mike Place
1f210ee0e3 Merge pull request #39130 from garethgreenaway/develop
Fix when targeting via pillar with Salt syndic
2017-02-02 12:28:02 -07:00
C. R. Oldham
8e6c155ead MANY dunder variable fixes for proxies + proxy keepalive from @mirceaulinic (#38829)
* Add proxy keep alive options

* Documentation for the alive function

* MANY dunder variable fixes for proxies.

* Lint.

* Lint.

* More Lint.
2017-02-02 11:35:40 -07:00
Gareth J. Greenaway
a52c3d96ba Missing colon 2017-02-02 09:30:24 -08:00
Nicole Thomas
8cd74af1e4 Merge pull request #39129 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-02-02 10:10:20 -07:00
Gareth J. Greenaway
75526f80c3 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-02 09:06:48 -08:00
10ne1
412615ec5a grains/core: Populate hw info for ARM devices (#38992)
Linux ARM targets use U-BOOT / fw_printenv and have no SMBIOS /
dmidecode installed. Set the manufacturer and serial number grains
using fw_printenv.

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
2017-02-02 08:57:54 -07:00
rallytime
eb61788f87 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/runners/all/index.rst
  - salt/modules/win_lgpo.py
  - salt/states/dockerio.py
2017-02-01 16:36:45 -07:00
Gareth J. Greenaway
26cb35df25 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-01 15:34:42 -08:00
Gareth J. Greenaway
19eed77fb0 Fixing a weird edge case when using salt syndics and targetting via pillar. Without this fix the master of masters ends up in an infinite loop since the data returned from the minions is differently structured than if a sync was not in use. 2017-02-01 15:34:35 -08:00
Mike Place
4480bd8858 Merge pull request #39114 from cloudflare/BGP-RUNNER
New networking runner: BGP
2017-02-01 16:05:08 -07:00
lomeroe
8b34fcdb45 correct checking of policy_class to compare with lower() version of the specified string (#39084) 2017-02-01 15:51:34 -07:00
lomeroe
8ce928f050 Backport #38779 to 2016.11 (#39089)
* ignore ADMX/ADML files with syntax errors

* narrow except for XML Syntax Error on admx file

* attempt to remove any "encoding='unicode'" from ADMX/ADML files if lxml does not support the encoding

* lint fixes

* fix bonehead typo
2017-02-01 15:50:42 -07:00
lomeroe
8a00ecfb79 update adml text search to use 'starts-with' as some policies text has trailing spaces (#39090) 2017-02-01 15:43:01 -07:00
lomeroe
9dccb9fbe3 correctly handle scenario when "storeAsText" is True on a decimal/longDecimal element object (#39088)
handle scenario that gpedit has not been run on a system (Machine and User GroupPolicy sub-folders do not exist)
handle scenario that startup/shutdown script policy file does not exist
2017-02-01 15:26:13 -07:00
Nicole Thomas
50d72da3f6 Merge pull request #39122 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-02-01 14:41:58 -07:00
rallytime
a782b00ee1 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/cloud/clouds/openstack.py
2017-02-01 13:35:10 -07:00
Jacob Weinstock
c6ad5d0ac3 use the pillar kwarg explicitely 2017-02-01 12:44:27 -07:00
Jacob Weinstock
8ec3e08664 add ability to override pillar data during state.sls_id run. 2017-02-01 12:44:27 -07:00
Mike Place
6100467288 Merge pull request #39036 from cro/no_docs_develop
Add CLI Examples so tests will pass (counterpart to #39035)
2017-02-01 12:31:29 -07:00
Mike Place
ceccb14ffd Merge pull request #39050 from The-Loeki/cache-roster2
Introduction of a new Salt-SSH cache roster with vastly expanded options
2017-02-01 12:25:24 -07:00
Mike Place
4ed8085d27 Merge pull request #39060 from harisokanovic/dev/hokanovi/hwclock-sync
system: Update hardware clock on date/time change
2017-02-01 12:22:20 -07:00
Mike Place
cc9b69b6bc Merge pull request #39091 from terminalmage/update-test-valid-docs
Run test_valid_docs in batches
2017-02-01 12:09:04 -07:00
Mike Place
f8a6863d98 Merge pull request #39087 from lomeroe/bp-37375
Backport #37375 to 2016.11
2017-02-01 12:02:57 -07:00
Mike Place
75bb1d88eb Merge pull request #39082 from bmwiedemann/systemdsleep
Add salt-minion.sleep
2017-02-01 11:57:42 -07:00
Mike Place
c4c6e701af Merge pull request #39094 from rallytime/doc-build-warnings
Add a bunch of missing doc module references
2017-02-01 11:56:26 -07:00
Mike Place
d302bb747e Merge pull request #39108 from janhorstmann/fix-x509-state
[Bugfix] Fix state x509.crl_managed
2017-02-01 11:32:42 -07:00
Mike Place
8ae6c54243 Merge pull request #39103 from arif-ali/fix_iface_lower
fixes #31393 don't convert the iface to lower case
2017-02-01 11:28:13 -07:00
Mike Place
4cd698ca33 Merge pull request #39104 from githubcdr/develop
Do not use name resolving for --notrim check
2017-02-01 11:25:27 -07:00
Mike Place
bf61ec9515 Merge pull request #39107 from cloudflare/FIX-38638
Check if data['return'] is dict type
2017-02-01 11:21:45 -07:00
Mircea Ulinic
c051f7ae7b BGP runner doc 2017-02-01 18:17:19 +00:00
Mircea Ulinic
ee45e1d8a6 BGP runner 2017-02-01 17:50:28 +00:00
jhorstmann
9f5c532510 [Bugfix] Fix state x509.crl_managed
A necesasary variable was overwritten with a bool breaking the state
2017-02-01 16:21:37 +01:00
Mircea Ulinic
7c34815979 Check if data['return'] is dict type 2017-02-01 12:18:10 +00:00