garethgreenaway
882fcd846f
Merge pull request #43029 from terminalmage/fix-func-alias
...
Normalize the salt caching API
2017-08-21 09:54:58 -07:00
Michael Calmer
cf6563645b
add support for certificate authentication to kubernetes module
2017-08-21 10:46:29 -04:00
Nicole Thomas
dbee735f6e
Merge pull request #43039 from gtmanfred/kube
...
catch ImportError for kubernetes.client import
2017-08-21 10:32:37 -04:00
Nicole Thomas
1b1b6da803
Merge pull request #43064 from terminalmage/issue42869
...
Fix race condition in git.latest
2017-08-21 10:29:52 -04:00
Nicole Thomas
c56a8499b3
Merge pull request #43058 from rallytime/fix-release-num
...
Update release version number for jenkins.run function
2017-08-21 10:13:34 -04:00
Damon Atkins
08ded1546e
more lint
2017-08-19 17:07:28 +10:00
Damon Atkins
6e9c0957fb
fix typo
2017-08-19 15:21:48 +10:00
Damon Atkins
ee41171c9f
lint fixes
2017-08-19 11:39:41 +10:00
Erik Johnson
093c0c2f77
Fix race condition in git.latest
...
The git.latest state runs a `git ls-remote` on the remote repo to
discover which SHA it should end up at, and whether or not it needs to
fetch from the repo to get the commit it needs. However, since we
fast-forward using a `git merge` to the branch specified in the `rev`
argument, this leaves the state susceptible to a race condition when
someone pushes to the remote repo between when we run the `git
ls-remote` and when we fetch the remote repo. We will successfully
fast-forward to the head of the branch, but that branch will be pointing
to a different commit than the one identified in the `git ls-remote`, so
we will report the state as having failed.
This commit fixes that race condition by fast-forwarding to the commit
identified in the `git ls-remote`, rather than to the branch named by
`rev`.
NOTE: This means that in these edge cases, we will report a `True`
result despite the head of the branch having advanced past the commit to
which we fast-forwarded, but that seems like a reasonable trade-off for
avoiding a race condition. If we repeated the `git ls-remote` after
fetching, we'd just be opening up a window (albeit a smaller one) for
another race condition.
2017-08-18 16:39:01 -05:00
Nicole Thomas
96e8e836d1
Merge pull request #43054 from lorengordon/fix/yumpkg/config-parser
...
Uses ConfigParser to read yum config files
2017-08-18 16:49:43 -04:00
Arount
3b2cb81a72
fix typo in salt.modules.yumpkg
2017-08-18 14:36:02 -04:00
Arount
38add0e4a2
break if leading comments are all fetched
2017-08-18 14:35:46 -04:00
Arount
d7f65dc7a7
fix configparser import & log if error was raised
2017-08-18 14:35:14 -04:00
Arount
ca1b1bb633
use configparser to parse yum repo file
2017-08-18 14:34:55 -04:00
twangboy
ef8a14cdf9
Remove /opt/salt instead of /opt/salt/bin
2017-08-18 12:19:04 -06:00
twangboy
2dd62aa1da
Add more information to the description
2017-08-18 12:09:08 -06:00
twangboy
f44f5b70dc
Only stop services if they are running
...
Otherwise it will cause an error and the installation will fail
2017-08-18 11:52:34 -06:00
twangboy
3b62bf953c
Remove salt from the path
2017-08-18 11:44:35 -06:00
twangboy
ebdca3a0f5
Update pkg-scripts
...
Improves logging
Removes /opt/salt/bin directory before install
Removes symlink to salt-config before install
2017-08-18 11:25:32 -06:00
Nicole Thomas
7b0c94768a
Merge pull request #43051 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-08-18 13:05:57 -04:00
Damon Atkins
8c864f02c7
fix missing imports
2017-08-19 02:35:37 +10:00
Damon Atkins
964cebd954
safe_filename_leaf(file_basename) and safe_filepath(file_path_name)
...
fe_filename_leaf
input the basename of a file, without the directory tree, and returns a safe name to use
i.e. only the required characters are converted by urllib.quote
If the input is a PY2 String, output a PY2 String. If input is Unicode output Unicode.
For consistency all platforms are treated the same. Hard coded to utf8 as its ascii compatible
windows is \ / : * ? " < > | posix is /
safe_filepath
input the full path and filename, splits on directory separator and calls safe_filename_leaf for
each part of the path.
2017-08-19 02:23:26 +10:00
rallytime
153a463b86
Lint: Add missing blank line
2017-08-18 10:59:12 -04:00
rallytime
d7eef70df0
Update release version number for jenkins.run function
...
This function was added for the 2017.7.0 release, not Carbon.
2017-08-18 09:44:22 -04:00
rallytime
84829a6f8c
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/jenkins.py
- salt/states/jenkins.py
2017-08-18 09:13:54 -04:00
Nicole Thomas
d15b0ca937
Merge pull request #43035 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2017.7.1 to 2017.7
2017-08-18 08:58:16 -04:00
Nicole Thomas
43aa46f512
Merge pull request #43048 from rallytime/bp-43031
...
Back-port #43031 to 2016.11
2017-08-18 08:56:03 -04:00
Daniel Wallace
35e45049e2
use a ruby gem that doesn't have dependencies
2017-08-18 08:55:02 -04:00
garethgreenaway
ad89ff3104
Merge pull request #43023 from terminalmage/fix-jenkins-xml-caching
...
Fixes/improvements to Jenkins state/module
2017-08-17 18:33:10 -07:00
garethgreenaway
2957467ed7
Merge pull request #43026 from rallytime/bp-43020
...
Back-port #43020 to 2016.11
2017-08-17 16:19:46 -07:00
garethgreenaway
bcbb973a71
Merge pull request #43034 from rallytime/bp-43002
...
Back-port #43002 to 2017.7
2017-08-17 16:18:15 -07:00
garethgreenaway
9182f55bbb
Merge pull request #42958 from gtmanfred/2017.7
...
runit module should also be loaded as runit
2017-08-17 15:30:22 -07:00
garethgreenaway
5985cc4e8e
Merge pull request #43031 from gtmanfred/test_gem
...
use a ruby gem that doesn't have dependencies
2017-08-17 15:26:24 -07:00
garethgreenaway
246176b1a6
Merge pull request #43030 from rallytime/dockermod-minor-change
...
Small cleanup to dockermod.save
2017-08-17 15:25:59 -07:00
garethgreenaway
4150b094fe
Merge pull request #43033 from rallytime/bp-42760
...
Back-port #42760 to 2016.11
2017-08-17 15:24:42 -07:00
garethgreenaway
33fd8ff939
Update jenkins.py
2017-08-17 15:22:31 -07:00
Erik Johnson
f8f74a310c
Update localfs cache tests to reflect changes to func naming
2017-08-17 17:19:34 -05:00
Mike Place
fc306fc8c3
Add missing colon in if statement
2017-08-17 15:57:42 -06:00
twangboy
fbe54c9a33
Remove unused import six (lint)
2017-08-17 15:54:38 -06:00
Mike Place
b124d3667e
Merge pull request #43032 from rallytime/bp-42547
...
Back-port #42547 to 2016.11
2017-08-17 15:53:50 -06:00
Daniel Wallace
7e269cb368
catch ImportError for kubernetes.client import
2017-08-17 15:46:10 -06:00
matt
73315f0cf0
Issue #43036 Bhyve virtual grain in Linux VMs
2017-08-17 17:06:17 -04:00
rallytime
756128a896
Merge branch '2017.7.1' into '2017.7'
...
No conflicts.
2017-08-17 16:52:06 -04:00
Maximilien Cuony
350c0767dc
Try to fix #42989 by doing sslVerify and refspecs for origin remote only if there is no remotes
2017-08-17 16:45:47 -04:00
Aljosha Friemann
3e3f7f5d8e
Catch TypeError thrown by m2crypto when parsing missing subjects in certificate files.
2017-08-17 16:38:37 -04:00
Tobias Macey
ea4d7f4176
Updated testinfra modules to work with more recent versions
...
The TestInfra library changed the package layout recently which caused
the extension module to stop working. This patch addresses those
updates and will work across all versions of the library.
2017-08-17 16:36:59 -04:00
rallytime
d6a5e85632
Small cleanup to dockermod.save
...
Removes the call to get ``compression`` out of the kwargs dict as
``compression`` is already listed in the list of positional kwargs.
2017-08-17 16:30:46 -04:00
twangboy
7f5ee55f57
Fix unit.utils.test_url for Windows
...
Detect escaped urls in Windows
Unescape urls in Windows
Fix tests to deal with sanitized Windows paths
2017-08-17 14:20:25 -06:00
Erik Johnson
c4ae79b229
Rename other refs to cache.ls with cache.list
2017-08-17 15:06:09 -05:00
Nicole Thomas
a88386ad44
Merge pull request #43027 from pabloh007/fix-docker-save-push-2016-11
...
Fixes ignore push flag for docker.push module issue #42992
2017-08-17 15:55:37 -04:00
