Commit Graph

67778 Commits

Author SHA1 Message Date
Justin Anderson
28ba98c613 Skip some tests related to #32902 (#32995) 2016-05-03 08:55:23 -07:00
Nicole Thomas
8c70d7a56b Clarify some arg docs (#32994)
Fixes #26011

Also reorganizes some of the kwarg definitions so it's more
clear what is documented and what docs are missing.
2016-05-03 08:54:28 -07:00
Bo Maryniuk
1601a7e07a Prevent the use of "refreshable" together with "nolock" option. 2016-05-03 09:15:00 +02:00
Bo Maryniuk
52e1be2fa9 Remove unused variable in a constructor. Adjust the docstring accordingly. 2016-05-03 09:08:49 +02:00
Bo Maryniuk
7e00f566ef Move log message down to the point where it actually sleeps. Rephrase the message. 2016-05-03 09:05:16 +02:00
Bo Maryniuk
4b7dab83ff Fix PID file path for SLE11 2016-05-03 09:03:07 +02:00
Nicole Thomas
111e927b69 Merge pull request #32987 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-05-02 12:56:51 -06:00
rallytime
c12b9a5094 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-05-02 10:50:27 -06:00
Justin Anderson
00fbeaba5f Fix boto_secgroup_test (#32986) 2016-05-02 10:46:19 -06:00
Jorge Schrauwen
336236750f fix user cron on solarish operating systems (#32970)
* properly set cron entries on Solarish systems

* also fix write_cron_file(_verbose_

* minor tweak to make merging into 2016.3 and develop easier

* per @damon-atkins, be more restrictive with fpopen for the user crontab

* fix another small security hole by swapping fopen to fpopen + mode. fixed previous commit by switching back to 0600
2016-05-02 08:28:51 -07:00
Jorge Schrauwen
b196ff1191 #32966 dataset names should be case-sensitive (#32969) 2016-05-02 08:27:59 -07:00
Pedro Algarvio
1e8a2a18e6 Reset signal handling when restarting the minion. (#32963)
* Reset signal handling when restarting the minion.

This will avoid a hang on multiple failover masters on the 2nd restart.

This fix was hacked at +30000 feet. Kids, don't try this at home ;)

* Fix logging argument index. Switch to substitution.
2016-05-02 08:22:24 -07:00
Nicole Thomas
502f6f8e36 fix versionadded for openvswitch module (#32957) 2016-05-02 08:57:37 -06:00
Shane Lee
ae32f17b82 Add salt-config script to Mac Installer (#32873)
* Add script to configure salt

* Add salt-config.sh to installer scripts

* Add additional information to welcome/conclusion

* Fix text in conclusion

* Make salt-config.sh executable

* Create symlink to salt-config.sh

* Create minion.d directory

* Fix changed comparison to determine restart

* Add -f option to symlink creation
2016-04-29 11:01:20 -07:00
Justin Findlay
cc854f1464 update pip state and integration tests for newer pip versions (#32905)
* modules.virtualenv_mod: use correct pip bootstrap url

* modules.pip: raise error on mirrors arg

* states.pip: run mirrors test on < 7.0.0

* update pip integration test states to not use mirrors

* modules.pip: run mirrors tests on pip < 7.0.0
2016-04-29 10:49:29 -07:00
Justin Findlay
07e38bc9be salt.log.setup: process user args before format (#32796)
* salt.log.setup: process user args before format

Before:
    [DEBUG   ] too many %s
After:
    [DEBUG   ] too many secrets

* salt.log.setup: allow SaltLogRecord attrs on console
2016-04-29 10:47:01 -07:00
Nicole Thomas
041ed11db5 Use cmd_async instead of cmd when calling saltutil.revoke_auth (#32931)
Fixes #32896
2016-04-29 09:45:46 -07:00
Megan Wilhite
c57a2b8f3b Fix user present tests (#32895)
* fix user present tests for mac

* add setup and teardown methods

* add destructive and root decorators

* forgot teardown decorators

* fix pylint
2016-04-29 10:40:54 -06:00
brad-alexander
e7f7aa67d9 Add documentation for transport_opts (#32940) 2016-04-29 09:59:05 -06:00
Justin Findlay
b2d7c81f66 doc.ref.states.ordering: clarify requisite change (#32934) 2016-04-28 15:41:01 -06:00
Nicole Thomas
3f1faec755 Merge pull request #32932 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-04-28 15:30:17 -06:00
rallytime
9033060106 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/states/archive.py
2016-04-28 14:22:58 -06:00
Nicole Thomas
df41d5dfb1 mode should default to 'text' (#32928) 2016-04-28 14:16:19 -06:00
Justin Anderson
fa7e32afcc Fixing failures in gce_test and dimensiondata_test (#32921)
* Fixing failures in gce_test and dimensiondata_test

* Fixed lint
2016-04-28 14:15:22 -06:00
Nicole Thomas
f581a8218d Remove FileClient class references from docs - it doesn't exist. (#32925)
* Remove FileClient class references from docs - it doesn't exist.

Replace FileClient class references with mentions of the fileclient.py
module and replace code examples with salt.fileclient.get_file_client
examples.

Fixes #32646

* Don't reference minion import when not used
2016-04-28 14:14:40 -06:00
Nicole Thomas
31b96dec7b Update contents_grains option with relevant docs (#32922)
Instead of "works like contents_pillar". Also added grains example.

Fixes #23683
2016-04-28 13:49:07 -06:00
Nicole Thomas
e60c12640d Merge pull request #32926 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-04-28 13:47:52 -06:00
rallytime
5a184881be Merge branch '2015.5' into '2015.8'
No conflicts.
2016-04-28 12:33:10 -06:00
Megan Wilhite
1cd6a45b8f specify volume tags in profile configuration (#32908) 2016-04-28 10:14:45 -06:00
Nicole Thomas
85ca86de08 Update docs to warn users that -1 isn't valid for iptables insert state (#32906)
Fixes #23953

Also clarifies the append state doc to indicate that rules will
always be added to the end of a chain.
2016-04-28 10:14:28 -06:00
Nicole Thomas
cb68706db2 Allow profile options to be specified in provider file when using maps (#32900)
Fixes #32510
2016-04-28 10:07:14 -06:00
Shane Lee
7da7b2329d Remove _get_date_time_format function (#32903)
* Remove _get_date_time_format function

* Fix incorrect timelib version
2016-04-28 10:06:44 -06:00
steven 'haji' hajducko
98767d521d Reload renderers for local pillar after gitfs (#32912)
Because of the way the renderers are lazy loaded when using ext_pillar_first
and gitfs external pillar, the renderers for the local pillar object were
being set to the last loaded gitfs pillar.

This was causing the local pillar to fail to render.  This small fix
forces a reload of the renderers after all the external pillars are done
loading.
2016-04-28 09:57:25 -06:00
Nicole Thomas
1a55fcb733 Clarify service state opening docs - uses 'service' virtualname (#32880)
* Clarify service state opening docs - uses 'service' virtualname

Fixes #30855

* Add a few more clarifications to service state docs

And link to service execution modules list.
2016-04-27 14:32:27 -06:00
Erik Johnson
a98dea7503 archive.extracted: only manage user/group ownership when if_missing is a directory (#32893)
* Revert "Archive extracted perms update. (#32765)"

This reverts commit 66ba35261c.

* archive.extracted: only manage user/group ownership when if_missing is a directory

There might be a better way to properly enforce this this (such as using
os.chmod on each individual file), but the trouble with doing this right
now is that the archive functions for unzip and unrar do not return neat
lists of files, they just return the CLI output from the unzip/unrar
commands as a list of lines.

Fixes #32801.
2016-04-27 11:19:08 -06:00
Nicole Thomas
e1b40b3b76 Merge pull request #32884 from terminalmage/fix-incorrect-deprecation-notice
Fix incorrect deprecation notice
2016-04-27 09:47:35 -06:00
Bo Maryniuk
7f37961d4b Rename tags 2016-04-27 15:59:05 +02:00
Bo Maryniuk
c55b0fab58 Test DOM parsing 2016-04-27 15:43:35 +02:00
Bo Maryniuk
c54e928e4f Add exception handling test 2016-04-27 15:43:17 +02:00
Bo Maryniuk
3d245bbe84 Parse DOM out of the box, when XML mode is called 2016-04-27 15:42:50 +02:00
Bo Maryniuk
6a98f523ac Add Zypper caller test suite 2016-04-27 15:21:00 +02:00
Bo Maryniuk
f189f90124 Bugfix: always trigger __getattr__ to reset and increment the configuration before the call. 2016-04-27 15:05:57 +02:00
Bo Maryniuk
7e1712dd80 Fix tests according to the new calling model 2016-04-27 14:35:22 +02:00
Bo Maryniuk
3a30b7fbcd Remove an obsolete test case 2016-04-27 14:34:54 +02:00
Bo Maryniuk
6e5877a2ee Add Zypper Call mock 2016-04-27 14:34:31 +02:00
Bo Maryniuk
bb5540cb4a Bugfix: inverted logic on raising (or not) exceptions 2016-04-27 14:34:17 +02:00
Bo Maryniuk
ce9262fe71 Make Zypper caller module-level reusable 2016-04-27 11:14:31 +02:00
Bo Maryniuk
77dc8695af Update docstrings according to the bugfix 2016-04-27 11:13:43 +02:00
Bo Maryniuk
46d86b21d5 Bugfix: accept refresh override param 2016-04-27 11:13:17 +02:00
Bo Maryniuk
cb40618262 Fire an event about released Zypper with its result 2016-04-27 10:04:32 +02:00