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
73,671 Commits 24 Branches 182 Tags 341 MiB
d8eb7494db
Commit Graph

73671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Rietveld
d8eb7494db boto3 doesn't want parameters to be None 
Remove all parameters that are None from the call to boto3
See also https://github.com/boto/boto3/issues/400
 2016-09-14 09:21:01 +02:00
Tom Williams
e95b55b106 INFRA-3692 - add support for absolute paths to yaml files in makostack ext_pillar module. (#36220) 2016-09-12 11:56:45 -06:00
Nicole Thomas
414f7296fd Merge pull request #36233 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-12 11:40:18 -06:00
rallytime
87341ed30b Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-12 09:42:26 -06:00
Valentin Rosavitskiy
63e49a3d86 Add support for new OS VZ7 try #2 (#35123) (#36230) 2016-09-12 09:36:09 -06:00
Hengyang Hu
3c694a371b make a centralized master_event func, replace the hardcoded ones across the codebase (#36221) 2016-09-12 09:22:20 -06:00
Nicole Thomas
2b588e3d2f Versionadded should be Nitrogen instead of 2016.3.0 (#36231) 
Refs #36207
 2016-09-12 09:17:26 -06:00
Olivier Mauras
1c2c041d0d Feature: Add Alpine Linux support (#36207) 
* salt/modules/gentoo_service.py: Work also for Alpine which uses OpenRC as well

* salt/modules/apk.py: Add main pkg function for Alpine Linux

* salt/modules/apk.py: Fix list_upgrades

* salt/modules/apk.py: Remove opkg occurences

* salt/modules/apk.py: Return 'Not available' instead of True for unavailable functions

* salt/modules/apk.py: Comment the unavailable functions

* salt/modules/apk.py: Implement pkg.latest_version

* salt/modules/apk.py: Some more spaces between functions

* salt/modules/apk.py: Include release version in pkg_version  returned by pkg.list_pkgs to prevent missing packages returned on pkg.upgrade

* salt/modules/apk.py: Fix lint errors
 2016-09-12 09:14:44 -06:00
boltronics
559a82d678 Command logging output fixes (#36103) 
* Improve command logging by stripping whitespace

The YAML ">" block scalar modifier introduces a trailing new line
character, which breaks up the command output formatting. This can
result in ERROR lines being harder to spot if among broken INFO lines.

* Improve state info log output
 2016-09-12 09:04:42 -06:00
Erik Johnson
b0ddd6dbba Refspec customization (#36216) 
* Added refspec customization to git.latest

* Add documentation for new refspec params to git.latest
 2016-09-12 09:01:16 -06:00
Mike Place
f755e6d890 Fire an event on the master when a refresh occurs (#36219) 
Closes #31465
 2016-09-12 08:46:33 -06:00
Erik Johnson
b83c0b9238 salt.utils.gitfs: Fix ref to self.root (#36215) 
This regressed during a recent merge-forward. See here for more info:

https://github.com/saltstack/salt/commit/2b1ad9e#diff-2c34a66e40db8ce28e251f98de56ce31L406

Resolves #36095.
 2016-09-12 08:39:22 -06:00
Mike Place
5b7e847998 Merge pull request #36218 from cachedout/minor_comment_fixup 
Fix minor comment issue
 2016-09-12 09:47:24 +09:00
Mike Place
d76d913445 Fix minor comment issue 2016-09-12 09:46:50 +09:00
Mike Place
5a7a72346a Merge pull request #36202 from hu-dabao/add-36049 
for 36049, log current connected master and make status module more useful and efficient
 2016-09-12 08:18:24 +09:00
Mike Place
5ddf0af23e Merge pull request #36166 from jfindlay/parallels 
modules.parallels.delete: allow multiple IDs for same name
 2016-09-12 08:00:56 +09:00
Mike Place
f652fde5ce Merge pull request #36211 from m03/add-initial-win_pki-unit-tests 
Add win_pki unit tests
 2016-09-12 07:59:52 +09:00
Mike Place
1eb67df61e Merge pull request #36198 from gtmanfred/carbon 
add keystone state integration tests
 2016-09-11 18:16:38 +09:00
mwinnett
b9a98f551e Add win_pki unit tests 2016-09-10 23:31:08 -07:00
Hengyang Hu
5f339356cf for 36049, log current connected master and make status module more useful and efficient 2016-09-09 17:22:50 -07:00
Mike Place
7d25344574 Merge pull request #36194 from jfindlay/mac_timezone 
skip some mac_timezone tests
 2016-09-10 09:07:07 +09:00
Mike Place
81fb34ecd0 Merge pull request #36190 from eradman/openbsdpkg 
pkg.install: enable OpenBSD branch and flavor specifications
 2016-09-10 09:06:43 +09:00
Mike Place
b504d07006 Merge pull request #36196 from twangboy/mac_brew_tests 
Fix test_latest_version test
 2016-09-10 09:03:57 +09:00
Christophe Drevet
4c422f1549 fix cron.absent by identifier on test mode (#36181) 2016-09-09 16:20:58 -06:00
Daniel Wallace
1c31d5e464 add keystone state integration tests 
fix api_version for using connection_args
 2016-09-09 17:14:44 -05:00
twangboy
075ceb09ab Fix test_latest_version test 2016-09-09 14:14:51 -06:00
Nicole Thomas
65eb13d918 Merge pull request #36189 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-09 12:59:38 -06:00
Megan Wilhite
393bbef63b Add test 35015 (#35945) 
* add salt-key eauth tests

* add salt-run with eauth tests

* add method docs

* change expected return
 2016-09-09 12:58:50 -06:00
Justin Findlay
eaada10e89 skip some mac_timezone tests 2016-09-09 12:34:24 -06:00
Nicole Thomas
846f940fd2 Merge pull request #36186 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-09 11:29:19 -06:00
rallytime
167fe00e00 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-09 09:54:17 -06:00
Eric Radman
16e46e36d9 pkg.install: enable OpenBSD branch and flavor specifications 
Support OpenBSD branch specification (%)

  ruby%2.3

As well as flavor specification (--)

  vim--gtk2

By default packages are installed using the base flavor and the stable
branch.

Also add unit tests for OpenBSD package management
 2016-09-09 11:42:10 -04:00
rallytime
3ed6190ece Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/minion.py
 2016-09-09 09:36:57 -06:00
Patrick Valenzuela
b2f1d36e2f Update boto_dynamodb for GSI management and backups (#35878) 
* Update boto_dynamodb state/module for GSI management

* fix trailing whitespace

* modify format strings to conform to file style

* fix lint errors

* fix all but 1 test

* add example
 2016-09-09 08:57:29 -06:00
Mike Place
1d5f97d36b Merge pull request #35907 from rallytime/fix-35819 
Catch CommandExecutionError when the group in group_installed doesn't exist
 2016-09-09 19:14:16 +09:00
Mike Place
e1bb2663ba Merge pull request #35985 from DSRCorporation/bugs/35945_salt-key_print_errors_to_stdout 
Print errors to stdout in salt-key as it's done in salt and salt-run.
 2016-09-09 19:03:32 +09:00
Mike Place
40127b6bf3 Merge pull request #36068 from rallytime/fix-35972 
Remove grains type deprecation warning from 2016.3
 2016-09-09 19:00:50 +09:00
Mike Place
d7c012cbd0 Merge pull request #36104 from Cidan/develop 
WIP for GCE salt cloud volume support.
 2016-09-09 19:00:23 +09:00
Mike Place
31b2ef2585 Merge pull request #36124 from twangboy/linux_acl_test_mac 
Skip test on all OS's but linux
 2016-09-09 18:59:35 +09:00
Mike Place
8f609a5799 Merge pull request #36126 from edlane/develop 
Add keepalives to salt-master created connections for better presence
 2016-09-09 18:50:51 +09:00
Mike Place
0e84fc888d Merge pull request #36151 from eyj/req-fix 
Ignore states that do not have a numeric jid, i.e. 'req'
 2016-09-09 18:49:54 +09:00
Mike Place
afd0eb8f18 Merge pull request #36160 from terminalmage/fix-nested-indent 
Allow for nested outputter to accept base indentation level as a kwarg
 2016-09-09 18:46:11 +09:00
Mike Place
a0665a431d Merge pull request #36175 from plastikos/cleanup-redundant_key_write 
[TRIVIAL] Remove redundant write of public key.
 2016-09-09 18:43:24 +09:00
Mike Place
24bd03734d Merge pull request #36152 from cachedout/issue_36094 
Remove unnecessary unpack
 2016-09-09 18:13:46 +09:00
Nicole Thomas
817cd9f42a Merge pull request #36177 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-08 22:43:22 -06:00
rallytime
2edfef33ae Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/scripts.py
  - salt/thorium/key.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
 2016-09-08 17:31:29 -06:00
Nicole Thomas
f82c91dbd4 Merge pull request #36174 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-08 17:28:35 -06:00
rallytime
c30f697dfd Pylint fix 2016-09-08 17:23:15 -06:00
Thayne Harbaugh
5e6444b732 Remove redundant write of public key. 2016-09-08 16:26:39 -06:00
rallytime
6da0fbbe96 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/linux_sysctl.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
  - tests/unit/modules/boto_iot_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_iot_test.py
  - tests/unit/utils/network.py
 2016-09-08 16:14:04 -06:00