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
62,250 Commits 24 Branches 182 Tags 341 MiB
d949110993
Commit Graph

62250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Hoefling
d949110993 Loop over updated keys in non recursive update 
Remove dict.update and always use loop because this is failing for
 NamespacedDictWrapper.
 2016-07-18 09:55:59 -06:00
Mike Place
e9e5bbe38b Merge pull request #34721 from rallytime/fix-34703 
Add output_file option to master config docs
 2016-07-16 14:04:02 -06:00
rallytime
9c803d05a5 Add output_file option to master config docs 
Fixes #34703
 2016-07-16 12:45:55 -06:00
Mike Place
08d00f3a61 Merge pull request #34689 from Azidburn/fix_pkg_sources 
fix second run problems with pkg.installed using sources
 2016-07-15 15:19:39 -06:00
Mike Place
4cb1ded520 Merge pull request #34695 from isbm/isbm-zypper-product-boolean-values 
Bugfix: Zypper `pkg.list_products` returns False on some empty values (2015.8)
 2016-07-15 15:08:00 -06:00
Bo Maryniuk
5ed5142fbc Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:12:03 +02:00
Bo Maryniuk
21444ee240 Bugfix: return boolean only for 'isbase' and 'installed' attributes 2016-07-15 17:11:31 +02:00
Marc Thomas
2c0fc919b3 fix second run problems with pkg.installed using sources 
Fixes #32276
 2016-07-15 14:11:11 +02:00
Justin Findlay
aaa6f7d80a update 2015.8.11 release notes (#34682) 2016-07-14 15:23:26 -06:00
Mike Place
3192e1674b Merge pull request #34676 from cachedout/partial_revert_34644 
Revert "Modify lodaer global test to use populated dunders"
 2016-07-14 12:12:55 -06:00
Mike Place
64a154826a Revert "Modify lodaer global test to use populated dunders" 
This reverts commit f45dbe8508df70ce3f563915318791614449b341.
 2016-07-14 12:11:44 -06:00
Mike Place
3b6f1089b2 Merge pull request #34601 from lorengordon/clarify-doc 
Clarifies the proper way to reference states
 2016-07-14 08:20:41 -06:00
Nicole Thomas
bc63f25a6f Lint 34644 (#34651) 
* Better error handling for __virtual__ in dockerng module

* Modify lodaer global test to use populated dunders

This prevents a number of errors in the error log and makes for a
more robust test IMHO

* Lint #34644
 2016-07-13 18:58:54 -04:00
Mike Place
50360263c5 Adjust the mine test a little bit to give it a better chance of success (#34647) 2016-07-13 16:51:28 -04:00
Mike Place
8a0209101e Merge pull request #34642 from jtand/mysql_integration_cleanup 
Check that mysqladmin exists before running mysql integration tests
 2016-07-13 12:12:44 -06:00
Justin Anderson
dd1559a599 Check that mysqladmin exists before running mysql integration tests. 2016-07-13 11:08:26 -06:00
Mike Place
3e612c3794 Merge pull request #34618 from jtand/network_integration_fix 
Network state integration test test=True
 2016-07-13 10:30:15 -06:00
Nicole Thomas
9f123543e5 Merge pull request #34617 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-07-12 16:11:40 -04:00
rallytime
3026df346f Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-07-12 13:27:16 -06:00
Nicole Thomas
b90ae407f9 Add support for edge case when Cmd and Entrypoint can't be blanked (#34593) 2016-07-12 15:18:53 -04:00
Justin Anderson
57df38e685 Update github IP for ssh state integration tests (#34592) 2016-07-12 15:17:41 -04:00
Ken Crowell
12b579c4e3 When sorting list actual_data, make it a list (#34590) 
This at least impacts the `running` state when updating container
with no `volumes_from` to some.
 2016-07-12 15:16:11 -04:00
Justin Anderson
34bcf9ccfc Changed network state test to use test=True 2016-07-12 12:40:40 -06:00
Nicole Thomas
2e1007254b Avoid circular imports when calling salt.utils functions (#34584) 2016-07-12 13:41:30 -04:00
Justin Anderson
7dd8035c62 Gate docker unit test to check for docker (#34591) 
* Gate docker unit test to check for docker

* Change skipIf to check if docker-py is installed, not version check
 2016-07-12 13:33:31 -04:00
Loren Gordon
bfe0dd0b8a Clarifies the proper way to reference states 
It seems in some situations, or in some earlier version, using a `/`
to reference sls files in subdirectories did work. However, because
of the inconsistency it caused occasional confusion. This updates the
tutorial to focus on the canonical `.` notation, which always works.
 2016-07-12 07:58:27 -04:00
Justin Anderson
b2616833b0 Some small changes 2016-07-11 14:35:25 -06:00
Erik Johnson
ae38c874da Add a bunch of documentation on getting files from other environments (#34560) 
* Remove :members: from fileserver docs pages

These functions can never be invoked directly from the CLI, so it is
pointless to include them in the documentation.

* Rename section

* Add docs page clarifying how to get files from different environments

* Add reminder that file_roots can be specified for masterless salt

* Link to the new environments page from the states tutorial

* Add information on pulling reactor configs from non-base environments

* Add examples of querystring syntax to cp module
 2016-07-08 17:15:27 -04:00
Mike Place
91e0656d44 Merge pull request #34531 from terminalmage/issue34397 
Support ignore_epoch argument in version comparisons
 2016-07-08 10:43:36 -06:00
Mike Place
e99befad47 Merge pull request #34545 from terminalmage/docker-exec-driver 
Handle cases where Docker Remote API returns an empty ExecutionDriver
 2016-07-08 10:34:30 -06:00
Mike Place
7120d43df0 Merge pull request #34546 from rallytime/rename-boto-secgroup-test 
Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test
 2016-07-08 10:16:42 -06:00
rallytime
f8a3622be7 Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test 2016-07-07 21:29:36 -06:00
Erik Johnson
dd5838e242 Handle cases where Docker Remote API returns an empty ExecutionDriver 
Also fix some poorly-formatted RST in the docstring.
 2016-07-07 21:54:46 -05:00
Nicole Thomas
ca92061821 Merge pull request #34537 from rallytime/rename-simple-test 
Rename tests.unit.simple to tests.unit.simple_test
 2016-07-07 20:08:36 -04:00
rallytime
ceefb6e34c Rename tests.unit.simple to tests.unit.simple_test 
These tests are not getting run automatically in a ./runtests.py -u
or on Jenkins runs. This name changes allows them to run automatically.
 2016-07-07 17:12:27 -06:00
Erik Johnson
d0fec1b8f6 salt/modules/zypper.py: accept ignore_epoch argument 2016-07-07 16:27:07 -05:00
Erik Johnson
5ae9463c1f salt/modules/yumpkg.py: accept ignore_epoch argument 2016-07-07 16:27:04 -05:00
Erik Johnson
c2791117af salt/modules/rpm.py: accept ignore_epoch argument 2016-07-07 16:27:01 -05:00
Erik Johnson
c5de8b880d salt/modules/ebuild.py: accept ignore_epoch argument 2016-07-07 16:26:59 -05:00
Erik Johnson
4ee8e8f037 salt/modules/aptpkg.py: accept ignore_epoch argument 2016-07-07 16:26:55 -05:00
Nicole Thomas
fbab2f8c2b [2015.8] Update bootstrap script to latest stable (#34527) 
Version 2016.07.07
 2016-07-07 17:26:35 -04:00
Erik Johnson
5b123b403c Pass ignore_epoch to salt.utils.compare_versions() 2016-07-07 16:25:28 -05:00
Erik Johnson
07368fac40 Accept ignore_epoch argument for salt.utils.compare_versions() 2016-07-07 16:24:58 -05:00
Mike Place
6b8c76af83 Prevent many errors in the test suite in loader tests (#34521) 
Pack in what the loader needs.
 2016-07-07 17:03:45 -04:00
Ahmed M. AbouZaid
c2f296c95b Fix wrong order of retention_policy_exists (#34507) 
The name of retention policy and database were reversed, so SaltStack was using rp name as database, so it returns "database does not exist"
 2016-07-07 16:43:32 -04:00
Mike Place
685df80929 Merge pull request #34518 from terminalmage/fix-pkg.latest-test 
Fix pkg.latest integration test for non-LTS ubuntu
 2016-07-07 13:29:13 -06:00
Justin Anderson
ed59113e94 Change network state integration test to use test=True 2016-07-07 12:27:18 -06:00
Erik Johnson
4aef44ecdf Fix pkg.latest integration test for non-LTS ubuntu 
This test uses ``pkg.list_upgrades`` to find a package which it assumes is
installed, to test ``pkg.installed`` with ``only_upgrade=True``. The
problem with that approach is that ``pkg.list_upgrades`` uses a dry-run
of an ``apt-get dist-upgrade`` to find the upgrades. On non-LTS Ubuntu
releases, a ``dist-upgrade`` results in upgrading to an entirely new
Ubuntu release, and new packages which would be installed by the
dist-upgrade (but are not currently installed) will be included in the
return data. This causes the test to fail when we attempt to run
``pkg.latest`` with ``only_upgrade=True`` on a package which is not
already installed.

This commit fixes the test by ensuring that our target package is
already installed, and continuing to iterate through the return data
from ``pkg.list_upgrades`` until a currently-installed package is found.
 2016-07-07 12:51:01 -05:00
Mike Place
a516f116d1 Merge pull request #34513 from cachedout/lower_loader_log 
Lower the log level for modules which cannot be loaded to trace
 2016-07-07 11:00:47 -06:00
Mike Place
733c5d00c0 Lower the log level for modules which cannot be loaded to trace 2016-07-07 10:57:51 -06:00