Commit Graph

85303 Commits

Author SHA1 Message Date
Nicole Thomas
cac096b311
Merge pull request #46434 from gtmanfred/highstate_return
split return key value correctly
2018-03-09 12:45:20 -05:00
Nicole Thomas
7dd71101ce
Merge pull request #46455 from whytewolf/Issue_44452_unicode_cloud
.format remove fix for #44452
2018-03-09 12:37:18 -05:00
Daniel Wallace
d18f1a55a7
fix pylint 2018-03-09 08:23:17 -07:00
Nicole Thomas
4c8d9026d3
Merge pull request #46428 from twangboy/win_fix_reqs
Fix issue with dev env install on Windows
2018-03-09 09:52:45 -05:00
Thomas Phipps
5fe474b1a8
.format remove fix for #44452 2018-03-08 13:57:18 -08:00
Daniel Wallace
e834d9a63b
Merge pull request #46454 from gtmanfred/kitchen
fix windows for kitchen
2018-03-08 14:19:30 -07:00
Nicole Thomas
2886dca88f
Merge pull request #46452 from gtmanfred/spm_cache_dir
make spm cache_dir instead of all cachedirs
2018-03-08 16:12:19 -05:00
Nicole Thomas
a188984cd9
Merge pull request #46446 from bdrung/fix-typos
Fix various typos
2018-03-08 16:11:46 -05:00
Daniel Wallace
9e2c3f7991
split return key value correctly 2018-03-08 13:38:52 -07:00
Nicole Thomas
e35fc5263c
Merge pull request #46309 from bdrung/dynamic-pillarenv
Support dynamic pillar_root environment
2018-03-08 14:15:35 -05:00
Daniel Wallace
169cf7a4e2
make spm cache_dir instead of all cachedirs
This will allow spm to be run as a non root user, with a cache dir set to
somewhere other than /var/cache/salt.
2018-03-08 10:27:16 -07:00
Daniel Wallace
b8ab8434a5
fix windows for kitchen 2018-03-08 09:43:36 -07:00
Nicole Thomas
35fe9827fe
Merge pull request #46430 from terminalmage/issue44032
Improve reliability/idempotence of file.blockreplace state
2018-03-08 10:41:37 -05:00
Benjamin Drung
7e6e80be87 heat: Fix spelling mistake of environment
The parameter `environment` is misspelled as `enviroment` in the heat
module/state. Fix the typo, document the rename, and add support for the
misspelled version for backward compatibility.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2018-03-08 16:14:54 +01:00
Benjamin Drung
a3c54b50f6 Fix various spelling mistakes
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2018-03-08 15:25:42 +01:00
Benjamin Drung
584b451fd1 Support dynamic pillar_root environment
Allow users to specify a __env__ pillar_root directory that applies
equally to all environments that are not explicitly specified.

fixes #20581
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2018-03-08 10:12:40 +01:00
Erik Johnson
f9f187e915
Improve reliability/idempotence of file.blockreplace state
This makes the following changes:

- The `append_newline` argument to the `file.blockreplace`
  remote-execution function has been modified so that if its value is
  `None`, it only appends a newline when the content block does not end
  in one.
- A couple of fixes were made to newline handling. The existing code
  normalized the newlines in the content block, replacing them with
  os.linesep. However, when the file contains newlines that don't match
  the OS (i.e. POSIX newlines in a file on a Windows box, or Windows
  newlines on a Linux/Mac/BSD/etc. box), then we would still end up with
  mixed newlines. The line separator is now detected when we read in the
  original file, and the detected line separator is used when writing
  the content block. Additionally, the same newline mismatch was
  possible when appending/prepending the content block. This has been
  fixed by using a common function for appending, prepending, and
  replacing the content block.
- Support for the `append_newline` argument has been added to the
  `file.blockreplace` state. The default value for the state is `None`.
  A `versionchanged` has been added to the remote execution function to
  let users know that the Fluorine release will change the default value
  of that variable.
- 20 new integration tests have been written to test the
  `file.blockreplace` state.
2018-03-07 22:29:39 -06:00
Nicole Thomas
2bad0a21c0
Merge pull request #46429 from twangboy/win_fix_snmp
Fix problem with __virtual__ in win_snmp
2018-03-07 18:26:45 -05:00
twangboy
8995a9b8de
Fix problem with __virtual__ in win_snmp
Exposes the `_key_exists` function in the reg.py module as `key_exists`
Fixes an issue where `key_exists` was throwing an error when the key
didn't exist
Fixes a problem with the `broadcast_change` function in the
`win_functions` salt util. It was using `unicode_literals` and those
aren't implemented until 2018.3. The ctypes.WinDLL function is expecting
a string value, not unicode
Have the __virtual__ function for win_snmp use the `key_exists` function
to detect the presence of the SNMP key in the registry. This will fail
gracefully if it doesn't exist
2018-03-07 13:48:19 -07:00
Nicole Thomas
93a572f229
Merge pull request #46100 from jfindlay/resolv_scope
Handle IPv6 scope parameter in resolv.conf
2018-03-07 14:51:19 -05:00
twangboy
e7ab97cc17
Remove six as a hard dep for Salt 2018-03-07 12:26:37 -07:00
twangboy
cc67e5c2ef
Set six to 1.11.0
CherryPy has a requisite of six>=1.11.0 and salt had a requisite of
six==1.10.0 which was causing a problem in the dev environment
2018-03-07 11:52:17 -07:00
Nicole Thomas
5acc1d5c54
Merge pull request #46420 from bdrung/2017.7
Fix SSH client exception if SSH is not found
2018-03-07 12:48:59 -05:00
Nicole Thomas
ca6a76e317
Merge pull request #46379 from angeloudy/2017.7
TypeError: a bytes-like object is required, not 'str'
2018-03-07 10:00:46 -05:00
Nicole Thomas
73f9233557
Merge pull request #46404 from gtmanfred/kitchen
get 2017.7 ready to switch over to the new jenkins
2018-03-07 09:29:30 -05:00
Benjamin Drung
e48c13d9e0 Fix SSH client exception if SSH is not found
When no SSH client is installed, salt will create an empty
SaltSystemExit exception:

Traceback (most recent call last):
  File "tests/unit/ssh/test_ssh.py", line 42, in test_password_failure
    client = ssh.SSH(opts)
  File "salt/client/ssh/__init__.py", line 226, in __init__
    raise salt.exceptions.SaltSystemExit('No ssh binary found in path -- ssh must be '
salt.exceptions.SaltSystemExit: None

The SaltSystemExit exception takes two parameters: code and msg.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2018-03-07 15:13:25 +01:00
angeloudy
3acb59c74c
Merge branch '2017.7' into 2017.7 2018-03-07 12:24:28 +11:00
angeloudy
d971e0c08b
Fix indent 2018-03-07 12:22:18 +11:00
Daniel Wallace
c56baa95a8
clone .git for the version tests 2018-03-06 15:36:35 -07:00
Daniel Wallace
3620611b5b
fix unhold package for debian 2018-03-06 14:54:40 -07:00
Daniel Wallace
5219f7d2ba
fix minion log path 2018-03-06 14:53:11 -07:00
Nicole Thomas
ca28cfd4e4
Merge pull request #46310 from twangboy/win_update_installer_build
Update the Windows installer build scripts
2018-03-06 15:21:57 -05:00
Nicole Thomas
decccbeca3
Merge pull request #46316 from twangboy/win_fix_dsc
Fix issues with the DSC module
2018-03-06 15:16:17 -05:00
Nicole Thomas
95586678c3
Merge pull request #46394 from Ch3LL/mac_doc
Add mac py2 and py3 packages to mac installation docs
2018-03-06 11:45:29 -05:00
Ch3LL
158add6661
change oxdownload to oxdownload-{python_version} 2018-03-06 11:12:42 -05:00
Ch3LL
21aa848c89
Add mac py2 and py3 packages to mac installation docs 2018-03-06 11:09:33 -05:00
Nicole Thomas
07b5d09ac1
Merge pull request #46338 from rallytime/fix-44831
Remove cmd.wait deprecation reference in docs
2018-03-05 16:48:51 -05:00
Justin Findlay
d5561bedaf
tests.unit.grains.core add scoped IPv6 nameserver 2018-03-05 12:31:04 -08:00
Justin Findlay
4e2e62d508
salt.utils.dns parse scope param for ipv6 servers
Recent versions of resolv.conf append the device name to IPv6 nameserver
IP address entries as a scoping parameter for that nameserver.  See for
example, https://bugzilla.redhat.com/show_bug.cgi?id=1093294#c4.
2018-03-05 12:30:08 -08:00
Nicole Thomas
3849e7a085
Merge pull request #46333 from danlsgiga/issue-42438
Fixes color parameter mismatch and handles 204 responses correctly
2018-03-05 14:42:25 -05:00
rallytime
90771da999
Remove cmd.wait deprecation reference in docs
There is a note about deprecating cmd.wait in the docs of the cmd state.
However, this function has not been put on an official deprecation path
and there are no plans to deprecate it. Therefore, we shouldn't have
this note in the docs.

See #44831 for more information.
2018-03-05 14:33:45 -05:00
Daniel Santos
3b13f37b44 Revert changes in the code and change docs instead 2018-03-05 10:12:47 -07:00
Daniel Santos
38114a65d8 Fixes color parameter mismatch and handles 204 responses correctly 2018-03-05 09:26:04 -07:00
Nicole Thomas
a8f2f1b063
Merge pull request #46322 from terminalmage/issue44935
yamlify_arg: don't treat leading dashes as lists
2018-03-05 10:40:16 -05:00
Nicole Thomas
da5c282cb2
Merge pull request #46327 from samilaine/fix-vmware-cloud-fqdn
Modify the way a FQDN is handled in the vmware cloud provider.
2018-03-05 10:35:37 -05:00
Nicole Thomas
78c45d3786
Merge pull request #46318 from terminalmage/squelch-warnings
Skip type-checking for several gitfs/git_pillar/winrepo params
2018-03-05 10:04:26 -05:00
Nicole Thomas
bb0d6fc263
Merge pull request #46312 from gtmanfred/2017.7
add module_dirs to salt ssh thin tarball
2018-03-05 10:00:47 -05:00
Nicole Thomas
88b5f7383d
Merge pull request #46242 from redbaron4/fix-46127
Pass env_vars to pip.freeze
2018-03-05 09:53:12 -05:00
Sami Laine
4b8dfb326f Modify the way a FQDN is handled in the vmware cloud provider. 2018-03-05 11:09:34 +02:00
Erik Johnson
85ac6a9893
yamlify_arg: don't treat leading dashes as lists
We had a similar check to ensure "foo: bar" isn't loaded as a dict, this
adds a check to ensure that we only load lists when there is a leading
bracket.
2018-03-03 15:02:12 -06:00