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
74,800 Commits 24 Branches 182 Tags 341 MiB
a1949dac9e
Commit Graph

4822 Commits

Author SHA1 Message Date
msiebeneicher
a1949dac9e fixed json_out unit tests after latest change 2016-11-03 17:20:47 +01:00
msiebeneicher
d05ef0b209 Merge remote-tracking branch 'remotes/upstream/develop' into improvement/fix_log_output_for_json_and_yaml 
* remotes/upstream/develop: (257 commits)
  Removed extra whitespace
  add the ability to verify github webhook hmac signatures
  Improve the sparse docs on python renderer
  Remove trailing whitespace
  Letsencrypt has been renamed to certbot
  Add support for standalone mode
  Pass --quiet to suppress the certbot/letsencrypt dialog
  Fix failing network unit test (#37033)
  Use a default prefix for the mkstemp utils function (#37022)
  CkMinions.connected_ids fix: continue if cache.fetch raises exception
  fire on local (#37015)
  document master_type disable (#37014)
  opkg module: Add 'version', 'reinstall', and 'only_upgrade' to install (#37008)
  Keep minion schedule when recreate loaders. (#37004)
  Fix lint
  opkg: Support ignore_epoch argument in version comparisons (#37007)
  Revert "[2016.11.0rc1] (re)introduce minimal weighing to get_fqhostname"
  add webhook engine
  Versionadded for process_dependency_links kwarg in virtualenv_mod state (#37006)
  Versionadded tag for new update_head option in hg state (#37005)
  ...
 2016-10-18 10:43:02 +02:00
Mike Place
202414c88b Merge pull request #37024 from gtmanfred/hashutil 
add the ability to verify github webhook hmac signatures
 2016-10-18 10:55:28 +09:00
rallytime
6d0cedcadd Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-17 09:06:12 -06:00
Daniel Wallace
a7f8ca0a84 add the ability to verify github webhook hmac signatures 2016-10-17 07:57:47 -05:00
Mike Place
9893717c09 Merge pull request #36992 from zhihan/fix-mac-package-wildcard 
Fix mac_package wildcard install error on mac
 2016-10-17 19:38:12 +09:00
Erik Johnson
1caf1f6770 Use a default prefix for the mkstemp utils function (#37022) 
* Move salt.utils.mkstemp() into salt.utils.files

Also use a default prefix

* update refs to salt.utils.mkstemp

* Update test to use new path to mkstemp helper func
 2016-10-16 16:12:56 -06:00
rallytime
b7d9bf0281 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-14 12:06:31 -06:00
rallytime
112dc5d9c1 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cli/salt.py
  - salt/client/__init__.py
  - salt/modules/archive.py
  - tests/integration/modules/pkg.py
 2016-10-14 12:03:08 -06:00
Daniel Hobley
0aa6ecfb7f Add the option to skip updating the head for a hg latest state (#37002) 
- Updated hg state tests
 2016-10-14 09:07:33 -06:00
Zhi Han
3ddddd82b7 Fix mac_package wildcard install error on mac 2016-10-13 21:29:40 -04:00
Amir Pakdel
d7cfcf4135 Whitespace bugfix in linux acl.getfacl (#36827) 
* Whitespace bugfix in linux acl.getfacl

It is a trivial fix

* Whitespace bugfix in linux acl.setfacl

Also updated tests

* Linting
 2016-10-13 15:14:09 -06:00
Thomas S Hatch
6b782c15e1 Merge pull request #36755 from terminalmage/issue36671 
systemd.py: check retcode for service availability in systemd >= 231
 2016-10-13 13:41:50 -06:00
Nicole Thomas
7cbe2ced02 Merge pull request #36974 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-13 12:58:30 -06:00
rallytime
c4dc0dd2ef Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-13 11:14:36 -06:00
Jorge Schrauwen
374d4038d3 [develop] grains should have some information about zpools if available (#36839) 
* grains should have some information about zpools if available

* Add __opts__ as a global variable so test do not fail.

* fix lint error
 2016-10-13 11:04:38 -06:00
rallytime
1e7f56c4bb Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-13 10:38:19 -06:00
Nicole Thomas
a8eee6e90b Update the ip to test against in unit.utils.network_test.NetworkTestCase.test_host_to_ip (#36975) 2016-10-13 10:25:58 -06:00
rallytime
0a5b1f5466 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-13 09:58:18 -06:00
Nicole Thomas
a2206e805f Merge pull request #36938 from wanparo/develop 
acl.delfacl: fix position of -X option to setfacl
 2016-10-13 08:53:34 -06:00
Nicole Thomas
3ac9ced202 Merge pull request #36241 from hrumph/cert_problem 
Fixes #36240
 2016-10-12 17:28:35 -06:00
rallytime
1d3aaf8097 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-10-12 15:26:27 -06:00
rallytime
32846794c8 Update mocks for failing tests in win_certutil_test 2016-10-12 11:31:58 -06:00
rallytime
29d299d23b Adjust linux_acl unit test argument ordering 2016-10-12 10:57:42 -06:00
Justin Findlay
4d8fb03b79 return opennebula errors to user (#36930) 
* cloud.clouds.opennebula: return errors to user

* cloud.clouds.opennebula._get_xml: add unit test
 2016-10-12 10:19:11 -06:00
msiebeneicher
bac1d0fc28 unify json output tests for different plattform / lib versions 2016-10-12 12:15:08 +02:00
msiebeneicher
07f103954b fixed pylint issues 2016-10-12 10:14:45 +02:00
rallytime
55fe0aa2e4 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-11 17:22:12 -06:00
Erik Johnson
e5425f3e8c Revert change in default value for top_file_merging_strategy (#36922) 
This causes problems when a Carbon master tries to run states on a
non-Carbon minion.
 2016-10-11 16:33:23 -06:00
rallytime
b196c9336a Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-11 13:54:09 -06:00
Thomas S Hatch
7e2eba9cc7 Merge pull request #36776 from cro/prox_min_mgr 
Adapt MinionManager for Proxy Minions.
 2016-10-11 11:12:01 -06:00
Jorge Schrauwen
8b9648cd97 [develop] salt.modules.at was hopelessly broken on Solaris-like platforms (#36873) 
* disable current at module on solaris, only compute job_kw_regtex once

* provide at_solaris (virtual=at) for Solaris-like systems

* add proper maintainer header

* forgot to update the docs again

* add notice that at module only works on linux, openbsd, and freebsd

* salt.states.at needed a lot of love

* update at_state checks to pass valid date to at.at, at.jobcheck, at.atrm,...

* today I learn about mod_watch, and I want it for at
 2016-10-11 10:33:40 -06:00
Tim Fechner
7547761acc Fix #36461, AttributeError because of .lower() (#36462) 
* Fix #36461, AttributeError because of .lower()

* Add tests
 2016-10-11 10:29:22 -06:00
Alexandru Bleotu
6c441cb288 Create datacenter gh (#36826) 
*  Added salt.utils.create_datacenter that creates a VMWare datacenter

* Added tests for salt.utils.vmware.create_datacenter
 2016-10-11 08:49:53 -06:00
rallytime
c09b9d6e6a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-10 10:21:04 -06:00
rallytime
d07f5612ee Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-10 10:18:02 -06:00
Erik Johnson
7c78d6f419 Add unit tests for systemd scope usage 2016-10-07 17:35:09 -05:00
rallytime
2e34277b65 Add '--no-psqlrc' option to new-to-carbon postgres unit test 2016-10-07 16:10:57 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
 2016-10-07 09:51:21 -06:00
msiebeneicher
6bde592070 providing yaml output unit tests 2016-10-07 16:52:53 +02:00
msiebeneicher
63adf6c7e7 updated json output unit tests and added method exist check 2016-10-07 16:39:11 +02:00
C. R. Oldham
b7f9eb7864 Fix test. 2016-10-06 14:20:29 -06:00
Mike Place
1284de27fc Merge pull request #36789 from maximeguillet/fix-psqlrc-pg9.6 
Fix behavior of psql -c option with postgresql 9.6
 2016-10-06 20:24:51 +09:00
Maxime Guillet
b59c23bef1 Fix one remaining postgresql tests linked to #36787. 2016-10-05 17:05:10 +02:00
Mike Place
53f1523cb8 Merge pull request #36790 from cachedout/pr-36727 
Merge forward carbon to develop
 2016-10-05 23:57:23 +09:00
Maxime Guillet
8b92ae2061 Fix postgresql tests using position in the argument list of psql. 
Some tests use position number in the argument list of psql command
to check their results. As #36787 add one element, next position
in the list must be used.
 2016-10-05 16:08:42 +02:00
Maxime Guillet
21f2a17a07 Fix postgresql tests by adding --no-psqlrc option introduced by #36787. 2016-10-05 14:43:02 +02:00
Erik Johnson
d916c2b49c Handle cases where retcode/output feature is backported 
This will handle the case of RHEL 7.3, which maintains an older version
of systemd with the retcode/output changes from "systemctl status" in
systemd 231 backported.
 2016-10-04 09:55:56 -05:00
Erik Johnson
b3364646ad Update systemd module unit tests 
The _systemctl_status() function has changed its return data, this
commit updates the affected tests to reflect this.
 2016-10-03 22:51:43 -05:00
Mike Place
d2ab4b11b5 Merge pull request #36689 from msiebeneicher/develop 
Feature :: provide state.show_state_usage call
 2016-10-03 20:53:01 +09:00