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
72,469 Commits 24 Branches 182 Tags 341 MiB
0b1e9e9a78
Commit Graph

940 Commits

Author SHA1 Message Date
Derek Schaller
b83fb3e857 Adding patch for error before npm cache_cleaned unit test 2016-02-08 09:16:48 -08:00
justinta89
962e0deda5 Fixed rabbitmq_vhost test failure. 2016-02-08 10:02:43 -07:00
Morgan McKenzie
9b17fdce5e Fix lxc cloud provided minion reporting present 
LXC minion is reporting as present when configured
with cloud state, even though it is not.

Fixes issue #31000
 2016-02-08 15:06:56 +00:00
Derek Schaller
c53824b111 npm unit test updates 2016-02-06 23:38:49 -08:00
Derek Schaller
67fb81dd93 Salt specific lint fixes 2016-02-06 22:10:59 -08:00
Derek Schaller
ec1965bc0f Removing duplicate splitstrings on result stdout 2016-02-06 21:07:41 -08:00
Derek Schaller
eaabcaec26 Fixing assumptions about results structure 2016-02-06 19:38:06 -08:00
Derek Schaller
5c0f9eb8f9 Documentation updates 2016-02-06 18:29:35 -08:00
Derek Schaller
de154d76ce Adding npm cache_cleaned state and required module functions 2016-02-06 15:27:00 -08:00
Richard Hansen
eb6f289fc1 change default for volume_present()'s force parameter to False 
This is safer, as it avoids surprising the user with permanent data
loss.
 2016-02-05 09:41:19 -07:00
Richard Hansen
34f3057e04 add 'force' to replace (or not) volumes with driver mismatch 
Add a new 'force' option that will cause volume_present() to delete
and re-create a volume if the existing volume's driver doesn't match
the specified driver.  Set the default to True to preserve existing
behavior.
 2016-02-05 09:41:18 -07:00
Mike Place
4ae2d829f0 Merge pull request #30888 from ticosax/backport-30797 
Backport #30797 to 2015.8
 2016-02-04 14:02:25 -07:00
Richard Hansen
68b51be869 add additional states.dockerng.volume_present() unit tests 
The unit tests now test for the bug fixed in the previous commit
(among other things).
 2016-02-04 10:07:51 +01:00
Richard Hansen
6b5b2c063d change default for volume_present()'s force parameter to False 
This is safer, as it avoids surprising the user with permanent data
loss.
 2016-02-03 22:32:20 -05:00
Richard Hansen
255f5a1b91 add 'force' to replace (or not) volumes with driver mismatch 
Add a new 'force' option that will cause volume_present() to delete
and re-create a volume if the existing volume's driver doesn't match
the specified driver.  Set the default to True to preserve existing
behavior.
 2016-02-03 19:32:13 -05:00
rallytime
adb85892de Fix failing state module tests 2016-02-04 00:01:11 +00:00
Mike Place
618f823e21 Merge pull request #30774 from Unity-Technologies/feature/mac_package 
Added ability to install PKG, DMG and APP files for OS X minions
 2016-02-03 12:54:32 -07:00
Richard Hansen
cbda6446df add additional states.dockerng.volume_present() unit tests 
The unit tests now test for the bug fixed in the previous commit
(among other things).
 2016-02-02 19:24:44 -05:00
Mike Place
3b246db0b0 Fix stupid test 2016-02-02 12:39:24 -07:00
Mike Place
e3f0c8e162 Merge pull request #30731 from Unity-Technologies/feature/osx_keychain 
Added the ability to configure keychains on OSX
 2016-02-02 08:03:14 -07:00
Mike Place
330abcad12 Merge pull request #30775 from Unity-Technologies/feature/mac_defaults 
Added the ability to set OS X settings using defaults
 2016-02-02 07:47:49 -07:00
Mike Place
e4ca01181b Merge pull request #30803 from Unity-Technologies/feature/win_certutil 
Added the ability to add and remove certificates from Windows minions
 2016-02-02 07:04:30 -07:00
Daniel Hobley
2567ea6956 Lint fixes 2016-02-02 11:48:17 +01:00
Daniel Hobley
becb643557 Added ability to install and activate a windows license 2016-02-02 11:07:05 +01:00
Daniel Hobley
ddc24708ad Added the ability to add and remove certificates from Windows minions 
- Uses certutil.exe to add and remove certificates
 2016-02-02 10:06:20 +01:00
Daniel Hobley
04877e06e7 Updated based on PR feedback 
- Renamed type to vtype
- Made if statements a little more clear
 2016-02-02 09:01:38 +01:00
Mike Place
86ea047933 Merge pull request #30734 from Unity-Technologies/feature/osx_assistive 
Added ability to change assistive access on OSX 10.9+
 2016-02-01 14:51:47 -07:00
Mike Place
68f4fd2fb3 Merge pull request #30697 from Unity-Technologies/feature/proxy-settings 
Added ability to set proxy settings on OSX and Windows
 2016-02-01 13:04:59 -07:00
Daniel Hobley
0a1da63d6a Added the ability to set OS X settings using defaults 2016-02-01 15:24:02 +01:00
Daniel Hobley
f701547027 Added ability to install PKG, DMG and APP files for OS X minions 2016-02-01 14:22:22 +01:00
Mike Place
fe19ca4480 Merge pull request #30729 from Unity-Technologies/feature/dism 
Added DISM module and states
 2016-01-29 17:10:32 -06:00
Daniel Hobley
6ad5014968 Lint fixes 2016-01-29 15:29:06 +01:00
Daniel Hobley
a4f4e52687 Added xattr module and state for OS X 
- Allows you to add and remove special attributes to/from files
 2016-01-29 15:01:40 +01:00
Daniel Hobley
d80a637d2e Added ability to change assistive access on OSX 10.9+ 2016-01-29 13:59:51 +01:00
Daniel Hobley
bae0543d95 Added the ability to configure keychains on OSX 2016-01-29 11:47:43 +01:00
Daniel Hobley
e8c3a154f0 Added DISM module and states 
- Allows you to install features and capabilities on windows minions
 2016-01-29 10:35:58 +01:00
Daniel Hobley
efdc953867 Merge branch 'develop' into feature/proxy-settings 2016-01-29 09:35:31 +01:00
Kris Raney
b4d27451d1 Merge branch 'develop' into boto_apigateway 2016-01-28 15:35:34 -06:00
Daniel Hobley
9ecfb56c33 Fixed a bug where new changes are detected when nothing changed in proxy state 2016-01-28 15:06:06 +01:00
Daniel Hobley
6f266cdd73 Added ability to set proxy settings on OSX and Windows 2016-01-28 13:21:15 +01:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop' 
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
 2016-01-26 16:19:39 -07:00
Kris Raney
8825cd095b Merge branch 'develop' into boto_apigateway 2016-01-26 10:27:44 -06:00
Colton Myers
5bc11d7539 Merge pull request #30631 from rallytime/fix-7811 
Refactor rabbitmq_cluster states to use test=true functionality correctly
 2016-01-26 09:23:49 -07:00
Winston Liu
54c111e5e1 Merge branch 'boto_lambda' into boto_apigateway 2016-01-25 15:51:10 -08:00
rallytime
bf9ffded6d Refactor rabbitmq_cluster states to use test=true functionality correctly 
Fixes #7811
 2016-01-25 16:47:54 -07:00
Colton Myers
94bf7790cf Merge pull request #30567 from rallytime/fix-25363 
Make sure rabbitmq_vhost states are using test=true properly.
 2016-01-25 16:19:45 -07:00
rallytime
1e8e86007c Refactor rabbitmq_policy states to use test=true functionality correctly 
Fixes #25658
 2016-01-25 15:21:19 -07:00
rallytime
3f8b905642 Fix test failures 2016-01-25 12:08:30 -07:00
Mike Place
44dea20bf3 Merge pull request #30550 from cachedout/fix_30113 
Fixup for Let test=True option work for http.query state #30113
 2016-01-22 11:35:31 -07:00
Mike Place
427f6f7cad Fix failing unit test 2016-01-22 10:54:25 -07:00
Andrew Colin Kissa
82a966b1f4 Add postgres_initdb state module tests 2016-01-22 12:16:51 +02:00
Kris Raney
67f873b3c1 Merge branch 'develop' into boto_apigateway 2016-01-21 16:54:19 -06:00
Mike Place
40ba550ffd Merge pull request #30511 from kraney/boto_s3_bucket 
Boto s3 bucket state
 2016-01-21 15:52:58 -07:00
Kris Raney
5dfa264652 Merge branch 'develop' into boto_apigateway 2016-01-21 16:49:21 -06:00
Kris Raney
14f7bf693b Pylint fixes 2016-01-21 11:37:43 -06:00
Kris Raney
4ad20f6217 Not satisfied with the code complexity/ readability/ maintainability, so refactor a bit. Fix a couple bugs in the process. Add unit tests. 2016-01-21 11:28:53 -06:00
Mike Place
7b88d721a5 Merge pull request #30368 from lyft/boto_dynamodb 
Update boto_dynamodb module and state
 2016-01-20 11:23:15 -07:00
Zack Hsi
fbff36df36 Fix unit test 2016-01-19 16:06:07 -08:00
Winston Liu
ea0ab0f4a1 - don't use basepath in the resource path when creating resources. 
- fixed a minor bug in absent state, to continue check to see if api can be nuked even if stage name does not exist.
 2016-01-15 10:08:02 -08:00
rallytime
39b49621ad Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/beacons/service.py
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/modules/ipset.py
  - salt/modules/npm.py
  - salt/modules/rpm.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/schedule.py
  - tests/unit/modules/state_test.py
 2016-01-14 13:33:53 -07:00
Winston Liu
855096ab4a fixed a bug in absent state, when the given rest api name is not found, we should return absent state result being true. added a unit test for this as well. 2016-01-14 10:31:28 -08:00
Winston Liu
f93874f4b7 we will now check to see if we need to overwrite the stage variables in present state. 2016-01-14 09:54:25 -08:00
Mike Place
09b144aa98 Merge pull request #30327 from kraney/boto_cloudtrail 
Support for AWS CloudTrail
 2016-01-13 13:18:06 -07:00
Mike Place
10b5728f84 Merge pull request #30308 from rallytime/bp-30257 
Back-port #30257 to 2015.8
 2016-01-13 12:20:13 -07:00
Mike Place
dcfba51556 Lint 2016-01-13 10:42:03 -07:00
Mike Place
b9921128af Kill pointless tests 2016-01-13 10:15:26 -07:00
Mike Place
63c157d0a3 Fix test_managed 2016-01-13 09:54:33 -07:00
Kris Raney
d30212f180 Add tag support to boto_cloudtrail 2016-01-13 10:13:05 -06:00
abednarik
deeeb71dda Add test in npm state. 
Updated nmp module to append --dry-run when executing nmp state in test mode.

Fixes #30250.
 2016-01-12 14:30:32 -07:00
Kris Raney
6fa7c84ec2 Initial cloud trail state support 2016-01-12 15:20:24 -06:00
Jacob Hammons
53d17f1f85 Changed examples to use the "example.com" domain instead of "mycompany.com" or "company.com" 2016-01-12 13:37:09 -07:00
abednarik
128ded881f Add test in npm state. 
Updated nmp module to append --dry-run when executing nmp state in test mode.

Fixes #30250.
 2016-01-11 17:05:12 -03:00
Winston Liu
a207fb44ce Merge branch 'boto_iot' into boto_apigateway 2016-01-08 10:08:04 -08:00
Winston Liu
07d144eb6b unit tests for boto apigateway present/absent state. 2016-01-06 13:53:09 -08:00
Mike Place
9ef4bb3b46 Merge pull request #30132 from akissa/add-support-for-custom-augeas-lense-paths 
Add support for augeas loading of non stock lenses
 2016-01-04 13:36:07 -07:00
Mike Place
fff6bf1970 Merge pull request #30041 from kraney/boto_iot 
Support for AWS IoT
 2016-01-04 13:04:06 -07:00
Andrew Colin Kissa
a8fe0df0ac Add support for augeas loading of non stock lenses 
Fixes #30131

Pylint cleanup

Updated tests
 2016-01-04 14:48:44 +02:00
Andrew Colin Kissa
a3e786a03e add check_password execution module function 
fix rabbitmq_user.present is not idempotent

Fixes #30119
 2016-01-01 22:49:13 +02:00
Kris Raney
86568c9e4f Another pylint error 2015-12-31 14:30:01 -06:00
Kris Raney
08987a1698 Fix new lint warning 2015-12-30 22:43:38 -06:00
Kris Raney
26ded33d79 Reproduced the no-boto problem and fixed it. 2015-12-30 22:08:35 -06:00
Mike Place
e915f4b591 Merge pull request #30053 from akissa/add-postgres-privileges-support 
Add postgres privileges support
 2015-12-29 09:50:44 -07:00
Andrew Colin Kissa
7be5eebfc7 add postgres_privileges state module tests 2015-12-29 12:57:21 +02:00
Kris Raney
3dea1a3589 Sometimes 'no whitespace after comma' actually means 'no whitespace after _colon_'. 2015-12-28 15:14:27 -06:00
Kris Raney
2fe5d8fbb4 Fix pylint errors 2015-12-28 14:46:43 -06:00
Kris Raney
85d59865a6 Merge branch 'develop' into boto_iot 2015-12-28 13:45:35 -06:00
Andreas Lutro
ca290ec3e1 change how alternatives states check for installed 2015-12-28 12:31:19 -07:00
Andrew Colin Kissa
2e836a3f75 postgres_privileges skeleton 2015-12-27 12:01:20 +02:00
Andreas Lutro
4c9d893f98 change how alternatives states check for installed 2015-12-26 22:48:29 +01:00
Kris Raney
bd6cda504e boto_iot state unit tests. 2015-12-23 16:54:29 -06:00
Mike Place
23bffbb623 Merge pull request #29875 from akissa/add-postgres_language-state 
Add PostgreSQL Language management functionality
 2015-12-21 10:39:46 -07:00
Andrew Colin Kissa
f921a88a30 lint 2015-12-20 20:41:40 +02:00
Andrew Colin Kissa
a826720371 Add PostgreSQL Language management functionality 
Fixes #29874
 2015-12-20 09:37:41 +02:00
Andrew Colin Kissa
98593a94d5 fix various bugs in augeas modules 
Fixes #29842
 2015-12-18 23:01:44 +02:00
lburg
6d1ab2ece0 states.timezone: Fix 'desrired' typo 2015-12-18 13:54:04 +01:00
Mike Place
d19827fd3a Disable some boto tests per resolution of moto issue 
Pending resolution of https://github.com/spulec/moto/issues/493
 2015-12-15 14:59:14 -07:00
Mike Place
a2b1f41f49 Disable some boto tests per resolution of moto issue 
Pending resolution of https://github.com/spulec/moto/issues/493
 2015-12-15 14:57:52 -07:00
Alexandre Garnier
f3a2b27671 Fix deb_apache states methods tense 2015-12-13 13:58:27 +01:00
Mike Place
3514765d33 Merge pull request #29573 from kraney/boto_lambda 
An implementation of support for AWS Lambda
 2015-12-10 13:01:26 -07:00
Kris Raney
c024ca70b1 A few missed lint errors 2015-12-09 16:52:10 -06:00
Kris Raney
4e04c3fbbd Fix lint warnings, add log when using default region 2015-12-09 16:03:20 -06:00
Kris Raney
f33d7a761c Fix unit test to work with code that understands FunctionArn 2015-12-09 12:49:27 -06:00
Mike Place
78fa3111a7 Merge pull request #29571 from cachedout/lint_29493 
Lint #29493
 2015-12-09 09:28:17 -07:00
Mike Place
ab439e9173 Lint 2015-12-09 09:27:12 -07:00
Justin Findlay
45acd05065 state.file: add file.mkdir to unit test mock 2015-12-08 16:33:33 -07:00
Justin Findlay
aa393a4831 state.file: add pchanges to unit test mock 2015-12-08 16:33:07 -07:00
Kris Raney
591e2756cc Add tests for boto_lambda states. 2015-12-08 16:20:31 -06:00
Colton Myers
7918736656 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/dracr.py
    salt/states/boto_vpc.py
    tests/unit/states/file_test.py
 2015-12-08 14:46:23 -07:00
Colton Myers
e59364ad1d Fix failing unit test 2015-12-08 13:45:34 -07:00
Andreas Lutro
36e493cadf lint - tabs to spaces, oops 2015-12-08 20:24:45 +01:00
Colton Myers
9673fd0937 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/ec2.py
    tests/unit/states/file_test.py
 2015-12-08 12:23:26 -07:00
Mike Place
95523312a0 Merge pull request #29512 from dr4Ke/fix_remount_cifs_uid_name 
Fix forced remount if uid/gid is provided as a name
 2015-12-08 09:08:33 -07:00
Christophe Drevet-Droguet
7395a949e4 mount state module: uid/gid verification with names 
Should fix #25293
 2015-12-08 12:43:46 +01:00
Andreas Lutro
edf2a3098e remove "2" from state name 2015-12-07 21:54:16 +01:00
Andreas Lutro
00b6eb5907 add tests, clean up/fix logic 2015-12-07 21:52:22 +01:00
Christophe Drevet-Droguet
4a00cc5b70 cron: support for commented cron jobs 
This change is an implementation for managing commented cron jobs.

Before that, commented cron jobs were not manageable by salt. They were ignored
at reading, and thus lost while writing the new crontab.
This is described in issue #29082, which should be fixed now.

There is a new `commented` parameter, defaulting to False. The cron job is
set like any other, but is prefixed by `#DISABLED#`.
 2015-12-07 15:40:36 +01:00
Mike Place
5ec7947595 Merge pull request #29300 from ticosax/dockerng-volumes 
[dockerng] Add support for volume management in dockerng
 2015-12-02 10:48:53 -07:00
Nicolas Delaby
cb9cb463b0 Provide states for managing docker volumes 2015-12-02 17:27:20 +01:00
Mike Place
99b7d87688 Merge pull request #29218 from clan/service_state 
check service enable state in test mode
 2015-12-02 08:31:00 -07:00
Colton Myers
3f09d58fff Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/rh_ip.py
    salt/modules/s3.py
    salt/modules/saltutil.py
    salt/modules/zypper.py
    salt/spm/__init__.py
    salt/utils/aws.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
    tests/unit/pydsl_test.py
 2015-12-01 15:31:03 -07:00
Z. Liu
a1250a9729 check service enable state in test mode 2015-12-01 15:02:00 +08:00
Andreas Lutro
9193676f9c fix ssh_auth_test 
there were 4 side_effect return values, when it should only return 2
times - 2 of the 4 states.ssh_auth.absent calls are done with test=True
test=True and should therefore not call modules.ssh.rm_auth_key
 2015-11-30 20:13:52 +01:00
Stephen Woodrow
c695a57ba9 Fix tests. 2015-11-24 18:09:12 -08:00
Colton Myers
28b40de8da Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/__init__.py
    salt/client/ssh/ssh_py_shim.py
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/vmware.py
    salt/grains/philips_hue.py
    salt/modules/boto_ec2.py
    salt/modules/boto_route53.py
    salt/modules/dracr.py
    salt/modules/philips_hue.py
    salt/proxy/philips_hue.py
    salt/states/virtualenv_mod.py
 2015-11-24 16:07:31 -07:00
Nicolas Delaby
e98d18ba41 Expose docker networking as state 2015-11-24 13:55:22 +01:00
Mark McGuire
f0a60b33e2 Use changes in #28926 2015-11-17 10:54:19 -06:00
Mike Place
27b917b623 Adjust tests for new loader spec 2015-11-16 12:23:05 -07:00
Colton Myers
efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/vmware.py
    salt/grains/chronos.py
    salt/grains/marathon.py
    salt/loader.py
    salt/modules/chronos.py
    salt/modules/marathon.py
    salt/proxy/chronos.py
    salt/proxy/marathon.py
    salt/state.py
    salt/states/chronos_job.py
    salt/states/marathon_app.py
    salt/states/user.py
    salt/utils/schedule.py
 2015-11-13 15:18:45 -07:00
twangboy
c0cf33332c Fixed some Lint... 2015-11-11 14:27:06 -07:00
Justin Findlay
bc7e0cfe64 add file.symlink unit tests 2015-11-11 13:37:47 -07:00
Justin Findlay
9381dc7215 orthogonalize file.symlink unit tests 2015-11-11 13:37:18 -07:00
rallytime
e2b0fee57e Don't change perms list, only existing perms should be a dictionary. 
Refs #28269
 2015-11-11 12:31:51 -07:00
rallytime
7601647d69 Revert "rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list." 
This reverts commit 07482211eb.
 2015-11-11 12:23:17 -07:00
rallytime
07482211eb rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list. 
Refs #28269
 2015-11-11 09:45:35 -07:00
Justin Findlay
8524281f4e update kmod exec and state module unit tests 2015-11-07 16:04:23 -07:00
Mike Place
81396927f8 Merge pull request #28605 from zigarn/a2xxconf 
Improvements on Debian-style apache utilities a2(en|dis)(mode|site|conf)
 2015-11-05 15:18:28 -07:00
Alexandre Garnier
f505b51ab1 Add module and state wrappers on a2enconf/a2disconf 2015-11-05 19:07:14 +01:00
Alexandre Garnier
2e6cf66d80 Add apache_site state (like apache_module) 
Allow to enable/disable Debian-style sites with `a2ensite`/`a2dissite`.
 2015-11-05 17:52:42 +01:00
Mike Place
5293150d25 Fix tests 2015-11-05 08:29:55 -07:00
Jiri Kotlin
eb19140cc5 INI test compliancy - modified ini_manage_test.py 2015-11-05 13:49:05 +00:00
Colton Myers
32969b2408 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    salt/cloud/clouds/digital_ocean.py
    salt/cloud/clouds/linode.py
    salt/loader.py
    salt/modules/blockdev.py
    salt/modules/boto_route53.py
    salt/modules/boto_vpc.py
    salt/modules/bsd_shadow.py
    salt/modules/file.py
    salt/modules/rabbitmq.py
    salt/modules/schedule.py
    salt/modules/win_network.py
    salt/runners/state.py
    salt/spm/__init__.py
    tests/unit/modules/blockdev_test.py
 2015-11-02 18:19:01 -07:00
twangboy
7d39091c91 Fixed some more lint 2015-11-02 16:51:16 -07:00
twangboy
3dbd62af2c Fixed some tests... hopefully 2015-11-02 16:13:07 -07:00
Christophe Drevet-Droguet
eee2318873 grains state: allow deleting grain with 'False' value 
and destroy a grain previously set to None, with destructive=True:

The f46722aaeb commit, from Bruno Binet <bruno.binet@gmail.com> was
effectively reverted during my work on nested and complex values support.

This commit get it back, plus the ability to destroy a existing grain that
was previously set to None, plus tests for these.
 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
576252da05 grains state: list_present, list_absent support nested grain 
... and custom delimiter
 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
62a1f37d86 grains state: nested support for grains.append 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
c19cff517a grains state: more tests 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
cc844e4a2c grains state tests: test the grain file content as well 
It may be overkill, but I'm nervous about this change and
I don't want to mess with the grain file of a lot of people
 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
1c5cd4c82d grains state: changes comment more accurate 2015-11-02 09:31:44 -05:00
Christophe Drevet-Droguet
6b8c245b87 grains state: new tests for nested grains 2015-11-02 09:31:43 -05:00
Andreas Lutro
a772ce330a fix tests 2015-11-02 10:50:51 +01:00
Justin Findlay
9ec72ca724 fix file state unit tests for win symlink feature 2015-10-29 13:50:38 -06:00
Daniel Hobley
124c758587 Lint fixes 2015-10-29 15:53:31 +01:00
Daniel Hobley
8af9246c4c Hostname is the same even if the characters are in different cases 
- Windows likes to give you back a hostname in uppercase while you might want to specify it in lower case, this commit allows you to do that
 2015-10-29 13:36:18 +01:00
Daniel Hobley
72db9026e1 Lint fixes 2015-10-29 12:02:14 +01:00
Daniel Hobley
a78aab3255 Added the ability to change the "hostname" on windows minions 2015-10-29 11:39:22 +01:00
Erik Johnson
a44c8d8dab Merge pull request #28270 from rallytime/refactor_rabbitmq_plugin_state 
Refactor RabbitMQ Plugin State to correctly use test=true and format errors
 2015-10-27 11:18:34 -06:00
Erik Johnson
4efd07eba5 Merge pull request #28269 from rallytime/refactor_rabbitmq_user_state 
Refactor rabbitmq_user state to use test=True correctly
 2015-10-27 11:17:42 -06:00
rallytime
9e40c3a6a6 Fine tuning and fix tests 2015-10-27 10:30:00 -04:00
rallytime
aebbcb88ea Pylint fix 2015-10-26 14:10:34 -04:00
rallytime
19b8b868a3 Clean-up/fixes to rabbitmq_user state and test adjustments 2015-10-26 13:48:50 -04:00
Justin Findlay
0dc72135de update blockdev exec and state module unit tests 2015-10-23 18:12:43 -06:00
justinta89
835a11b6be Fixed win_firewall_test 2015-10-23 09:53:03 -06:00
justinta89
a74dbad74a Started fixing win_firewall_test 2015-10-22 13:12:31 -06:00
twangboy
69c32a663e Fixed some lint 2015-10-22 11:24:38 -06:00
twangboy
638dec5027 Fixed some tests... let's see if they're really are 2015-10-22 11:05:22 -06:00
Ronald van Zantvoort
46bf6d4fa3 Update file.serialize test for Python serialized 
pprint.pformat seems non-reversible, so just add the newline there as well
 2015-10-21 17:12:53 +02:00
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
 2015-10-20 18:13:11 -06:00
Colton Myers
153087a7b4 Merge pull request #26945 from dr4Ke/feature_state_grains_support_nested_and_dict 
Feature state grains support nested and dict
 2015-10-15 14:25:44 -06:00
Nicolas Delaby
a1d0ba392f fixup! Do not pass any argument to docker.start 2015-10-13 20:53:11 +02:00
Nicolas Delaby
65c8762e1f Do not pass any argument to docker.start 
docker.create is responsible to manage all of them, since docker API 1.16
 2015-10-13 19:39:32 +02:00
Richard Hansen
9aa19575fa new ldap state module 2015-10-09 17:47:56 -04:00
Colton Myers
69d960f8e6 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    doc/topics/ssh/index.rst
    salt/modules/boto_secgroup.py
    salt/modules/dockerng.py
    salt/states/archive.py
    salt/states/boto_elb.py
    salt/states/boto_secgroup.py
    tests/unit/modules/schedule_test.py
 2015-10-07 13:11:48 -06:00
Nicolas Delaby
edf625c8b4 Add support of labels parameter for dockerng 2015-10-06 13:18:05 +02:00
Stephen Woodrow
509ded1bd0 Fix some tests. 2015-10-05 20:57:17 -07:00
Nicole Thomas
e103f53b4f Merge pull request #27485 from lyft/boto-asg-scheduled-actions 
Add scheduled actions (like scaleup/scaledown actions) to boto_asg
 2015-10-01 09:18:19 -06:00
Ryan Lane
714a93900b Patch config.option 2015-09-30 10:04:10 -07:00
Colton Myers
41cad702e3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/rest_service.py
    salt/states/dockerng.py
    salt/utils/cloud.py
 2015-09-29 18:13:33 -06:00
Nicole Thomas
e974a3c8aa Merge pull request #27510 from rallytime/ryan-lane-test-fix 
Merge #27475 with test fixes
 2015-09-29 12:34:32 -06:00
rallytime
cae2c4e715 Syntax fix 2015-09-29 10:02:16 -06:00
rallytime
458547ba03 Fix test failures for boto __state__ changes 2015-09-29 09:55:44 -06:00
Nicolas Delaby
fadd9bd43e Add test to check we don't call inspect_image on absent images. 2015-09-29 15:53:29 +02:00
Colton Myers
9864d9e0fa Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/index.rst
    doc/topics/releases/boron.rst
    salt/cli/daemons.py
    salt/cli/salt.py
    salt/modules/jboss7.py
    salt/states/file.py
 2015-09-18 11:03:37 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
Christophe Drevet-Droguet
8553c44cea grains state: allow deleting grain with 'False' value 
and destroy a grain previously set to None, with destructive=True:

The f46722aaeb commit, from Bruno Binet <bruno.binet@gmail.com> was
effectively reverted during my work on nested and complex values support.

This commit get it back, plus the ability to destroy a existing grain that
was previously set to None, plus tests for these.
 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
484853412b grains state: list_present, list_absent support nested grain 
... and custom delimiter
 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
a02f125faa grains state: nested support for grains.append 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
394586f759 grains state: more tests 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
098af32354 grains state tests: test the grain file content as well 
It may be overkill, but I'm nervous about this change and
I don't want to mess with the grain file of a lot of people
 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
250bc8d308 grains state: changes comment more accurate 2015-09-15 17:49:49 +02:00
Christophe Drevet-Droguet
b0c9d23cef grains state: new tests for nested grains 2015-09-15 17:49:49 +02:00
Justin Findlay
3334b9d548 fix comment and unit test for reg state 2015-09-14 16:04:09 -06:00
Brad Thurber
5d4798012a more test updates 2015-09-14 13:05:07 -04:00
Brad Thurber
872aabf7fa update more tests 2015-09-14 11:55:42 -04:00
Brad Thurber
b1ceb221a0 more test updates. It wouldn't surprise me if these changes expose other failing tests. 2015-09-14 10:36:40 -04:00
Brad Thurber
72235f61ce clean up lint and add profile to tests 2015-09-14 09:03:30 -04:00
Justin Findlay
391a09d5ac update reg state unit tests 2015-09-10 16:16:15 -06:00
Mike Place
3c4523237f Merge pull request #26810 from Unity-Technologies/feature/global-environ-win 
Added the ability to set permanent environment variables on windows
 2015-09-01 11:42:06 -06:00
Daniel Hobley
1c8e6e067f Fixed lint issues 2015-09-01 13:56:43 +02:00
Daniel Hobley
fc724158de Added the ability to set permanent environment variables on windows 2015-08-31 13:47:29 +02:00
Colton Myers
1bbe45538e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/__init__.py
    salt/modules/smartos_vmadm.py
    salt/utils/s3.py
    setup.py
 2015-08-28 16:44:08 -06:00
Colton Myers
964a47c643 Fix tests 2015-08-28 13:50:31 -06:00
Colton Myers
9e88672e5a Merge pull request #26683 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-27 15:28:14 -06:00
Colton Myers
5628702dd2 lint 2015-08-27 14:41:31 -06:00
Mike Place
cfc61c6629 Merge pull request #26688 from richardhansen/states.host.only 
new salt.states.host.only() function to limit names associated with an IP
 2015-08-27 14:23:00 -06:00
Colton Myers
4f441179aa Test fixes 2015-08-27 14:11:34 -06:00
Colton Myers
e9674b541f Another file_test fix 2015-08-27 14:08:14 -06:00
Erik Johnson
96c559d63e tests/unit/states/eselect_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
2d51f3d25b tests/unit/states/dockerng_test.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Colton Myers
ca3f40b94e More test fixing 2015-08-26 19:32:31 -06:00
Richard Hansen
7457f2302d salt.states.host.only: new function to limit to specific hostnames 2015-08-26 20:21:45 -04:00
Colton Myers
a9cdb633a4 Fix failing test 2015-08-26 16:08:50 -06:00
Colton Myers
76c70162db Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    doc/topics/spm/index.rst
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/opennebula.py
    salt/cloud/clouds/openstack.py
    tests/unit/states/file_test.py
 2015-08-26 14:47:33 -06:00
Colton Myers
ed940ad5f5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/openstack.py
    tests/unit/modules/artifactory_test.py
    tests/unit/modules/groupadd_test.py
    tests/unit/modules/jboss7_test.py
    tests/unit/states/jboss7_test.py
 2015-08-25 13:55:44 -06:00
Justin Findlay
60087d0861 update unit tests for ini state 2015-08-24 12:08:10 -06:00
Erik Johnson
49d8bd1dbe Remove unused import 2015-08-21 22:54:54 -05:00
Erik Johnson
81a0d4c915 Skip tests that don't work with older mock 
This fixes test failures on RHEL6 builds.

This also removes two win_network tests which were clearly made to pass
only in Jenkins, and not in a chrooted build environment.
 2015-08-21 21:35:11 -05:00
Ageeleshwar Kandavelu
73bfbab452 Merge from upstream 
Merge branch 'develop' of github.com:saltstack/salt into develop
 2015-08-21 08:59:43 +05:30
Ageeleshwar Kandavelu
b2ec235199 ini cosmetics fix 2015-08-20 20:05:36 +05:30
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
 2015-08-19 11:29:45 -06:00
Colton Myers
f6481a1fb3 Merge pull request #26410 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-18 11:52:13 -06:00
Erik Johnson
cc8a5b181e Remove unit tests for git states 
These need to be completely rewritten
 2015-08-17 22:10:39 -05:00
Colton Myers
d3d0e004d9 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/keystone.py
    salt/modules/pw_user.py
    salt/states/reg.py
    setup.py
 2015-08-17 16:54:16 -06:00
rallytime
211f6feaf5 Fix test failures - get_attributes shouldn't be called if none are provided 2015-08-17 10:58:44 -06:00
Justin Findlay
ee59d154d7 Merge pull request #26293 from jfindlay/reggie 
Fix #26268
 2015-08-13 13:48:06 -06:00
Justin Findlay
3348b726c9 fix state/reg unit tests 2015-08-13 12:13:02 -06:00
Mike Place
65ab5aa495 Merge pull request #26263 from rallytime/fix-24882 
Don't make changes when test=True for openstack present/absent funcs
 2015-08-13 10:30:31 -06:00
twangboy
a1274c438d I might have fixed some tests... I might have made them worse 2015-08-12 17:13:50 -06:00
rallytime
86b8161d22 Mock test key in __opts__ dict 2015-08-12 14:29:33 -06:00
Andreas Lutro
1f02e1671b cron: fix a typo in the tests 2015-08-12 10:08:43 +02:00
Andreas Lutro
9b18cd9050 cron: more descriptive tests, updated to reflect new behavior 2015-08-12 10:06:53 +02:00
Colton Myers
1b0b21394e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/win_system.py
 2015-08-10 13:27:31 -06:00
Erik Johnson
56798d724c Fix comment in return value 2015-08-09 22:07:02 -05:00
Erik Johnson
18ebdd382a Update winrepo tests with new param names 2015-08-09 21:19:45 -05:00
Thomas S Hatch
2ddf5c4e58 lint 2015-08-08 20:17:45 -06:00
Thomas S Hatch
912d6041f5 apply @cachedout's tests 2015-08-08 09:37:16 -06:00
Thomas S Hatch
0e705d2185 add pchanges docs 2015-08-08 09:32:29 -06:00
Colton Myers
d332d54eec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-08-05 15:32:11 -06:00
Mike Place
85f5e2a443 Fix failing tests 2015-08-04 09:48:43 -06:00
Colton Myers
d5fbd960fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/fileserver/s3fs.py
    salt/modules/chocolatey.py
    salt/modules/s3.py
    salt/modules/zpool.py
    salt/pillar/s3.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
 2015-08-03 15:01:35 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Mike Place
ada3a29e55 Fix broken test for file.copy 2015-07-28 09:57:49 -06:00
Thomas S Hatch
1fae76d53c Merge pull request #25685 from twangboy/fix_25594 
Fixed regex issues with comment and uncomment
 2015-07-28 09:29:49 -06:00
twangboy
a904e8329b Fixed another test failure... 2015-07-27 15:05:23 -06:00
Pedro Algarvio
1010eef5ff Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-27 18:20:50 +01:00
twangboy
aa077d3a86 Fixed more tests... justin findlay helped me... 2015-07-27 11:18:25 -06:00
Justin Findlay
3b0cc6592a fix reg unit tests 2015-07-27 10:57:05 -06:00
twangboy
87c8f8dfb5 Fixed some tests... maybe... 2015-07-24 15:07:45 -06:00
twangboy
b473fb7827 Fixed some tests... maybe... 2015-07-24 09:40:46 -06:00
Arthur Lutz
555d7b867f pylint fixes 2015-07-23 09:02:44 +02:00