valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,517 Commits 24 Branches 182 Tags 341 MiB
90a174c915
Commit Graph

86517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
dd1286f7ed Merge branch 'develop' into develop 2017-09-25 15:41:19 -04:00
rallytime
f98a555f98
Missed updating one of the master unit test mocks 2017-09-25 15:37:38 -04:00
Nicole Thomas
410fed3108 Merge branch 'develop' into add-rethinkdb-external-pillar 2017-09-25 15:36:46 -04:00
Nicole Thomas
16b8ec8471 Merge pull request #43604 from alexbleotu/dvs_states-gh 
DVS states + dependencies
 2017-09-25 15:34:45 -04:00
Nicole Thomas
ade7940837 Merge pull request #43717 from raazvvann/test_nilrt_ip-fixup 
test_nilrt_ip: Fix set_static_all test
 2017-09-25 13:49:23 -04:00
Alexandru Bleotu
3c26d4e3be Updated all list_differ tests to compare dicts so the key order is not assumed 2017-09-25 13:11:08 -04:00
Alexandru Bleotu
cdb028b794 Added key sorting to have deterministing string repr of RecursiveDictDiffer objects 2017-09-25 13:09:47 -04:00
Nicole Thomas
2e01c98abd Merge pull request #43721 from sdodsley/purefa_doc 
Update documentation in Pure Storage [purefa] module
 2017-09-25 12:57:42 -04:00
rallytime
846af152b2
Update mocked values in some master/masterapi unit tests 
The addition of checking for the `auth_list` in PR #43467 requires
that the mocked return of `get_auth_list` actually contains something
in the list. These mock calls need to be updated so we can check
for the SaltInvocationErrors.
 2017-09-25 12:54:32 -04:00
Simon Dodsley
8d6ab66658 Add new core grains to display minion storage initiators 
Support for Linux and Windows platforms to display both the
iSCSI IQN and Fibre Channel HBA WWPNs.

With the integration of storage modules to allow configuration
of 3rd party external storage arrays, these values are needed to
enable the full auotmation of storage provisioning to minions.

Support for Windows, Linux and AIX (iSCSI only)
 2017-09-25 09:17:23 -07:00
Nicole Thomas
86907b330d Merge branch 'develop' into develop 2017-09-25 12:16:26 -04:00
Nicole Thomas
8739cd62a8 Merge pull request #43726 from saltstack/revert-43688-develop 
Revert "Extend openscap module command parsing."
 2017-09-25 12:12:02 -04:00
Nicole Thomas
68e1bd99eb Revert "Extend openscap module command parsing." 2017-09-25 12:10:23 -04:00
twangboy
d73ef44cf6
Mock with uppercase KEY 2017-09-25 09:37:15 -06:00
twangboy
048e16883f
Use uppercase KEY 2017-09-25 09:37:15 -06:00
twangboy
056f3bb4c0
Use with to open temp file 2017-09-25 09:35:25 -06:00
twangboy
352fe69e35
Clarify the purpose of the for loop 2017-09-25 09:35:25 -06:00
twangboy
b55172d5dc
Split by Windows and Linux style line endings 2017-09-25 09:35:24 -06:00
twangboy
e20aa5c39b
Fix line, use os.sep instead of os.linesep 2017-09-25 09:35:24 -06:00
twangboy
d5f27901e3
Fix additional bytestring issue 2017-09-25 09:35:24 -06:00
twangboy
716e99c453
Fix py3 bytestring problems 2017-09-25 09:35:24 -06:00
twangboy
543610570c
Fix bytestring issues, fix errored tests 2017-09-25 09:35:24 -06:00
twangboy
9fe83a34a5
Remove old variable declaration 2017-09-25 09:35:23 -06:00
twangboy
c5cf5e92c1
Fix many tests 2017-09-25 09:35:23 -06:00
Jochen Breuer
85b0a8c401 Improved delete_deployment test for kubernetes module 
This is a follow up of this PR: https://github.com/saltstack/salt/pull/43235

With the fix in PR 43235, we are polling the status of the deletion via
show_deployment. This is now also reflected in the tests with this change.
 2017-09-25 17:29:27 +02:00
twangboy
be554c898b
Rename new state to uptodate 2017-09-25 09:23:43 -06:00
twangboy
72d96ed74b
Add an up_to_date state to win_wua 2017-09-25 09:23:43 -06:00
Nicole Thomas
1b6d936e7d Merge branch 'develop' into add-rethinkdb-external-pillar 2017-09-25 10:15:57 -04:00
Simon Dodsley
3abba0b999 Update documentation in Pure Storage [purefa] module 
Add external array authentication methods.
Changed version added to be Oxygen
 2017-09-25 07:12:52 -07:00
Nicole Thomas
afba89d886 Merge branch 'develop' into infra5292 2017-09-25 10:05:34 -04:00
Nicole Thomas
a81d4b8d8d Merge pull request #43557 from clan/yaml 
disable modify yaml constructor
 2017-09-25 10:03:47 -04:00
Nicole Thomas
b5beec16e8 Merge pull request #43566 from damon-atkins/2017.7_update_safe_filename_func 
2017.7 update salt.utils.files.safe_filepath func
 2017-09-25 09:58:28 -04:00
Nicole Thomas
3bb337cf6a Merge pull request #43712 from wedge-jarrad/fix-43711 
Ignore retcode on call to grep in selinux.py module
 2017-09-25 09:56:16 -04:00
Nicole Thomas
5b7411e335 Merge pull request #43716 from gaborn57/2017.7 
Corrected custom port handling
 2017-09-25 09:44:57 -04:00
rallytime
281cbbe048
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cloud/clouds/libvirt.py
  - salt/daemons/masterapi.py
  - salt/modules/file.py
  - salt/modules/yumpkg.py
  - salt/states/archive.py
  - salt/states/file.py
  - salt/utils/files.py
  - salt/utils/minions.py
 2017-09-25 09:40:18 -04:00
assaf shapira
06e68bfa4f lint errors fixed 2017-09-25 14:52:40 +03:00
Alexandru Bleotu
2d2f094810 Merge branch 'develop' into dvs_states-gh 2017-09-25 11:22:45 +01:00
Heghedus Razvan
19da1000b4 test_nilrt_ip: Fix set_static_all test 
The nameservers needs to be specified only by ip address.

Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2017-09-25 12:49:46 +03:00
assaf shapira
07ef749174 Merge branch 'develop' of https://github.com/assafShapira/salt into develop 2017-09-25 12:10:29 +03:00
assaf shapira
2c80ea54f4 more lint fixes 2017-09-25 12:06:48 +03:00
assafShapira
dc303c49b4 Merge branch 'develop' into develop 2017-09-25 11:34:46 +03:00
Sebastien Huber
78137c0860 Corrected custom port handling 
This pillar was only able to connect to a Postgres DB running on the default port (5432)
This commit extend this to a custom port
 2017-09-25 10:00:52 +02:00
Mike Place
68fa74e88f Merge pull request #43571 from nadvornik/raid_add 
Add missing devices to RAID array
 2017-09-24 19:54:10 -06:00
Mike Place
6bbd50c453 Merge pull request #43700 from rklaren/fix-libvirt-stderr-spam 
Ensure salt-cloud with libvirt provider does not write low level errors to stderr
 2017-09-24 19:47:25 -06:00
Mike Place
52bc418ff8 Merge pull request #43690 from bodhi-space/infra5292_fluent 
INFRA-5292 - add support to fluent logger for Graylog and GELF output formats
 2017-09-24 19:30:22 -06:00
Mike Place
cae79d2020 Merge pull request #43699 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-24 19:27:17 -06:00
Mike Place
437ac03801 Merge pull request #43702 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-24 19:26:19 -06:00
Mike Place
f7df8ceb12 Merge pull request #43704 from garethgreenaway/monitor_user_and_time_in_btmp_and_wtmp 
Updates to btmp and wtmp beacons
 2017-09-24 19:25:47 -06:00
assaf shapira
3d59425cdf Merge branch 'develop' of https://github.com/assafShapira/salt into develop 2017-09-24 17:35:23 +03:00
assaf shapira
7dee6e0a6e Merge branch 'develop' of https://github.com/assafShapira/salt into develop 2017-09-24 17:34:46 +03:00