Mike Place
b6c5314fe9
Merge pull request #43184 from terminalmage/issue43162
...
docker.compare_container: Perform boolean comparison when one side's value is null/None
2017-08-25 12:42:10 -06:00
lomeroe
33a30bac06
correcting bad format statement in search for policy to be disabled
2017-08-25 12:31:12 -05:00
Cory Wright
f00d3a9ddc
Add disk.format alias for disk.format_
2017-08-25 13:29:40 -04:00
Daniel Wallace
ccd2241777
Pin request install to version
...
This fails on centos 6 because its node is too old to support the version of
hawk bumped here https://github.com/request/request/pull/2751 , we can still
test the functionality. This will pull from github, and install a specific tag
version, and we still do the uninstall using the github path.
This should be more stable.
2017-08-25 10:23:35 -06:00
Jérémie Langlade
30dd6f5d12
Merge remote-tracking branch 'upstream/2017.7' into SuperPommeDeTerre-patch-#26995
2017-08-25 16:45:24 +02:00
Paul Miller
f7c945f6e4
Prevent spurious "Template does not exist" error
...
This was merged previously (though slightly differently) in #39516
Took me a second to track it down and then realized that I fixed this in 2016.x
2017-08-25 10:39:18 -04:00
Nicole Thomas
ace2715c60
Merge pull request #43178 from terminalmage/issue43143
...
git.detached: Fix traceback when rev is a SHA and is not present locally
2017-08-25 09:58:36 -04:00
Viktor Krivak
4164047951
Fix apache.config with multiple statement
...
At this moment when you post more than one statement in config only last
is used. Also file is rewrited multiple times until last statement is
written.
Example:
salt '*' apache.config /etc/httpd/conf.d/ports.conf config="[{'Listen': '8080'}, {'Proxy': "Something"}]"
Ends only with
Proxy Something
and ignore Listen 8080,
This patch fix this issue.
2017-08-25 15:56:40 +02:00
Erik Johnson
7279f98e92
docker_image states: Handle Hub images prefixed with "docker.io/"
...
On some platforms, for reason which I do not yet grok, images pulled
from the Hub are prefixed with "docker.io/". This causes the
docker_image states to fail unless the user manually adds "docker.io/"
before the image name.
This commit adds a new function called "docker.resolve_tag" which
disambiguates this variance and allows images to be specified without
the "docker.io/" prefix.
Resolves #42935 .
2017-08-25 00:06:28 -05:00
Mike Place
688125bb4f
Merge pull request #43165 from cloudflare/fix-napalm-ret
...
Improve napalm state output in debug mode
2017-08-24 17:05:37 -06:00
Mike Place
12e9507b9e
Merge pull request #43179 from terminalmage/old-deprecation
...
Fix missed deprecation
2017-08-24 16:52:33 -06:00
Erik Johnson
081f42ad71
docker.compare_container: Perform boolean comparison when one side's value is null/None
2017-08-24 17:40:12 -05:00
Nicole Thomas
a6a327b1e5
Merge pull request #43155 from terminalmage/issue43001
...
Resolve image ID during container comparison
2017-08-24 18:09:46 -04:00
garethgreenaway
0186835ebf
Fix docstring in test
2017-08-24 17:08:52 -05:00
Erik Johnson
2640833400
git.detached: Fix traceback when rev is a SHA and is not present locally
...
This catches the (expected) CommandExecutionError when git.describe is
run on a commit that doesn't exist.
This also renames the remote_ref_type variable to remote_rev_type. This
change was made for the 2017.7 branch, but this fix is being applied to
2016.11, so by making the rename here as well we will avoid a potential
bug from creeping in on a merge-forward.
2017-08-24 16:56:18 -05:00
Erik Johnson
3adf8ad04b
Fix missed deprecation
...
This removes an argument that was slated for deprecation in the Hydrogen
release.
2017-08-24 15:26:55 -05:00
Justin Bradfield
4f8e6c65e5
access safe_filename_leaf through utils.files, changed in #43172
2017-08-24 16:06:39 -04:00
Nicole Thomas
c071fd44c8
Merge pull request #43170 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-08-24 15:22:26 -04:00
garethgreenaway
b595440d90
Merge pull request #43171 from terminalmage/salt-utils-warning
...
Add warning about adding new functions to salt/utils/__init__.py
2017-08-24 12:10:22 -07:00
garethgreenaway
a0bb654e46
Fixing lint issues
2017-08-24 12:09:29 -07:00
garethgreenaway
034c325a09
Merge pull request #43168 from rallytime/bp-43041
...
Back-port #43041 to 2017.7
2017-08-24 12:07:22 -07:00
garethgreenaway
d48938e6b4
Merge pull request #43172 from rallytime/move-utils-funcs
...
Move new utils/__init__.py funcs to utils.files.py
2017-08-24 12:05:29 -07:00
garethgreenaway
4f273cac4f
Merge pull request #43173 from Ch3LL/add_branch_docs
...
Add New Release Branch Strategy to Contribution Docs
2017-08-24 12:04:55 -07:00
Ch3LL
1b24244bd3
Add New Release Branch Strategy to Contribution Docs
2017-08-24 12:51:00 -04:00
Erik Johnson
e60f586442
Merge pull request #43061 from pabloh007/fix-save-image-name-id
...
Have docker.save use the image name when valid if not use image id, i…
2017-08-24 11:32:01 -05:00
rallytime
5385c7901e
Move new utils/__init__.py funcs to utils.files.py
...
We're in the process of breaking up the utils/__init__.py file, so
let's steer clear of adding new funcs here.
This way we can avoid a deprecation process for these functions in
develop, since the funcs in this location were never released.
Refs #43056
2017-08-24 12:07:44 -04:00
Erik Johnson
7b5943a31a
Add warning about adding new functions to salt/utils/__init__.py
...
Since we are breaking this up, we don't want new functions added here.
2017-08-24 11:04:31 -05:00
rallytime
3daad5a3a2
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-08-24 11:57:29 -04:00
Darren Demicoli
d010b74b87
Do not try to match pillarenv with __env__
2017-08-24 11:53:34 -04:00
Mike Place
9da57543f8
Merge pull request #43166 from lomeroe/bp-43116-2017.7
...
Backport #43116 to 2017.7
2017-08-24 09:01:23 -06:00
Mircea Ulinic
c10717dc89
Lint and fix
2017-08-24 13:23:31 +00:00
Alessandro -oggei- Ogier
db94f3bb1c
better formatting
2017-08-24 15:07:08 +02:00
Alessandro -oggei- Ogier
e5cc667762
tests: fix a leftover and simplify some parts
2017-08-24 15:04:37 +02:00
Mircea Ulinic
1cd33cbaa9
Simplify the loaded_ret logic
2017-08-24 13:00:15 +00:00
Mircea Ulinic
0bbea6b04c
Document the new compliance_report arg
2017-08-24 12:33:27 +00:00
Mircea Ulinic
3a906109bd
Include compliance reports
...
For the netyang state, the compliance report will be
included by default in the pchanges dictionary.
It can be also returned in the comment field,
by enabling using the `compliance_report` option.
2017-08-24 12:26:46 +00:00
Mircea Ulinic
3634055e34
Improve napalm state output in debug mode
2017-08-24 11:05:32 +00:00
Alessandro -oggei- Ogier
13e5997457
lint
2017-08-24 12:49:39 +02:00
Jérémie Langlade
f42ae9b8cd
Merge branch 'SuperPommeDeTerre-patch-#26995' of https://github.com/SuperPommeDeTerre/salt into SuperPommeDeTerre-patch-#26995
2017-08-24 12:31:08 +02:00
SuperPommeDeTerre
e314102978
Fix typo.
2017-08-24 12:30:04 +02:00
SuperPommeDeTerre
db11e1985b
Fix for #26995
2017-08-24 12:30:03 +02:00
Alessandro -oggei- Ogier
216ced69e5
allow comma-separated pkgs lists, quote args, test deb behaviour
2017-08-24 12:00:36 +02:00
Alessandro -oggei- Ogier
d8612ae006
fix debootstrap and enhance packages selection/deletion via cmdline
2017-08-24 10:26:43 +02:00
Jérémie Langlade
50ee3d5682
Merge remote-tracking branch 'remotes/origin/2017.7' into SuperPommeDeTerre-patch-#26995
2017-08-24 09:07:34 +02:00
twangboy
2722e9521d
Use os.path.join to create paths
2017-08-23 14:43:44 -06:00
Justin Bradfield
42064883ea
state.py remove unused urllib import
2017-08-23 14:28:16 -04:00
Justin Bradfield
4957268b37
update state.py to use safe_filename_leaf
...
instead of urllib.quote generate state cache
filename by using safe_filename_leaf salt util method
2017-08-23 14:22:46 -04:00
garethgreenaway
b8ead879ed
Fixing lint issues
2017-08-23 14:18:23 -04:00
garethgreenaway
446457d017
Swapping from for import
2017-08-23 14:18:13 -04:00
Justin Bradfield
fb80e17400
state.py: fix import and utf8 encode before quote
2017-08-23 14:18:04 -04:00
