Commit Graph

88542 Commits

Author SHA1 Message Date
Michael Calmer
ab9f5768b7 remove unused variable and simplify dict size checking 2017-12-04 15:38:22 +01:00
Michael Calmer
06b2d25371 simplify argument handling 2017-12-04 15:38:22 +01:00
Michael Calmer
bef53514fe improve search function 2017-12-04 15:38:22 +01:00
Michael Calmer
8433491cae fix list_provides cache handling 2017-12-04 15:38:22 +01:00
Michael Calmer
3d04f7d1fe test package capability feature 2017-12-04 15:38:22 +01:00
Michael Calmer
3d28be0938 implement resolve_capabilities option for packages 2017-12-04 15:38:22 +01:00
Michael Calmer
b8db7ab7bf support more options for zypper search module 2017-12-04 15:38:22 +01:00
Sjuul Janssen
0d81aa83e2
Merge branch 'develop' into alternate_composefile 2017-12-04 10:31:10 +01:00
sjuul
c706f24d3f removed prints 2017-12-04 10:22:45 +01:00
sjuul
008389be7a create alternative compose files 2017-12-04 09:59:45 +01:00
Nicole Thomas
8c765dcd75
Merge branch 'develop' into keystone_shade 2017-12-03 20:44:05 -05:00
Nicole Thomas
2230ecff8b
Merge branch 'develop' into neutron_shade 2017-12-03 20:40:32 -05:00
Nicole Thomas
36743424fa
Merge pull request #44785 from eradman/salt_bootstrap_doc
Update salt_boostrap command line help summary
2017-12-03 20:34:49 -05:00
Erik Johnson
02c2be63ba
Merge pull request #44594 from PeterS242/develop
Fixup in _get_extra_options method
2017-12-03 17:34:13 -06:00
Erik Johnson
a32464be66
Merge pull request #44789 from twangboy/win_reset_perms
Add ability to reset file system object perms
2017-12-03 17:20:40 -06:00
Erik Johnson
562193f5c6
Merge pull request #44577 from gtmanfred/develop
check if the filesystem support lsattr
2017-12-03 17:17:51 -06:00
Erik Johnson
05da78edfe
Merge pull request #44798 from amendlik/sdb-doc
Correct CLI examples in SDB runner documentation
2017-12-03 17:13:59 -06:00
Erik Johnson
67d020c8b1
Merge pull request #44803 from samodid/fix_typo_in_docstrings
fix copy-paste errors in doc strings for saltutil module and runner
2017-12-03 17:13:08 -06:00
Volodymyr Samodid
b811cc7343
fix copy-paste errors in doc strings for saltutil module and runner 2017-12-03 22:38:26 +02:00
Jorge Schrauwen
bb8cda5234 Switch over to zfs.exists and zpool.exists
This should stop the error logging on non existing
filesystems, volumes, snapshots, ...
2017-12-03 14:51:32 +01:00
Jorge Schrauwen
3c4f960818 Only convert size when request
While trying to get the code complexity down bit some mistakes were
made.

We ONLY should do size conversion when requested! We request it only for
the input values in the zfs and zpool states.
2017-12-03 14:18:16 +01:00
Ollie Armstrong
d7cae5d55c
Note in doc for s/file.exists that doesn't modify
Expand the documentation to clarify that the states/file.exists function will
not create a file when it doesn't exist and returns an error instead.

Fixes #44546.
2017-12-03 12:06:41 +00:00
Jorge Schrauwen
a82b12470d Tiny docs fix 2017-12-03 11:38:04 +01:00
Jorge Schrauwen
6a17af2959 Handle strings of type unicode also. 2017-12-03 11:32:58 +01:00
Jorge Schrauwen
1eb4fc884c Fix swap grains for Solaris-like operating systems
The output of ```swap -s``` is the same on atleast the following:
- Solaris 11.3
- Solaris 10
- OmniOS
- OpenIndiana
- SmartOS

```
total: 3251464k bytes allocated + 827664k reserved = 4079128k used,
181507256k available
```

The first value is the current allocate mount of swap without
reservations, the 2nd value is the reservation, the 3rd value is the
current used (allocate + reservation) the last value is the amount of
currently available swap.

We want available + used to get the total.
2017-12-03 10:33:43 +01:00
Adam Mendlik
281992195a
Correct CLI examples in SDB runner documentation 2017-12-02 17:30:41 -07:00
Jorge Schrauwen
a5b9f2643d Alse use -p for grains to keep everything consistant 2017-12-02 17:50:13 +01:00
Jorge Schrauwen
9bdad9ea5f Only update props when changed in zfs.*_present
We make sure the values conform to what zfs expects, this should
 fix the unneeded updates as mentioned in #44404

 Also try and make salt.states.zfs a bit more easier to read.
2017-12-02 16:30:45 +01:00
Jorge Schrauwen
9e163c847e Only update props when changed in zpool.present
We make sure the values conform to what zfs expects, this should
fix the unneeded updates as mentioned in #44404

Additional test for zpool.get with whitespaces in the result.
2017-12-02 16:00:06 +01:00
Jorge Schrauwen
0e9dc6dc21 Switch to salt.utils.stringutils.to_num
For now _conform_value only does str to num transformation
when it is required. It is possible that in the future it will
also do other things.

So while switching to use stringutils.to_num we kept the old name.
2017-12-02 13:50:41 +01:00
Jorge Schrauwen
0e9fe895e3 Add new unit tests for zfs.list and zfs.get
Parsable output needs new unit tests. I update the old tests with fresh
data from one of my test systems and create new tests for the same data
but with the parsable output flag set. These tests also test the new
code that converts numbers to actually numeric values.
2017-12-02 13:42:19 +01:00
Jorge Schrauwen
98d2702bfd Cleanup of str to number conversion
The original str to number conversion not very clean.
It resulted in duplicate code, extract this to a simple function.
2017-12-02 13:25:46 +01:00
Jorge Schrauwen
0813183fe8 Add new unit tests for zpool.list and zpool.get
Parsable output needs new unit tests. I update the old tests with fresh
data from one of my test systems and create new tests for the same data
but with the parsable output flag set. These tests also test the new
code that converts numbers to actually numeric values.
2017-12-02 13:09:38 +01:00
Jorge Schrauwen
9571ffadf3 Use raw string for regex so zfs and zpool modules
Make lint happy by using a raw string for the regex's in
```salt.modules.zfs``` and ```salt.modules.zpool```.
2017-12-02 11:36:51 +01:00
Jorge Schrauwen
fb35e80093 Correctly handle numbers in zpool module
This change will check if a value is a int or float and
convert the type accordingly.
2017-12-02 11:33:42 +01:00
Jorge Schrauwen
4f697b9d8f Allow request of parsable output in zpool module
This commit updates salt.modules.zpool to allow requesting
parsable output for ```zpool.list``` and ```zpool.get```.

This requires for the salt.stats.zpool to be able to correctly
handle multiple ways of formatting values as mentioned in #44404
2017-12-02 11:21:58 +01:00
Jorge Schrauwen
4b0a353084 Correctly handle numbers in zfs module
This change will check if a value is a int or float and
convert the type accordingly.
2017-12-02 11:07:20 +01:00
Jorge Schrauwen
a40f87b2b4 Allow request of parsable output in zfs module
This commit updates salt.modules.zfs to allow requesting
parsable output for ```zfs.list``` and ```zfs.get```.

This requires for the salt.stats.zfs to be able to correctly
handle multiple ways of formatting values as mentioned in #44404
2017-12-02 10:48:39 +01:00
twangboy
371e210247
Add ability to reset file system object perms 2017-12-01 16:51:18 -07:00
twangboy
54fa2a1513
Fix sanitize_win_path function
It was not handling unicode correctly in Py2
2017-12-01 16:38:09 -07:00
Thomas S Hatch
887336c6de
Merge pull request #44691 from isbm/isbm-ansiblegate-issue44670
Bugfix: ansiblegate, issue 44670
2017-12-01 16:11:52 -07:00
Thomas S Hatch
6d815440f8
Merge pull request #44769 from thatch45/pause_states
Pause states
2017-12-01 15:56:56 -07:00
Thomas S Hatch
30bb80f75a
Merge pull request #44786 from thatch45/try_tb
try to ensure that the ret is never None
2017-12-01 15:55:01 -07:00
Thomas S Hatch
441a6d6204
Merge pull request #44753 from garethgreenaway/various_schedule_skip_bits
[develop] Various updates to the scheduler
2017-12-01 15:48:18 -07:00
Eric Radman
bf9dc026bb
Update salt_boostrap command line help summary
- Use exact indentation produced by the bootstrap-salt command
- normal package installs work fine on OpenBSD
2017-12-01 15:28:09 -05:00
Sam Yaple
8a567f3d0b
Add new keystone module and states based on shade
Test cases will be added in future patch
2017-12-01 15:17:48 -05:00
rallytime
3f9bf00c15
Reduce the number of days an issue is stale by 15 2017-12-01 15:09:14 -05:00
Akasha Yi
ed310b3bc1
Pylint cleanup 2017-12-01 12:08:32 -08:00
Thomas S Hatch
d2ccd6acd6 try to ensure that the ret is never None 2017-12-01 12:02:15 -07:00
Brian Adriance
d8c8a776f1
Merge branch 'develop' into saltcloud-vmware-nested-folders 2017-12-01 11:15:06 -05:00