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
assaf shapira
a327ee9614
fix lint errors
2017-09-24 17:34:38 +03:00
assafShapira
86b0ec97de
Merge branch 'develop' into develop
2017-09-24 17:24:15 +03:00
assaf shapira
fec005320d
Merge branch 'develop' of https://github.com/assafShapira/salt into develop
2017-09-24 12:49:31 +03:00
assaf shapira
7ba690afaa
added link to citrix SDK download
2017-09-24 12:49:11 +03:00
Wedge Jarrad
96c1ef48e6
Ignore retcode on call to grep in selinux.py module
...
Fixes #43711
Returning an exit code of 1 is normal operation of grep when it does not
find a match. This will happen every time this function is called by
fcontext_policy_present to detirmine whether a selinux policy exists
before creating it. Ignoring the retcode will prevent it from emitting
an error when this happens.
2017-09-23 17:38:51 -07:00
Damon Atkins
c7a652784a
remove blank line at end of file
2017-09-23 13:56:50 +10:00
Damon Atkins
e97651d49b
Merge branch '2017.7' into 2017.7_update_safe_filename_func
2017-09-23 13:54:11 +10:00
Alexandru Bleotu
847debab7a
Fix failing storage and listdiffer tests
2017-09-22 17:50:09 -04:00
garethgreenaway
132b1b343b
Merge branch '2017.7' into merge-2017.7
2017-09-22 14:38:23 -07:00
