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
60,779 Commits 24 Branches 182 Tags 341 MiB
8484815f58
Commit Graph

60779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Delaby
8484815f58 pep8 2016-02-23 14:09:47 +01:00
Mike Place
fb81e905e4 Merge pull request #31420 from twangboy/unversioned_pkgs 
Handle Unversioned Packages
 2016-02-22 16:46:24 -07:00
Mike Place
19d7810478 Merge pull request #31417 from jacobhammons/ddns-docs 
ddns state docs updated with notes regarding the name, zone, and keyfile.
 2016-02-22 16:16:48 -07:00
twangboy
816e991e87 Fix version check 2016-02-22 15:45:26 -07:00
twangboy
85d8b938ad Match unversioned packages to winrepo 2016-02-22 15:25:34 -07:00
Jacob Hammons
5c4cbbb572 Added notes regarding the name, zone, and keyfile. 2016-02-22 15:19:07 -07:00
Erik Johnson
ac6af79abc Merge pull request #31391 from redmcg/master_schedule_fix 
Added sanity check: is 'pillar' in self.opts
 2016-02-22 14:05:27 -06:00
Erik Johnson
c7bd13c9c9 Merge pull request #31376 from cro/suse_service2 
Some distros don't have a /lib/systemd
 2016-02-22 12:11:39 -06:00
Mike Place
105821efc7 Merge pull request #31352 from ticosax/pull-image-on-running 
[dockerng] Pull missing images when calling dockerng.running
 2016-02-22 09:54:10 -07:00
Mike Place
83294e4f3a Merge pull request #31378 from mcalmer/zypper-refresh-handling 
Zypper refresh handling
 2016-02-22 09:50:28 -07:00
Mike Place
e24685b89a Merge pull request #31373 from terminalmage/issue31229 
Use --set-upstream instead of --track to set upstream on older git
 2016-02-22 09:46:00 -07:00
Mike Place
c5790bc4d6 Merge pull request #31390 from abednarik/remove_deprecated_psed_in_lorgotate 
Fix Logrotate module.
 2016-02-22 09:09:15 -07:00
Michael Calmer
274e6467be do not change kwargs in refresh while checking a value 2016-02-22 09:51:01 +01:00
C. R. Oldham
f3fec5562e We need one more mocked return from listdir. 2016-02-21 21:55:08 -07:00
C. R. Oldham
ab9d9e7008 Can't add a tuple and a string. 2016-02-21 17:09:12 -07:00
Michael Calmer
644b14c273 simplify checking the refresh paramater 2016-02-21 11:26:51 +01:00
Erik Johnson
28f0a75cc1 Use --set-upstream instead of --track to set upstream on older git 
This pull request also adds some DRY logic to reduce code duplication,
adds an additional comment to the state return data in the event that
git.checkout was run, and fixes a minor logging inaccuracy (a
str.format() placeholder was used in a string but that string did not
call .format(), so the placeholder was being logged).

Other changes:

* If a new branch needs to be checked out, a hard reset to remote_rev was
  unnecessarily being performed afterwards. This had no functional effect
  since the act of checking out the new branch will place HEAD at
  remote_rev, but the reset was still redundant.

* Also, when a new branch is being checked out, the tracking branch was
  being unnecessarily set, since the act of checking out the branch would
  setup the tracking branch if the rev being checked out is a branch.

Fixes #31229.
 2016-02-20 21:52:46 -06:00
Brendan McGrath
91e74feaf3 Added sanity check: is 'pillar' in self.opts 
This fixes an exception that is thrown when using the 'when' clause in a
master scheduler. The master does not appear to create a 'pillar' entry
in self.opts
 2016-02-21 12:53:47 +11:00
abednarik
c1e0ff7785 Fix Logrotate module. 
There is an issue reported #31137 where current logrotate module
create a .bak file, when using it. This will break logrotate since .bak
file will be left in /etc/logrotate.d directory.
At the same time and as a consecuence of fixing this, file.psed was
replace with file.replace since psed is deprecated since long time.

Fixes #31137.
 2016-02-20 22:14:06 -03:00
Michael Calmer
db0e0de2fd add refresh option to more functions 2016-02-20 11:48:48 +01:00
Michael Calmer
5836be3f59 unify behavior of refresh 2016-02-20 11:48:48 +01:00
Mike Place
174ee10fc2 Merge pull request #31354 from ticosax/dont-require-auth-for-all-registries 
[dockerng] Dont require auth for all registries
 2016-02-19 22:45:10 -07:00
C. R. Oldham
8f12bdb1a0 Check to see if a path is a link, because it's likely that if it IS 
a link, one of the other paths points to it.  Ignore so we don't get
duplicates.
 2016-02-19 17:42:22 -07:00
C. R. Oldham
8f0e866f1b Some distros do not seem to have a /lib/systemd, but do have a /usr/lib/systemd 2016-02-19 17:42:13 -07:00
Nicole Thomas
8d0498eff4 Merge pull request #31368 from whiteinge/netapi-client-list 
Update list of netapi clients for autoclass
 2016-02-19 13:57:28 -07:00
Nicole Thomas
9b0e29107b Merge pull request #31367 from techhat/sdbdocs 
Add docs on how to actually use SDB
 2016-02-19 13:07:16 -07:00
Seth House
0cfe5d89a0 Update list of netapi clients for autoclass 2016-02-19 13:07:09 -07:00
Nicole Thomas
7e599f0e27 Merge pull request #31357 from ticosax/support-docker-inconsistencies 
[dockerng] Support docker inconsistencies
 2016-02-19 13:02:08 -07:00
Nicole Thomas
18bd78260d Merge pull request #31353 from ticosax/fix-when-port-are-integers 
[dockerng] Fix when ports are integers
 2016-02-19 12:55:30 -07:00
Nicole Thomas
dec254a7a2 Merge pull request #31346 from ticosax/backport-31130-to-2015.8 
Backport #31130 to 2015.8
 2016-02-19 12:46:48 -07:00
Joseph Hall
eea192a545 Add docs on how to actually use SDB 2016-02-19 11:55:39 -07:00
Nicole Thomas
d639d65381 Merge pull request #31332 from terminalmage/issue31167 
Clarify documentation for gitfs/hgfs/svnfs mountpoint and root options
 2016-02-19 11:31:29 -07:00
Nicole Thomas
d067e77fee Merge pull request #31305 from mcalmer/zypper-non-interactive-everywhere 
call zypper with option --non-interactive everywhere
 2016-02-19 11:14:56 -07:00
Nicolas Delaby
3672b8e7b1 docker daemon returns sometimes empty list and sometimes None 
We deal with it
 2016-02-19 17:26:21 +01:00
Nicolas Delaby
4a9f661d66 It exists public registries where auth is not required. 2016-02-19 16:57:52 +01:00
Nicolas Delaby
20fdc43968 Follow up for #31326 
ports will most likely be defined as integer
 2016-02-19 16:21:06 +01:00
Nicolas Delaby
8c86eeb4dc Pull missing images when calling dockerng.running 
fixes #29727
 2016-02-19 15:43:52 +01:00
Michael Calmer
75e776761c write a zypper command builder function 2016-02-19 11:50:31 +01:00
Nicolas Delaby
a8dc33a5e3 Saltnado provide also get parameters to the context 2016-02-19 09:11:15 +01:00
jacobhammons
98a14f8090 Merge pull request #31337 from jacobhammons/dot7 
Release notes and versioning for 2015.8.7
 2016-02-18 17:20:29 -07:00
Jacob Hammons
d4fb33939e Release notes and versioning for 2015.8.7 2016-02-18 17:19:54 -07:00
Erik Johnson
eebc325040 Clarify documentation for gitfs/hgfs/svnfs mountpoint and root options 2016-02-18 16:34:14 -06:00
Mike Place
f0ba9c1eca Merge pull request #31326 from ticosax/2015.8-dockerng-detect-settings-removal 
[dockerng ] Detect settings removal
 2016-02-18 15:02:50 -07:00
Nicolas Delaby
7bedd86ebe Add detection of removed settings. 
When removing settings from dockerng.running state definition,
changes where ignored as `_compare()` was iterating only over user defined
parameters.

By looping over all available options we are now sure to not miss
removed entries.

Extend definition of expected default values:

 - Some default values are predictable and hardcoded in the VALID_CREATE_OPTS dict.
 - Some default needs to be read from images (`image_path`)
 - Some defaults values are unpredictable (hostname, mac_address)
 we are comparing desired value against value reported by the container
 (`get_default_from_container`).
 2016-02-18 20:23:31 +01:00
Mike Place
130f515391 Merge pull request #31292 from twangboy/win_servermanager 
Fix dunder virtual to check for Remote Administration Tools
 2016-02-18 11:57:26 -07:00
Mike Place
5d31714b44 Merge pull request #31287 from joejulian/2015.8_30932_peer_probe_by_ip 
Rework tests and fix reverse peering with gluster 3.7
 2016-02-18 10:57:23 -07:00
Mike Place
a2f6447f8d Merge pull request #31196 from sakateka/utils-network-fix 
Here are a few fixes utils.network
 2016-02-18 10:27:00 -07:00
Mike Place
d20a30b8be Merge pull request #31299 from rallytime/fix-29795 
Allow state-output and state-verbose default settings to be set from CLI
 2016-02-18 10:25:23 -07:00
Mike Place
25d8af21c9 Merge pull request #31317 from terminalmage/git-version-audit 
Fix versonadded directive
 2016-02-18 09:56:32 -07:00
Erik Johnson
acc3b54621 Fix versonadded directive 2016-02-18 10:14:32 -06:00