Commit Graph

85585 Commits

Author SHA1 Message Date
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 Wallace
d6d9e36359
add tests for names and listen/listen_in
Closes #30115
2018-03-05 12:15:23 -07:00
Daniel Wallace
3f8e0db572
let listen_in work with names 2018-03-05 11:31:32 -07:00
Daniel Wallace
7161f4d4df
fix listen to be able to handle names
Before this, multiple names would have the same stateid and module, so we need
the actual name to distinguish them

```
test:
  pkg.latest:
    - names:
      - nginx
      - cronie
  file.touch:
    - name: /tmp/test
  service.running:
    - names:
      - nginx
      - crond
    - listen:
      - file: test
```

Only one, nginx or crond would be restarted (should be the last one in the
list), because of how the ordered dict did the lookup.
2018-03-05 11:28:36 -07: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
Benjamin Drung
5008c53c44 Fix ValueError for template in AppsV1beta1DeploymentSpec
Instantiating AppsV1beta1DeploymentSpec without specifying a template
will raise:
ValueError: Invalid value for `template`, must not be `None`

Therefore directly specifying the template when instantiating
AppsV1beta1DeploymentSpec and use '' as default template. This fixes the
test_create_deployments test case (fixes #46329).

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2018-03-05 15:29:48 +01: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
Michael Calmer
c493ced415 add warning about future config option change 2018-03-03 13:41:56 +01:00
Erik Johnson
5889b36646
Skip type-checking for several gitfs/git_pillar/winrepo params
In some edge cases, the branch/directory paths used here could have
values loaded as int/float/etc., which is not a problem for
salt.utils.gitfs since it normalizes these values to strings. Therefore,
this commit removes them from VALID_OPTS so that we skip type-checking
to avoid spurious warnings in the log file.
2018-03-02 20:41:29 -06:00
twangboy
2042d33d59
Fix issues with the DSC module
Adds the `ignore_retcode` option to the _pshell helper function
The _pshell helper function will either return a dict or raise an error
When powershell returns an empty string, makes it an empty dict
Adds some `log.info` commands for easier debugging
Fixes some erroneous CLI Examples
Handles situations where _shell returns an empty dict
Handles situations where a powershell command completed successfully,
but returned invalid JSON
`dsc.get_config` returns a cleaner dict
Adds a `dsc.remove_config` function with the option to reset the dsc
environment entirely
Adds a `dsc.restore_config` function to rollback to a previous config
2018-03-02 18:46:12 -07:00
Nicole Thomas
a0716643e4
Merge pull request #46265 from Ch3LL/profit_cloud
Add username/password to profitbricks conf for cloud tests
2018-03-02 16:40:21 -05:00
Nicole Thomas
ed7bffa7e0
Merge pull request #46306 from rallytime/bp-46256
Back-port #46256 to 2017.7
2018-03-02 16:37:26 -05:00
Daniel Wallace
749ae580ed
add module_dirs to salt ssh thin tarball
Fixes #45535
2018-03-02 14:16:05 -07:00
twangboy
bcf8b19566
Update the installer build
Fixes some issues with Py3 not building
Brings the 2 build_env files more in line with each other
Fixes some typos in the build_env scripts
Removes the need for seperate req files for Py2 and Py3
Setup.py uses the windows req file on Windows
Removes the need to install pycrypto and pyyaml in setup.py. They are
now handled in the req.txt
Uses pypi resources instead of downloading .whl files and .exes for
dependencies
Updates nssm version to address the issue in #46192
Removes nssm from buildenv and downloads 32 and 64 bit versions of nssm
in build_pkg.bat
Removes the AppNoConsole=1 setting from the nsis script since it is not
needed with the new version of nssm
2018-03-02 13:04:48 -07:00
Nicole Thomas
8c2c4e3316
Merge pull request #46208 from terminalmage/audit-umask-usage
Blacklist os.umask
2018-03-02 13:46:06 -05:00
rallytime
6439bce4a8
Don't install msgpack 0.5.5
This version has known critical issues.

See da902f9c1d (r27725642)
for more information.
2018-03-02 13:39:33 -05:00
Nicole Thomas
978e869490
Merge pull request #46293 from eliasp/2017.7-44624-py3-compat
Fix Python3 comparison `TypeError` in `salt.modules.upstart`
2018-03-02 11:36:09 -05:00
Nicole Thomas
bee4a66d0c
Merge pull request #46264 from terminalmage/issue46128
Fix incorrect merge conflict resolution
2018-03-02 09:21:12 -05:00
Nicole Thomas
1e0b3aa348
Merge pull request #46296 from vutny/doc-pillar-get
[DOC] Add missing params to `pillar.get` docstring
2018-03-02 09:19:40 -05:00
Elias Probst
2e08b0d9c8
Fix Python3 comparison TypeError in salt.modules.upstart
Use `len()` to determine emptiness of a dictionary.

PR#44624 introduced a Python3 incompatible comparison where a dict is
compared against an integer, causing breakage on Ubuntu 18.04/bionic
which uses Python3 by default for SaltStack:

```
File "/usr/lib/python3/dist-packages/salt/modules/upstart.py", line 100, in _find_utmp
  if result > 0:
TypeError: '>' not supported between instances of 'dict' and 'int'
```
2018-03-02 14:42:05 +01:00
Denys Havrysh
1faa8331e1
[DOC] Add missing params to pillar.get docstring 2018-03-02 14:15:00 +02:00
Nicole Thomas
c490a50452
Merge pull request #45874 from GwiYeong/2017.7-local-client-hotfix
fix for local client timeout bug
2018-03-01 14:39:35 -05:00
Erik Johnson
9c92aadce8
Disable blacklisted-function check for legitimate uses 2018-03-01 12:17:39 -06:00
Nicole Thomas
8e8a3a2897
Merge pull request #46261 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2018-03-01 12:55:22 -05:00
Nicole Thomas
88a3166589
Merge pull request #46276 from terminalmage/issue44046
salt.utils.docker.translate_input: operate on deepcopy of kwargs
2018-03-01 10:37:43 -05:00
Dheeraj Gupta
06dba51617 Make changes from review 2018-03-01 10:45:22 +05:30
Erik Johnson
a14d4daf8c
salt.utils.docker.translate_input: operate on deepcopy of kwargs
This keeps the translation from rewriting the low chunks and breaking
the watch requisite.
2018-02-28 23:07:58 -06:00
Dheeraj
727ebe1056
Merge branch '2017.7' into fix-46127 2018-03-01 10:19:38 +05:30
Nicole Thomas
da60399b8f
Merge pull request #46183 from oeuftete/fix-docker-container-running-host-config-ulimits
Fix docker_container.running HostConfig Ulimits comparison
2018-02-28 17:22:11 -05:00
Ch3LL
d4893eab4c
Add username/password to profitbricks conf for cloud tests 2018-02-28 17:09:28 -05:00
Nicole Thomas
509429f08c
Merge pull request #46260 from terminalmage/git_pillar
Normalize global git_pillar/winrepo config items
2018-02-28 17:05:25 -05:00
Erik Johnson
68000b7211
Fix incorrect merge conflict resolution
This was fixed in develop (at the time, now 2018.3), but it doesn't look
like this was fixed in 2017.7.
2018-02-28 15:59:08 -06:00
Nicole Thomas
a97a3e6fb0
Merge pull request #46101 from jfindlay/openrc_ret
In OpenRC exec module, make sure to ignore retcode on status
2018-02-28 15:01:36 -05:00
rallytime
8256ae5ee5
Merge branch '2016.11' into '2017.7'
No conflicts.
2018-02-28 14:59:01 -05:00