valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,322 Commits 24 Branches 182 Tags 341 MiB
2395951d36
Commit Graph

94322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Maryniuk
2f28a4cfd3 Prevent crash if the master is not running as root, but previously running master as root made it 2018-05-17 11:32:04 +02:00
Daniel Wallace
75d42d8963
Fix last test for tornado 
Thank you so much @bdarnell for helping me get this last fix.

With this, the test suite passes with tornado 5.
 2018-05-16 21:23:25 -05:00
Daniel Wallace
a046512287
allow using tornado 5.0 2018-05-16 21:23:25 -05:00
Christoph Moench-Tegeder
1529ed2621 postgres: remove all references to "CREATEUSER" role flag 
The CREATEUSER flag has been an alias of the SUPERUSER flag, but
was already declared obsolete in PostgreSQL 8.1 (see the documentation
https://www.postgresql.org/docs/8.1/static/sql-createrole.html for
reference). PostgreSQL 8.1 has been EoLed in November 2010
( https://www.postgresql.org/support/versioning/ ), which is a
long time ago. In PostgreSQL 9.6 (released September 2016), support
for the CREATEUSER keyword has finally been removed:
https://www.postgresql.org/docs/current/static/release-9-6.html

The state modules state.postgres_group and state.postgres_user
use the "createuser" flag as an alias to the "createroles" flag
(and their documentation notes that this use differs from the
PostgreSQL usage of the flag of the same name). To add to the
confusion, the execution module modules.postgresql uses the
"createuser" flag to set the "superuser" flag if "superuser"
is set to None.

This patch removes all mentions of "createuser" from the state
and execution module and from associated tests (docstrings have
been fixed, too). This should reduce confusion by a fair amount
and brings the Saltstack interface to PostgreSQL's own terms.
 2018-05-16 22:21:10 +02:00
Erik Johnson
0d02cee7c0
Allow docker.port to accept a pattern for the container name 
This modifies this function to allow a user to get results for all
containers matching a given pattern.
 2018-05-16 15:06:38 -05:00
Matt Phillips
3dc821f795 salt.cloud: use salt.utils.dictupdate.update for provider 
shallow copy was blasting things like minion_master in provider when grains
were provided in map and profile.

additionally noticed a bug while adding tests that map_data() is destructive on
self.rendered_map; we now deepcopy before map_data does its thing.
 2018-05-16 13:46:41 -04:00
Matt Phillips
5414b31800 salt-cloud: allow map nodes to override provider 
due to the way salt-cloud was previously pulling provider from only the profile,
it made it impossible to use map node overrides to override a provider. This
patch makes that possible.
The main usecase for this is having profiles that model your node type (db,
webapp, etc), without having to duplicate across providers. Your map can then
specify provider specific overrides whilst keeping profiles unique and DRY:

webapp:
  - node1:
    provider: ny:openstack
  - node2:
    provider: nj:openstack
  - node3:
    provider: toronto:openstack

etc.
 2018-05-16 13:46:40 -04:00
rallytime
9b1773a763
Merge branch '2018.3.1' into '2018.3' 
Conflicts:
  - tests/integration/states/test_pip_state.py
 2018-05-16 12:43:41 -04:00
Nicole Thomas
9ee2786b62
Merge pull request #47666 from bebosudo/bebosudo-jinja-error-add-reference-logs 
Add reference to the logs when state cannot be rendered.
 2018-05-16 11:58:45 -04:00
Nicole Thomas
12c028f344
Merge pull request #47662 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-05-16 11:53:50 -04:00
Nicole Thomas
cb04d9c37e
Merge pull request #47661 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-16 11:53:35 -04:00
David Murphy
220f887fa6 Fixed review comment, changed file.chown to file.makedirs_perms 2018-05-16 09:48:22 -06:00
David Murphy
b15a1652b5 Changed versionadded from 2018.3.1 to 2018.3.2, to reflect when change should be accepted 2018-05-16 09:45:47 -06:00
David Murphy
90eb03e375 Additional error checking and minor cleanup 2018-05-16 09:45:47 -06:00
David Murphy
40d77e03d2 Correct building rpms with non-root user 2018-05-16 09:45:47 -06:00
Pablo Suárez Hernández
f129843ae9
Refactor: use dict.setdefault instead if-else statement 2018-05-16 16:31:19 +01:00
Pablo Suárez Hernández
ea0e1a15a4
Add unit tests for info_installed with all_versions 2018-05-16 16:31:19 +01:00
Pablo Suárez Hernández
ae2ef507d6
Add 'all_versions' documentation for info_installed on yum/zypper modules 2018-05-16 16:31:19 +01:00
Pablo Suárez Hernández
02e7647fcf
Prevent adding failed packages when pkg name contains the arch (on SUSE) 2018-05-16 16:31:19 +01:00
Pablo Suárez Hernández
2f18f858bc
Enable "all_versions" parameter for yumpkg.info_installed 2018-05-16 16:31:18 +01:00
Pablo Suárez Hernández
5960260605
Enable "all_versions" parameter for zypper.info_installed 2018-05-16 16:31:13 +01:00
Pablo Suárez Hernández
0aaf724d6c
Add "all_versions" parameter to include all installed version on rpm.info 2018-05-16 16:28:17 +01:00
Pablo Suárez Hernández
0232a6e1ad
Add 'other' as valid kwargs for 'user.add' method 2018-05-16 16:12:34 +01:00
Erik Johnson
97fc80e534
Only check for slot if arg is not bytes 2018-05-16 09:14:11 -05:00
Erik Johnson
277f26cdf5
Keep binary values in format_slots 2018-05-16 09:14:11 -05:00
Erik Johnson
728599164d
Replace salt.utils.locales.sdecode with salt.utils.data.decode 
With salt.utils.data.decode() being added in 2018.3.0, sdecode is now
redundant. This commit deprecates sdecode in favor of
salt.utils.data.decode().
 2018-05-16 09:14:11 -05:00
Nicole Thomas
f5c3e2caec
Merge pull request #47580 from sastorsl/file.symlink-updates 
File.symlink updates
 2018-05-16 09:57:38 -04:00
Nicole Thomas
d17a16b648
Merge pull request #47672 from terminalmage/bp-47487 
Backport #47487 to 2018.3
 2018-05-16 09:55:39 -04:00
Nicole Thomas
9d4f5203a7
Merge pull request #47504 from mateiw/2018.3-salt-ssh-pillar-propagation-issue-47501 
Fix pillar propagation in salt-ssh when overriding pillar in module.run + state.apply
 2018-05-16 09:55:04 -04:00
Nicole Thomas
4fe78bbb9b
Merge pull request #47212 from weswhet/fix-macos-runas 
fix macOS running as user.
 2018-05-16 09:54:22 -04:00
Nicole Thomas
0c7439a955
Merge pull request #47674 from terminalmage/issue47587 
Fix regression in table outputter due to unicode types
 2018-05-16 09:41:03 -04:00
Erik Johnson
43e3dcd398
Fix Python 3 incompatibility in table outputter 
`map(None, some_iterable)` is not valid usage in Python 3. This fixes
that incompatiblity in a way that works in both Python 2 and 3.
 2018-05-16 00:04:49 -05:00
Erik Johnson
d729656703
Add unit tests for table outputter 2018-05-16 00:02:14 -05:00
Erik Johnson
907d182dea
Fix regression in table outputter due to unicode strings 
This ensures that we use the proper justification functions from the
unicode type on Python 2, and that we also normalize the input so that
we are guaranteed that all strings are unicode types.
 2018-05-15 23:53:20 -05:00
Erik Johnson
afa4580f3a
Merge pull request #45808 from b1naryth1ef/bugfix/long-filenames 
[bugfix] Fix for oversized filenames in fileclient
 2018-05-15 22:35:50 -05:00
Ross Crawford-d'Heureuse
12abbfdcf7
bad ref to error fix 2018-05-15 21:34:52 -05:00
Erik Johnson
74a49c3367
Merge pull request #47487 from rosscdh/fix/issues-7486 
bad ref to error fix
 2018-05-15 21:33:17 -05:00
Claudius Zingerli
6775fc0aec
Merge branch 'develop' into bbczeuz-patch-file-doc 2018-05-16 00:56:01 +02:00
Nicole Thomas
fb3bf1ff3e
Merge pull request #47664 from rallytime/bp-47645 
Back-port #47645 to 2018.3.1
 2018-05-15 14:25:27 -04:00
Alberto Chiusole
c831f06fec Add reference to the logs when state cannot be rendered. 
As discussed in issue #47612 on github; the addition is the same of
the one in the pillar when there's an error rendering it.
 2018-05-15 19:44:16 +02:00
Banio Carpenter
b099e0c245 moved to end of kwargs list 2018-05-15 12:27:14 -05:00
Ch3LL
0a732d8e66
query the pip path for test test_issue_2087_missing_pip 2018-05-15 13:17:54 -04:00
Nicole Thomas
ef6f1c82ce
Merge pull request #47644 from nbirnel/dash-l-docs 
specify whitespace not space on parser -L
 2018-05-15 12:44:07 -04:00
rallytime
969296ecbe
Merge branch '2018.3' into 'develop' 
No conflicts.
 2018-05-15 12:38:01 -04:00
plastikos
52248ff433
Merge branch 'develop' into improvement-spm-base_paths 2018-05-15 10:36:03 -06:00
rallytime
dd3e6f3f0a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/states/pkgrepo.py
 2018-05-15 12:29:29 -04:00
Nicole Thomas
d1a1a594e9
Merge pull request #47617 from aesposito91/2018.3 
Update napalm.py
 2018-05-15 11:44:34 -04:00
Nicole Thomas
049abe2850
Merge pull request #47649 from paulcollinsiii/sentry_docs 
Some additional details about Sentry for the docs
 2018-05-15 11:41:35 -04:00
Nicole Thomas
8a21b864df
Merge pull request #47642 from garethgreenaway/unicode_update_salt_extend_templates 
[2018.3] Updating templates used by salt-extend for unicode goodness
 2018-05-15 11:38:25 -04:00
Nicole Thomas
ff861d9089
Merge branch '2018.3' into 2018.3-remove-trailing-commas-on-linux-user-gecos-fields 2018-05-15 11:37:58 -04:00