Commit Graph

73390 Commits

Author SHA1 Message Date
mwinnett
2b92c383f1 Add initial unit tests for win_snmp 2016-09-03 12:34:28 -07:00
skizunov
93174eb572 Import "salt.ext.six" instead of "six" (#36036)
The Windows distribution doesn't come with `six` as a pre-installed
python package. Since `salt.ext.six` already exists, it makes sense
to use that instead of adding `six` to the Windows distribution.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-09-02 14:57:41 -06:00
Nicole Thomas
03ebb59e5e Remove commented out skipIf lines in boto_vpc_test module (#36013)
If we're running these tests successfully now, then let's remove these lines.
2016-09-02 14:37:41 -06:00
Tom Williams
c4d61cdce8 INFRA-3936 - fix bug in boto_ec2 state when deleting instance (#36034) 2016-09-02 14:14:29 -06:00
Nicole Thomas
f76dc0f9c0 Merge pull request #36026 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-09-02 10:40:32 -06:00
rallytime
1bf840b036 Merge branch '2016.3' into 'develop'
No conflicts.
2016-09-02 09:43:40 -06:00
Mike Place
cd60ec5d57 Merge pull request #36024 from DSRCorporation/bugs/31454_local_client_memleak
Don't subscribe to events if not sure it would read them.
2016-09-03 00:41:01 +09:00
Nicole Thomas
32d5f896d4 Merge pull request #36023 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-09-02 09:37:59 -06:00
Dmitry Kuzmenko
01911c530e Don't subscribe to events if not sure it would read them.
Reactor uses LocalClient to send message but do not read events that
produces memory leak in EventPublisher: sent messages are collected
there in the IOStream class.
2016-09-02 17:20:30 +03:00
rallytime
a63c9dfc6a Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/states/service.py
2016-09-02 08:19:16 -06:00
Mike Place
e6b93c2380 Merge pull request #36022 from saltstack/revert-33770-service_tests
Revert "service state integration tests"
2016-09-02 21:38:36 +09:00
Mike Place
6cf56843d4 Revert "service state integration tests" 2016-09-02 21:38:15 +09:00
Nicole Thomas
e864b9b571 Merge pull request #36012 from rallytime/fix-failing-boto-vpc-tests
Pass in connection parameters to boto_vpc function calls
2016-09-01 22:38:07 -06:00
rallytime
f8c9b8443f Pass in connection parameters to boto_vpc function calls
Otherwise we are not properly mocking this function call and the
tests fail when the `_conn3` function is called. (Any distro using
salt.utils.boto3 will fail here.)

We also need to protect the test class if the correct versions of
boto and moto are not installed on the test system.
2016-09-01 22:35:14 -06:00
Nicole Thomas
e0da395ddc Merge pull request #36006 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-09-01 16:31:29 -06:00
Justin Anderson
9f7994ea40 Suse user state test fix (#36009) 2016-09-01 16:28:13 -06:00
Nicole Thomas
15cb551bd6 Don't import string_types from six. Import the whole lib only once. (#36005)
* Don't import string_types from six. Import the whole lib only once.

* Make weird pylint error happy
2016-09-01 15:57:55 -06:00
Justin Anderson
e6b4dd651e Suse Useradd test fix (#36007) 2016-09-01 15:57:03 -06:00
Justin Anderson
40131b9c27 Groupadd test fix (#36002)
* Change osmajorrelease back to str in test_useradd

* Change osmajorrelease back to str in test_userdel

* Change osmajorrelease back to str in test_members
2016-09-01 15:40:15 -06:00
rallytime
430cdeaa03 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/win_repo.py
  - salt/utils/win_runas.py
2016-09-01 15:15:33 -06:00
Aditya Kulkarni
50981f4f11 Add unit tests for VPC module (#35996) 2016-09-01 15:12:22 -06:00
Nicole Thomas
d248ab0120 Merge pull request #36004 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-09-01 15:11:05 -06:00
rallytime
318bffed1d Merge branch '2015.8' into '2016.3'
No conflicts.
2016-09-01 14:27:07 -06:00
Tom Williams
1a0c1b31a4 INFRA-1976 - bugfix. boto_iam fails to correctly compare policies (#35875)
* INFRA-1976 - bugfix.  boto_iam fails to correctly compare policies

* INFRA-1976 - fixup some pylint thingummies...
2016-09-01 13:51:45 -06:00
lomeroe
4ae95b4dc3 Add win_lgpo execution module (#35738)
* initial add of win_lgpo module

* initial add of win_lgpo module

* Add ability to set admx based policies
add documenation
lint cleanup

* lint fixes

* i before e except after c

* more spelling corrections

* attempts to correct w1699 lint

fixes for "get" policy when ADM names conflict

* py3 compatability fix
string continuation changes for better pep8 conformity
additional module functions for in-progress state module

* update function names to not shadow builtins
additional execution module updates to handle ADML quirks
add state module

* add additional documentation

remove cumulative_rights_assignments argument from set_user_policy

* correct module function documentation examples that used original virtual name of 'gpedit'

* lint fix in states file
2016-09-01 13:25:09 -06:00
Nicole Thomas
778a05d47d Merge pull request #36000 from rallytime/lint-35916
Lint #35916
2016-09-01 13:19:20 -06:00
Damon Atkins
8f8599596d win_pkg Fix#35342 Fix#34781 Unicode Support (#35899)
* Fix#35342 Fix#34781 Unicode Support
Fix#35342
 Issue: win_pkg: refresh_db doesn't remove cached items which have been
renamed or removed
 Solution: Conservative solution was to just remove *.sls files from
\win\repo-ng  tree  as part of pkg.refresh_db instead of removing all
of \win\repo-ng\salt-winrepo-ng

Fix#34781
 Issue: Logs did not contain enough information, and from executing it from the
master it was too difficult to determine if there was an issue due to the
output being data
 Solution:
* pkg.genrepo now reports the status of the operation instead of the
large about of metadata. The status report indicates:
- Total SLS Files processed
- Number of failed sls files
- Number of successful sls files
- list of files with errors and the render/compile errors they had
- optionally a list of successfully render/compiled files and the
package names within those files
* pkg.refresh_db was also part of this issue, as it just reported a list
of files copied from the same large list of files would be reported almost
every time. As pkg.refresh_db calls pkg.genrepo after copy all the files
it now reports the same as data as pkg.genrepo.

Unicode Support
  Issue: Windows Registry module supports Unicode in development, win_pkg
needed to be updated to support the Unicode output from reg.

* Lint space fixes

* More Lint fixes

* more lint fixes.

* refresh_db lint issues

* More lint fo win_pkg.py

* Notice list_pkgs did not call refresh_db with the current saltenv

* * Update states/pkg.py not to include in its name space an internal
function which has been removed
* With Windows we ignore issues with refresh_db existing behaviour,
update win_pkg.py to not report errors with refresh_db back
to states/pkg.py. As part of doing this created an internal version
if refresh_db called _refresh_db with different defaults

* Lint and Doco fixes win_pkg

* Remove trailing white space

* Remove a blank line
2016-09-01 13:16:56 -06:00
Nicole Thomas
86e5edfd0a Add persist deprecation from win_useradd to Carbon release notes (#36001) 2016-09-01 11:53:25 -06:00
Erik Johnson
678f10cf8b Avoid traceback in mac_user.py when user.chhome is invoked from a user state (#35901)
* mac_user.py: Avoid traceback in chhome func

* Add warning about lack of Windows/Mac support for createhome
2016-09-01 11:44:47 -06:00
Erik Johnson
dd6bf8ae72 Remove persist parameter for chhome in win_useradd.py (#35994)
Replaced it with a log mesage when someone passes ``persist=True``.
2016-09-01 11:37:25 -06:00
rallytime
1d5d035cb2 Lint for #35916
Merges #35916
2016-09-01 11:30:14 -06:00
Heghedus Razvan
1a38cc340c shadow: test set&delete password for root (#35929)
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
2016-09-01 11:25:44 -06:00
Nicole Thomas
6658ef1351 Lint develop (#35998)
* Lint fixes for develop

Refs #35795

* Versionadded tag and use single quotes for function doc
2016-09-01 11:16:31 -06:00
Thomas S Hatch
b48d7a7899 Merge pull request #35965 from edgan/salt-ssh_highstate_retcode
Set the return code to 1 on salt-ssh highstate errors
2016-09-01 10:21:37 -06:00
Mike Place
a0e13df992 Merge pull request #35995 from cachedout/osmajorrelease_type
Update osmajorrelease calls to match new grain type
2016-09-02 01:17:28 +09:00
Filip Pytloun
f7aeb0650b Fix jenkins module with anonymous-access jenkins (#35991) 2016-09-01 10:02:09 -06:00
Mike Place
9c74915ffc Be more careful when processing output. (#35977)
This handles NoneTypes correctly as well as additional checking for failures from external serializers.
2016-09-01 10:01:15 -06:00
Mike Place
8b0b65430f If we get an error from the Linode API, return it (#35976)
* If we get an error from the Linode API, return it

* No need to check the len, really
2016-09-01 09:59:57 -06:00
Mike Place
4e845fd72c Merge pull request #35963 from ixs/develop
Ensure network config file has trainling newline
2016-09-02 00:58:04 +09:00
Shane Lee
81fbc08d9b Load UserProfile when using RunAs (#35951) 2016-09-01 09:54:35 -06:00
Mike Place
79deaf1585 Merge pull request #35947 from bodhi-space/infra3927
INFRA-3927 - compare SQS policies as json rather than strings
2016-09-02 00:53:30 +09:00
Mike Place
31c5236f00 Merge pull request #35941 from skizunov/develop2
Add features to `avahi_announce` beacon
2016-09-02 00:52:02 +09:00
Mike Place
2e76f73ea1 Merge pull request #35918 from rallytime/fix-18614
Remove the compact outputter
2016-09-02 00:49:43 +09:00
DERNAT Rémy
fd6e523b08 Update the mongodb module with a new update_one() method (#35795)
* Update the mongodb module with a new update_one() method (useful for ext_pillar based on mongodb)

* log informations errors

* update due to bracket pylint syntax issue and whitespaces
2016-09-01 09:43:05 -06:00
C. R. Oldham
908234d9ab Document module whitelisting. Remove FIXME comments for disable_modules and disable_returners as they are definitely implemented. (#35717) 2016-09-01 09:40:36 -06:00
Mike Place
f115e6fc8f Merge pull request #35919 from rallytime/fix-35618
Add documentation about salt_interface to EC2 docs
2016-09-02 00:20:27 +09:00
Mike Place
c75efc9a48 Merge pull request #35962 from twangboy/improve_show_sls
Allow full path to be passed to show_sls (develop)
2016-09-02 00:19:23 +09:00
Mike Place
f7b85cb70b Merge pull request #35952 from twangboy/fix_win_runas_2016.3
Load UserProfile when using RunAs (2016.3)
2016-09-02 00:18:15 +09:00
Mike Place
211c2f1f38 Merge pull request #35910 from techhat/thoriumfile
Allow filtering in Thorium file.save
2016-09-02 00:17:10 +09:00
Mike Place
70b61e33ff Merge pull request #35942 from skizunov/develop3
Add pybonjour based beacon for zeroconf announcement
2016-09-02 00:15:49 +09:00