Commit Graph

82148 Commits

Author SHA1 Message Date
Bo Maryniuk
fe97520bc7 Merge branch '2017.7' into isbm-suse-upstream-leftovers 2017-06-19 15:21:13 +02:00
Bo Maryniuk
fd156bca26 Bugfix: handle multi-version package upgrades 2017-06-19 15:19:12 +02:00
Bo Maryniuk
b08d790ede Lintfix: wrap lines over 120 chars 2017-06-19 14:54:22 +02:00
Bo Maryniuk
5b69c16fc6 Bugfix: use UTC date 2017-06-19 14:53:46 +02:00
Bo Maryniuk
28faec37af Lintfix: W0109 - duplicate key 2017-06-19 14:06:34 +02:00
Bo Maryniuk
cc9cb7f486 Lintfix: C0325 - unnecessary parenthesis 2017-06-19 14:04:57 +02:00
Bo Maryniuk
25686352bd emove openstack_test UT in favour of test_openstack 2017-06-19 14:03:09 +02:00
Bo Maryniuk
3845c84e65 Remove nova_test UT in favour of test_nova 2017-06-19 14:02:21 +02:00
Bo Maryniuk
6220380c3d Remove an older version of the unit test 2017-06-19 14:00:52 +02:00
Bo Maryniuk
d834bc2c8b Remove old tester. 2017-06-19 13:57:54 +02:00
Bo Maryniuk
9a74c0a6f3 Fix docstring 2017-06-19 13:51:48 +02:00
Mircea Ulinic
fae959d24b Remove duplicate mattermost ref 2017-06-19 09:52:54 +00:00
Mircea Ulinic
d8dc8a338b Add redis cache reference 2017-06-19 09:52:33 +00:00
Mircea Ulinic
fd28d3385c Adding Jinja cross ref 2017-06-19 09:49:45 +00:00
garethgreenaway
4c8aa25080 Merge pull request #41813 from rallytime/add_new_doc_modules
Add new documentation file references to build system for 2017.7
2017-06-16 18:54:15 -07:00
garethgreenaway
2c681887d3 Merge pull request #41816 from twangboy/update_psutil_req
Upgrade psutil to version 5.2.2
2017-06-16 18:51:28 -07:00
twangboy
8b4e3ad77d Upgrade psutil to version 5.2.2 2017-06-16 17:59:50 -06:00
Nicole Thomas
3e5fe7ca4b Merge pull request #41803 from terminalmage/issue41785
Don't log an error when no top.sls is found
2017-06-16 16:49:07 -06:00
Nicole Thomas
4dedf01956 Merge pull request #41811 from rallytime/bp-41806
Back-port #41806 to 2017.7
2017-06-16 16:48:39 -06:00
Nicole Thomas
c3a49c9552 Merge pull request #41805 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-06-16 16:01:06 -06:00
Nicole Thomas
4c9a73d75f Merge pull request #41728 from twangboy/win_install_docs
Win install docs
2017-06-16 15:41:21 -06:00
rallytime
ff277bc458 Add new documenation file references to build system for 2017.7 2017-06-16 21:17:33 +00:00
Ed Pelc
a536111b83 add tests for single docker log_config option fix 2017-06-16 14:57:17 -06:00
Ed Pelc
c90137cf1f fix(docker): allow log_driver or log_opt
Docker allows either option without the other and the docks make no mention of both options being required.
2017-06-16 14:57:17 -06:00
Daniel Wallace
4bf030ff65 don't break py2 2017-06-16 13:11:51 -06:00
rallytime
bef3280d31 Fix typo: "unction" should be "function" 2017-06-16 13:00:56 -06:00
rallytime
b0b47a549d Remove "xrun" reference. It should just be "run". 2017-06-16 12:07:21 -06:00
rallytime
b0f8d2c6d5 Make "Sodium" available in version.py for deprecation warning 2017-06-16 12:03:38 -06:00
Nicole Thomas
14803ae1de Merge pull request #23 from cro/merge-2017.7
Sometimes what gmtime returns looks like a float or other #.  Cast to str.
2017-06-16 12:00:22 -06:00
C. R. Oldham
760c4758a9 Sometimes what gmtime returns looks like a float or other #. Cast to str. 2017-06-16 11:50:21 -06:00
garethgreenaway
d12bc4ee68 Merge pull request #41801 from terminalmage/issue41781-2016.11
Don't take hostname from name param when creating docker container (2016.11 branch)
2017-06-16 10:02:01 -07:00
rallytime
58262608cd Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/config/__init__.py
  - salt/master.py
  - salt/modules/zypper.py
  - tests/unit/modules/timezone_test.py
2017-06-16 10:43:02 -06:00
garethgreenaway
01e6e7e02c Merge pull request #41800 from terminalmage/issue41781
Don't take hostname from name param when creating docker container
2017-06-16 09:40:21 -07:00
Erik Johnson
f9f4d49f05 Don't log an error when no top.sls is found
It is a valid use case to only derive your SLS matches via master_tops,
so it should not be considered an error if no top file matches are
found.
2017-06-16 11:07:56 -05:00
Erik Johnson
8236d3e1c3 Don't take hostname from name param when creating docker container (2016.11 branch) 2017-06-16 10:05:35 -05:00
Erik Johnson
83dcffb4b3 Don't take hostname from name param when creating docker container
Resolves #41781.
2017-06-16 10:02:31 -05:00
Daniel Wallace
b65edc786c handle unordered sets in unique jinja tests 2017-06-16 08:40:40 -06:00
Pablo Suárez Hernández
fb444db0f2 Search the entire CACHE_DIR because storage paths change across versions
Prevents zero length error on Python 2.6

Fixes Zypper unit test

Enhances pkg.list_downloaded information of a package

Listing all patches instead of security ones only

Adapting Zypper test to new list_downloaded output

Fixes zypper test error after backporting

Pylint fixes
2017-06-16 15:28:42 +02:00
Pablo Suárez Hernández
27ef83fd62 Adding support for installing patches in yum/dnf execution module
Adding support for installing patches in Zypper module

Adding list_downloaded function to Zypper module

Adding list_downloaded function to Yum module

Adding new pkg.downloaded state

Adding documentation for pkg.downloaded state

Adding pkg.patched and pkg.patch_downloaded states

Check targets for advisory patches installation

Adds support for listing advisory patches with Zypper

Adds support for listing advisory patches with Yum

Improving function naming

Moving advisory ids checks into pkg_resource.parse_targets

Fixes _find_download_targets to call _preflight_check

Fixes parse_targets when advisory id is passed as name

Pylint fixes

Enables pkg.downloaded to verify packages after package manager call.

Adding missing kwargs parameters to pkg.install call

Adding versionadded flags

Some refactoring and minor fixes

Adding unit tests for Zypper execution module

Adding more unit tests for Zypper module

Pylint fix
2017-06-16 15:28:10 +02:00
Peter V. Saveliev
4761e711fe clean up change attribute from interface dict
The attribute is hidden in IPDB from the high-level logics since
pyroute2 version 0.4.2.

Bug-Url: https://github.com/saltstack/salt/issues/41461

unit tests: add pyroute2 interface dict test

Bug-Url: https://github.com/saltstack/salt/pull/41487
Bug-Url: https://github.com/saltstack/salt/issues/41461

unit tests: fix absolute imports in test_pyroute2

Bug-Url: https://github.com/saltstack/salt/pull/41533

unit tests: add encoding clause into test_pyroute2

Bug-Url: https://github.com/saltstack/salt/pull/41533

unit tests: test_pyroute2 -- add skipIf

... and comments

Bug-Url: https://github.com/saltstack/salt/pull/41533

Update new pyroute2 unit test to conform with 2016.11 branch standards
2017-06-16 14:39:08 +02:00
Michael Calmer
f7cd2f6722 Fix os_family case in unittest 2017-06-16 14:39:08 +02:00
Bo Maryniuk
e9de0746ae Fix grain for os_family on SUSE series 2017-06-16 14:39:08 +02:00
Bo Maryniuk
2d8c9883ff Use correct grain constants for timezone
Adjust the test so it is using the right grain for SUSE systems

Bugfix: use correct grain constant for platform

Refactor with setup/teardown

Add UT for RedHat's set_zone

Fix doc for RH UT

Remove unnecessary mock patch

Doc fix

Add UT for set_zone on SUSE series

Adjust UT to use correct grain for SUSE series

Bugfix: use correct os_family grain value for SUSE series

Add UT for gentoo on set_zone

Add UT for Debian on set_zone

Remove duplicate code

Add UT for get_hwclock on UTC/localtime

Remove dead code

Add UT for get_hwclock on SUSE platform

Bugfix: use correct grain for SUSE and RedHat platform

Add UT for RedHat/SUSE platforms on get_hwclock

Add UT for Debian on get_hwclock

Add UT on Solaris

Add UT for AIX on get_hwclock

Add UT for set_hwclock on AIX

Fix docstrings

Add UT for set_hwclock on solaris

Add UT for set_hwclock on Arch

Add UT for set_hwclock on RedHat

Fix UT names

Add UT set_hwclock on SUSE

Bugfix: use correct grain name for SUSE platform

Add UT for set_hwclock on Debian

Add UT on set_hw_clock on Gentoo

Fix lint issues

Rewrite test case for using no patch decorators

Disable the test for a while

Do not use multiple variables in "with" statement as of lint issues
2017-06-16 14:39:08 +02:00
Bo Maryniuk
23d2aca59b Add unit test for skip false values from preferred_ip
- Add fake preferred IP function for testing
- Add initial unit test for openstack cloud module
- Move out nested function to be unit-testable
- Lintfix
- Add unit test for nova connector
- Move out nested function for testing purposes
- Fix name error exception
- Skip test, if libcloud is not around
- Add unit test for node ip filtering
- Lintfix E0602
- Fix UT parameter changes
- Fix lint, typos and readability
- PEP8: fix unused variable
- Reformat idents, fix typos
- Describe debug information
2017-06-16 14:39:08 +02:00
Piotr Kaźmierczak
ea4d085694 fixing beacons.list integration test failure 2017-06-16 14:39:08 +02:00
Michael Calmer
17ccdc4b74 fix salt --summary to count not responding minions correctly (bsc#972311)
In case a minion is not responding a dict is returned instead of a string.
2017-06-16 14:37:45 +02:00
Pablo Suárez Hernández
2b480da988 Setting up OS grains for SLES Expanded Support (SUSE's Red Hat compatible platform)
core.py: quote style fixed
2017-06-16 14:37:45 +02:00
Michael Calmer
0c6611f274 do not generate a date in a comment to prevent rebuilds (bsc#969407) 2017-06-16 14:37:45 +02:00
Bo Maryniuk
6cd3c37ecf Check if byte strings are properly encoded in UTF-8
Rename keywords arguments variable to a default name.
2017-06-16 14:37:45 +02:00
Luke Overend
92381d7b6d Update napalm_syslog engine to use auth class
We have changed napalm-logs to have a keep alive so when the server
restarts the client automatically re-authenticates. This PR changes the
salt engine to make use of the new keep alive.

napalm-logs PR https://github.com/napalm-automation/napalm-logs/pull/87
2017-06-16 09:48:27 +01:00