valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
62,228 Commits 24 Branches 182 Tags 341 MiB
3026df346f
Commit Graph

62228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
92962957c8 Merge pull request #34093 from terminalmage/issue33873 
Catch CommandExecutionError in pkg states
 2016-06-23 14:00:13 -07:00
Mike Place
cb5399787c Merge pull request #34136 from meaksh/salt-suse-os-detection-2015.8 
Fixed behavior for SUSE OS grains in 2015.8
 2016-06-23 13:24:58 -07:00
Daniel Wallace
82183f1572 return list of nodes for lxc driver when called directly 
This is required so that salt-cloud sees a dictionary list of lxc
containers that exist so that they do not attempt to recreate the
container.

The downside to this is that if the container is stopped, it is not
started.

Fixes #33633
 2016-06-23 14:39:48 -05:00
Mike Place
8d5ed91980 Merge pull request #34225 from richardscollin/fix-win-set-datetime 
Fix win_system.set_system_date_time
 2016-06-23 10:49:48 -07:00
Mike Place
cb1e8bf082 Merge pull request #34232 from thegoodduke/for_2015.5_ipset 
ipset: fix commont containing blank
 2016-06-23 10:08:05 -07:00
C. Gao
344eb60762 ipset: fix commont containing blank 2016-06-23 11:14:58 +08:00
lomeroe
56c7267631 fix regression from #33681 which causes pulling a list of s3 objects via s3.query to fail (#34208) 2016-06-22 17:02:33 -04:00
Erik Johnson
02eb331494 Fix a pair of gitfs bugs (#34218) 
* Add salt.utils.is_hex()

* dulwich: use salt.utils.is_hex() to confirm ref is hexidecimal

* Restore ability for SHA1 saltenvs to be used in gitfs

This uses salt.utils.is_hex() to check if the desired environment is
hex, and allowing it to be used for gitfs operations when it is.

* pygit2: Catch ValueError when trying to resolve SHA1

Hex SHAs which are less than 4 characters will raise a ValueError, this
commit catches these exceptions.

See https://github.com/saltstack/salt/issues/34213 for more information.
 2016-06-22 16:11:06 -04:00
Collin Richards
6286771ef7 Fix win_system.set_system_date_time 
Previously time values could not be set to zero and would simply leave
the previous time value when attempting to set the time.
 2016-06-22 14:37:49 -05:00
Mike Place
6d643cd528 Merge pull request #34182 from rallytime/fix-34043 
Handle child PIDs differently depending on the availability of psutils
 2016-06-22 12:22:06 -07:00
Erik Johnson
5d3ec31564 Clarify pkg.list_repo_pkgs docstring for held packages (#34188) 2016-06-22 13:54:59 -04:00
Erik Johnson
5bca5c42f1 Change target for dockerng assuming default status to Nitrogen release (#34206) 
The work I need to do in the loader to achieve this is not likely to be
done in time for the Carbon release.
 2016-06-22 12:04:13 -04:00
Nicole Thomas
1c4369d093 Merge pull request #34184 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-06-21 17:43:46 -04:00
rallytime
8e36e90966 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - tests/unit/modules/boto_vpc_test.py
 2016-06-21 14:47:23 -06:00
rallytime
b7d49c5052 Handle child PIDs differently depending on the availability of psutils 
Fixes #34043
 2016-06-21 14:21:16 -06:00
Mike Place
5411ebb3b4 Merge pull request #34141 from jtand/boto_vpc_test_fix 
Fixed boto_vpc_test failure
 2016-06-21 13:08:11 -07:00
Mike Place
c059d6c08c Merge pull request #34176 from rallytime/bp-34103 
Back-port #34103 to 2015.8
 2016-06-21 13:01:45 -07:00
Mike Place
5cbaaed167 Merge pull request #34179 from terminalmage/issue34114 
Raise the correct exception when gitfs lockfile is empty
 2016-06-21 13:00:59 -07:00
Mike Place
67deded119 Merge pull request #34178 from terminalmage/remove-comment 
Remove unnecesssary comment
 2016-06-21 12:15:37 -07:00
Erik Johnson
86d1b8e864 Raise the correct exception when gitfs lockfile is empty 
Catching the ValueError around line 416 means that when we re-raise
the exception below, we raise the wrong exception. This commit
explicitly raises the outer-scope exception that we caught above the
block where we attempt to read from the lock file.

Resolves #34114.
 2016-06-21 13:48:32 -05:00
Erik Johnson
4965be72b1 Remove unnecesssary comment 
This was part of some intermediate work while I was working on ab9da90c
and it should have been removed.
 2016-06-21 13:28:19 -05:00
Erik Johnson
5edb45d746 win_pkg: refresh pkg database if refresh=True passed to version() or list_pkgs() 2016-06-21 12:54:51 -05:00
Erik Johnson
0078adee35 Catch CommandExecutionError in pkg states 
Recent changes to winrepo cause a CommandExecutionError to be raised
when there is no winrepo cache. This catches these and gracefully fails
the state.

Resolves #33873.
 2016-06-21 12:43:38 -05:00
Morgan Willcock
2e5e7ed03c Fix diskusage beacon 
Stop trying to load the entire mount dict as the mount point.
 2016-06-21 10:51:26 -06:00
Michael Calmer
6387d1636e fix salt --summary to count not responding minions correctly (#34165) 
In case a minion is not responding a dict is returned instead of a string.
 2016-06-21 12:10:48 -04:00
Nicole Thomas
e5949ea6f1 doc: add missing dot (#34175) 2016-06-21 12:09:00 -04:00
Nicole Thomas
47595d6795 Typo fix (#34174) 2016-06-21 12:08:43 -04:00
Mike Place
3669048654 Merge pull request #34077 from rallytime/grains-tests 
Add some grains targeting tests
 2016-06-21 09:06:30 -07:00
rallytime
2199bb8a78 Add integration tests for grains.append 2016-06-20 16:44:22 -06:00
Justin Anderson
b7ac6c735a Moved imports to top, out of _get_moto_version function 2016-06-20 13:20:43 -06:00
Mike Place
65fba5b4d7 Merge pull request #34142 from isbm/isbm-getid-loglevel-shift 
Move log message from INFO to DEBUG.
 2016-06-20 11:57:34 -07:00
Justin Anderson
02f9ba99ba Updated version check. Moved check into it's own function 2016-06-20 10:33:13 -06:00
Bo Maryniuk
236a67b702 Move log message from INFO to DEBUG. 2016-06-20 17:53:59 +02:00
Justin Anderson
d445026c56 Updated test to work with new moto version. Changed strings to unicode 2016-06-20 09:26:39 -06:00
Pablo Suárez Hernández
97f1958863 some cleanup and renaming 2016-06-20 15:47:34 +01:00
Pablo Suárez Hernández
72c8e5d78f better way to check for openSUSE Leap 2016-06-20 15:47:34 +01:00
Pablo Suárez Hernández
548971bdc9 Fix for SUSE OS grains in 2015.8 2016-06-20 13:13:00 +01:00
Erik Johnson
79a719b719 Update documentation on "refresh" behavior in pkg states (#34100) 2016-06-17 18:42:35 -04:00
Justin Findlay
6d0d52fa86 modules.pkg int tests: skip refresh_db upon error (#34072) 2016-06-17 09:35:47 -06:00
rallytime
37cfe70724 Add some grains targeting tests 2016-06-16 17:02:46 -06:00
Thomas S Hatch
1b76de1557 Merge pull request #34069 from rallytime/test-minion-return-message 
Add a test to check for disconnected minion messaging
 2016-06-16 15:18:38 -06:00
Thomas S Hatch
3119693dac Merge pull request #34048 from terminalmage/issue30100 
RFC: proposed fix for multiple fileserver updates in masterless runs
 2016-06-16 15:10:59 -06:00
rallytime
60561ac6fc Add a test to check for disconnected minion messaging 2016-06-16 14:07:05 -06:00
Thomas S Hatch
dd03024931 Merge pull request #34011 from rallytime/bp-33948-2015.8 
Back-port #33948 and #34009 to 2015.8
 2016-06-16 09:41:01 -06:00
Tim Egbert
bca437128e Fixed a bug in the consul.py module that was preventing services (#34051) 
from registering in consul.agent_service_register. A nonexistent
dict key was being referenced, causing an Excpetion and failure to
register the service. This fix required only changing the offending
line to use the "get" method and supplying a default value.
 2016-06-16 11:20:41 -04:00
Erik Johnson
715e7af8a4 Ensure only one fileserver update in a masterless run 
Resolves #30100.
 2016-06-15 14:49:27 -05:00
jacobhammons
8ba117c7f6 Merge pull request #34045 from jacobhammons/release-prev 
Updated latest release version
 2016-06-15 13:22:42 -06:00
Jacob Hammons
43b4a12aa2 Updated latest release version 2016-06-15 13:22:06 -06:00
Shane Lee
f9bfcde61f Always make changes to minion config if set (#34020) 2016-06-15 12:53:53 -04:00
Denys Havrysh
e25dba49e2 More YAML indentation fixes in state module examples (#34030) 
* states.file: fix indentation in YAML examples

* More YAML indentation fixes
 2016-06-15 12:40:12 -04:00