valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,191 Commits 24 Branches 182 Tags 341 MiB
9fef8bc431
Commit Graph

91191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gareth J. Greenaway
1d57787a6f
Gating the two tests that require m2crypto to be available. 2018-03-10 06:01:00 -08:00
Gareth J. Greenaway
70aca0da57
Recent unicode changes into Oxygen broke some aspects of the x509 module. When processing PEM text, it needs to be treated as ascii not unicode. Adding a couple tests for affected functions. 2018-03-10 06:01:00 -08:00
Nicole Thomas
158d8028d5
Merge pull request #46426 from garethgreenaway/46334_fixes_nacl_module_runner 
[2018.3.0rc1] fixes to nacl module & runner
 2018-03-09 14:17:19 -05:00
Dmitry Kuzmenko
d22e5ba442
Merge fix: return back wb+ mode in crypt.gen_keys. 2018-03-09 21:35:48 +03:00
Nicole Thomas
9c089aa4de
Merge pull request #46421 from bdrung/skip-ssh-tests-if-ssh-is-missing 
Skip SSHPasswordTests if ssh binary is not found
 2018-03-09 11:21:01 -05:00
Gareth J. Greenaway
ab02ffd4ae
Swapping out import-error for unused-import. 2018-03-09 07:13:27 -08:00
Nicole Thomas
4cbfde5839
Merge pull request #46453 from bdrung/fix-typos-2018.3 
Fix various spelling mistakes in 2018.3
 2018-03-09 09:48:32 -05:00
Gareth J. Greenaway
4b9d07ef0d
Adding a note about the default box_type change for nacl module and runner to the releaes notes 2018-03-08 13:09:55 -08:00
Gareth J. Greenaway
5a2913ff1c
When key or keyfile are present set the box_type to secretbox to maintain backward compatibility until deprecation in Fluorine. 2018-03-08 12:38:55 -08:00
Benjamin Drung
3d37eca847 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 19:14:42 +01:00
Gareth J. Greenaway
49bd1ac97a
A couple minor fixes. 2018-03-08 10:06:59 -08:00
Gareth J. Greenaway
0c72052c84
Update nacl.py 
Fixing a typo with the wrong key name.
 2018-03-08 10:06:59 -08:00
Gareth J. Greenaway
e6c9740a7d
Gating nacl tests to ensure libnacl is installed. 2018-03-08 10:06:58 -08:00
Gareth J. Greenaway
4ae2861d68
Fixing a few bugs introducted following the move to unicode all the things. Adding deprecation notices for the previously used key and key_file arguments. Adding deprecation into Release notes. Adding some tests for Naccl module and runner to test encryption and decryption. 2018-03-08 10:06:55 -08:00
Nicole Thomas
a43d999fb8
Merge pull request #46437 from terminalmage/issue44032-2018.3 
Improve reliability/idempotence of file.blockreplace state (2018.3 branch)
 2018-03-08 10:38:52 -05:00
Nicole Thomas
c5aa1ca47b
Merge pull request #46393 from gtmanfred/vault 
make vault like all other sdb backends
 2018-03-08 09:28:54 -05:00
Nicole Thomas
eff652104d
Merge pull request #46399 from twangboy/win_fix_reg 
Fix reg module when vname=None
 2018-03-08 09:27:11 -05:00
Nicole Thomas
7523f5dcb0
Merge pull request #46400 from gtmanfred/openstack 
add waiting for metadata
 2018-03-08 09:26:00 -05:00
Erik Johnson
4798187035
Improve reliability/idempotence of file.blockreplace state (2018.3 branch) 
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:09 -06:00
Nicole Thomas
0c66507aff
Merge pull request #46328 from dincamihai/2018.3.0rc1 
Fix openscap push
 2018-03-07 12:51:41 -05:00
Benjamin Drung
3d6f658309 Skip SSHPasswordTests if ssh binary is not found 
If the ssh binary is not found in path, SSHPasswordTests will fail:

ERROR: test_password_failure (unit.ssh.test_ssh.SSHPasswordTests)
[CPU:0.0%|MEM:54.9%]
----------------------------------------------------------------------
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

Either SSHPasswordTests needs to be converted into a real unit test
(i.e. mocking the salt call) or this tests needs to be skipped if ssh is
not available.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-07 16:36:06 +01:00
Daniel Wallace
ca67fdf09f
add waiting for metadata 
This is needed for rackspace managed cloud and rackconnect v2
 2018-03-07 08:27:47 -07:00
rallytime
c7dddaf8ce
Lint: Use log variable, not logger. 2018-03-07 10:21:45 -05:00
rallytime
ca1860cd91
Use new get_umask function in mask calls in virt.py 2018-03-07 10:20:49 -05:00
Mihai Dinca
b5e508f339 Fix openscap push 2018-03-07 14:55:50 +01:00
Nicole Thomas
79f72f99f4
Merge pull request #46355 from gtmanfred/2018.3.0rc1 
Add docs for oxygen and deprecation warnings for openstack
 2018-03-06 15:05:50 -05:00
twangboy
e2bfb848b1
Remove vdata check for none 
This was moved to the _to_unicode function
 2018-03-06 12:30:10 -07:00
twangboy
498a2c6873
Add comment on None Statement 2018-03-06 12:19:59 -07:00
twangboy
76f273bfc8
Move None check to _to_mbcs function 2018-03-06 12:17:43 -07:00
twangboy
917ce07eb0
Fix reg.py for None values 
Fixes problem when vdata or vname is None and it tried to convert None
to unicode.
Uses win32con values
 2018-03-06 12:05:00 -07:00
Nicole Thomas
82cb2ea5a0
Merge pull request #46174 from twangboy/win_fix_test_git_2 
Fix a unicode issue with the git module on Windows
 2018-03-06 13:53:53 -05:00
rallytime
19ec7b6de1
Update old utils paths with new utils paths 2018-03-06 13:48:16 -05:00
rallytime
d83727fdf9
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/cli/api.py
  - salt/client/ssh/wrapper/state.py
  - salt/config/__init__.py
  - salt/crypt.py
  - salt/daemons/masterapi.py
  - salt/key.py
  - salt/loader.py
  - salt/master.py
  - salt/modules/archive.py
  - salt/modules/hipchat.py
  - salt/modules/pip.py
  - salt/modules/state.py
  - salt/modules/virt.py
  - salt/modules/x509.py
  - salt/state.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - salt/utils/__init__.py
  - salt/utils/event.py
  - salt/utils/extmods.py
  - salt/utils/files.py
  - salt/utils/parsers.py
  - salt/utils/verify.py
  - tests/integration/shell/test_call.py
  - tests/unit/utils/test_args.py
 2018-03-06 13:45:59 -05:00
Daniel Wallace
0511c4c10c
make vault like all other sdb backends 2018-03-06 10:08:41 -07: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
Daniel Wallace
a67b61eb33
fix pylint 2018-03-06 07:47:38 -07:00
Nicole Thomas
4daa5bcdc4
Merge pull request #46344 from dwoz/salt-jenkins-branch 
Update salt-jenkins branch in kitchen config
 2018-03-06 08:55:28 -05:00
Daniel Wallace
ac4133f432
Add getting started openstack doc 2018-03-05 16:25:08 -07:00
Daniel Wallace
537bc589b1
add auth type for openstack + rackspace 2018-03-05 16:14:41 -07:00
Daniel Wallace
5eff6f73e4
Add notes about the openstack revamp 
Also note that the old openstack modules are being deprecated.
 2018-03-05 16:04:59 -07:00
Daniel A. Wozniak
51b0e54ffe
Update salt-jenkins branch in kitchen config 2018-03-05 15:58:48 -07: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
Nicole Thomas
7690cf8564
Merge pull request #46235 from twangboy/win_fix_test_ssh 
Fix `unit.modules.test_ssh` for Windows
 2018-03-05 15:39:43 -05: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
Nicole Thomas
c4f366cdd9
Merge pull request #46332 from terminalmage/merge-forward-docs 
Update the merge-forward docs to reference the 2018.3 branch
 2018-03-05 14:39:55 -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