Commit Graph

1164 Commits

Author SHA1 Message Date
Andreas Lutro
8abf303183 Add support for kapacitor 0.13 (#33352)
* add support for kapacitor 0.13

* update kapacitor tests
2016-05-19 11:03:03 -07:00
Justin Anderson
012dc882aa Fix boto_vpc_test to work with #32677 (#33214) 2016-05-13 08:22:10 -06:00
rallytime
f2dec459d8 Take the develop version of glusterfs.py state 2016-05-09 11:17:46 -06:00
Andrew Hammond
dd20299087 Refactor ipset tests (#32973)
* remove spurious return

* refactor state.ipset tests

* ipset comments: consistency and correct english

* trim out broken code
2016-05-05 07:31:49 -07:00
Kevin Quinn
581f9d328a Fix 'present' option when used without 'key_type' (#32965) 2016-05-05 07:27:30 -07:00
Justin Anderson
1066063a19 File and User test fixes for 2015.8 on Fedora23 (#33056)
* Fix failing user present test

* Fix file_test.test_symlink failure on 2015.8
2016-05-05 07:05:10 -07:00
Tanoti
a2b5595fad For #31309. If value not supplied only check for existence 2016-05-03 14:22:57 +00:00
Nicolas Delaby
87b70186c3 When move a function to a new namespace, allow to keep original context. (#32943) 2016-04-29 10:48:20 -07:00
rallytime
cbf42a8407 Merge branch '2016.3' into 'develop'
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/batch.py
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/beacons.py
  - salt/states/archive.py
  - salt/states/cmd.py
  - salt/utils/gitfs.py
  - tests/unit/states/cmd_test.py
2016-04-26 14:42:26 -06:00
rallytime
80fcdfb9d8 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/topics/targeting/grains.rst
  - salt/cli/daemons.py
  - salt/exceptions.py
  - salt/minion.py
  - salt/modules/schedule.py
  - salt/scripts.py
  - salt/states/archive.py
2016-04-26 12:07:42 -06:00
rallytime
1fc9de1d04 Add 'file.source_list' mock to archive state unit tests 2016-04-26 10:39:43 -06:00
rallytime
9064d3bbfb Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/states/archive.py
2016-04-25 15:45:17 -06:00
Andrew Hammond
06b7b4fe52 file.retention_schedule state (#32800) 2016-04-25 15:21:13 -06:00
Alejandro Bednarik
af64c95593 Append failed cmd in comments. (#32651)
When onlyif fail, append the message to comment so we know which command
is failing. Only in a list context.

Fixes #32575.
2016-04-22 12:54:58 -06:00
Kai Howelmeyer
20c2cf176b Add max_depth parameter to file.directory, fixes #31989 (#32463) 2016-04-22 10:11:58 -06:00
Erik Johnson
67d0c81184 Support remote sources in a source list (#32691)
* Support remote sources in a source list

This commit modifies the source_list check so that remote sources
(http(s), ftp, etc.) are not fetched more than once. To do so, it
adds the use of ``__context__`` in ``cp.cache_file`` and
``file.source_list`` to prevent multiple fetches of a single file in the
same salt run.

* Update tests

Added __context__ to test cases to reflect usage of __context__, and
also added file.source_list to mocked funcs for archive.extracted unit
test.
2016-04-21 08:37:38 -06:00
Nicole Thomas
9942ea9319 [develop] Merge forward from 2016.3 to develop (#32636)
* Ensure rh_service not used on CloudLinux 7

Add CloudLinux to RHEL-derived distros excluded from rh_service use in osrelease >= 7

* Fix binary search and replace (#32542)

* Don't return None from eval_master (#32555)

Raise an exception instead. Because eval master if returns should return
a tuple.

* redact passwords and hashes from user.present updates

Fixes #32381

* Better log message on minion restart if master couldn't be reached. (#32576)

* Revert PR #32480 and apply #32314 with fixes / documentation (#32558)

* Revert "Fix loop in maint.flo"

This reverts commit 5196cd6a6e5db3c7b1a47b1740881bbd3e87ea3d.

* Revert "Clear VCS fsbackend and git_pillar locks on master start"

This reverts commit 7e3caa9bae1ac4de62db9924374e35a8b826937e.

* Revert "Add functions to remove VCS fsbackend update locks and git_pillar update/checkout locks"

This reverts commit 4c2db32419022501eae2a695ec488693e043d189.

* prevent eternal gitfs lock due to process crash

* Use salt.utils.fopen() instead of open()

* Make pid locking work for more than just gitfs

Also, make logging more descriptive, to aid in troubleshooting.

* Add git_pillar_global_lock config option default value

* Document proper usage of {gitfs,git_pillar}_global_lock

* Fix comments value in salt.states.pkgrepo example (#32604)

'comments' option adds '#' automatically. Example contains `#http://mirror.centos.org/centos/$releasever/os/$basearch/` string which becomes prefixed with '##' in generated file.

* alphabetize directories for dynamic modules (#32599)

Also add engines and proxy minions to the list.

* Expand on the open-source vs open-core FAQ

* Language clarification.

* Fix some mistakes in the salt-ssh thin shell script (#32583)

* [[ is bash, not compatible with /bin/sh

* check if python command exists before calling it

* Deprecate 'user' and 'group' in state cmd (#32613)

* Remove unused 'group' argument

* Fix unit testing of cmd.mod_run_check without group arg

* Deprecate 'user/group' in cmd.run

* Deprecate 'user'/'group' in cmd.script

* Deprecate 'user' in cmd.wait

* Deprecate 'user'/'group' in cmd.wait_script

* Fix mod_run_check without 'group'

* Push deprecation back one release

* Fix mac_service and mac_system modules (#32587)

* Fix mac_service module

* Add integration tests for new functions

* Start will not enable the service beforehand

* Remove unused variables
2016-04-18 08:40:20 -06:00
ksvasan
c90bcfe1db Enable blocking on min_party until minimum set of nodes are available (#32592)
* Enable blocking on min_party until minimum set of nodes are available

* Fix the comment in min_party for salt-pr-lint-n

* Add test cases to the min_party method

* Fix the lint issues causing build failure

* Change the comment for test_min_party

* CR comments for modules/zk_concurrency.py

* Adding more examples for blocking/min_nodes

* Change the comment formatting

* Removing space at end of line

* Comments changes to rebuild
2016-04-15 13:35:29 -06:00
Ronald van Zantvoort
c25dffe7a9 Deprecate 'user' and 'group' in state cmd (#32613)
* Remove unused 'group' argument

* Fix unit testing of cmd.mod_run_check without group arg

* Deprecate 'user/group' in cmd.run

* Deprecate 'user'/'group' in cmd.script

* Deprecate 'user' in cmd.wait

* Deprecate 'user'/'group' in cmd.wait_script

* Fix mod_run_check without 'group'

* Push deprecation back one release
2016-04-15 13:30:56 -06:00
rallytime
efe3ec82da Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/glusterfs.py
  - salt/modules/service.py
  - tests/unit/modules/glusterfs_test.py
2016-04-13 16:10:33 -06:00
rallytime
b77993d9a1 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/targeting/grains.rst
  - salt/crypt.py
  - salt/scripts.py
  - salt/states/dockerng.py
  - salt/states/pkg.py
2016-04-13 09:42:54 -06:00
Nicolas Delaby
958b2ec749 Fix support of dockerng.volume_present when no volume is on present.
fixes #32493
2016-04-13 15:47:13 +02:00
Nicole Thomas
216d9fdc9a [develop] Merge forward from 2016.3 to develop (#32494)
* fix sorting by latest version when called with an attribute

* remove reference to master_alive_check

* Fixes saltstack/salt#28262

* Resolve memory leak in authentication

* outputter virt_list does not exist anymore

* Update proxmox documentation

* Fix documentation on boto_asg and boto_elb modules and states

* modules.win_timezone: don't list all zones in debug log

* Correcty index glusterfs bricks

Fixes issue #32311

* Cleaner deprecation process with decorators

* Add deprecation decorator scaffold

* Capture type error and unhandled exceptions while function calls

* Aware of the current and future version of deprecation

* Implement initially is_deprecated decorator

* Add an alias for the capitalization

* Fix capitalization easier way

* Remove an extra line

* Add successor name to the deprecation decorator.

* Granulate logging and error messages.

* Implement function swapper

* Raise later the caught exception

* Clarify exception message

* Save function original name

* Remove an extra line

* Hide an alternative hidden function name in the error message, preserving the error itself

* Rename variable as private

* Add a method to detect if a function is using its previous version

* Message to the log and/or raise an exception accordingly to the status of used function

* Log an error along with the exception

* Add internal method documentation

* Add documentation and usage process for decorator "is_deprecated"

* Add documentation and process usage for the decorator "with_deprecated"

* Hide private method name

* Fix PEP8, re-word the error message

* Deprecate basic uptime function

* Add initial decorator unit test

* Rename old/new functions, mock versions

* Move frequent data to the test setup

* Add logging on EOL exception

* Rename and document high to low version test on is_deprecated

* Implement a test on low to high version of is_deprecated decorator

* Add a correction to the test description

* Remove a dead code

* Implement a test for high to low version on is_deprecated, using with_successor param

* Correct typso adn mistaeks

* Implement high to low version with successor param on is_deprecated

* Setup a virtual name for the module

* Implement test for with_deprecated should raise an exception if same deprecated function not found

* Implement test for with_deprecated an old function is picked up if configured

* Correct test description purpose

* Implement test with_deprecated when no deprecation is requested

* Add logging test to the configured deprecation request

* Add logging testing when deprecated version wasn't requested

* Implement test EOL for with_deprecated decorator

* Correct test explanation

* Rename the test

* Implement with_deprecated no EOL, deprecated other function name

* Implement with_deprecated, deprecated other function name, EOL reached

* Add test description for the with_deprecated + with_name + EOL

* Fix confusing test names

* Add logging test to the is_deprecated decorator when function as not found.

* Add more test point to each test, remove empty lines

* Bugfix: at certain conditions a wrong alias name is reported to the log

* Fix a typo in a comment

* Add test for the logging

* Disable a pylint: None will _never_ be raised

* Fix test for the deprecated "status.uptime" version

* Bugfix: Do not yank raised exceptions

* Remove unnecessary decorator

* Add test for the new uptime

* Add test for the new uptime fails when /proc/uptime does not exists

* Rename old test case

* Skip test for the UTC time, unless freeze time is used.

* Fix pylint

* Fix documentation

* Bugfix: proxy-pass the docstring of the decorated function

* Lint fix

* Fixes saltstack/salt#28262 for 2015.5 branch

* Update master config docs

* Improve git_pillar documentation/logging

* Add note about different behavior of top file in git_pillar

* Make log entry for a missing pillar SLS file more accurate for git_pillar

* FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg#1409 for more info.

* FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg#1409 for more info.

* Update glusterfs_test to be inline with #32312

* Fix salt-cloud paralell provisioning

Closes #31632

* Ignore Raspbian in service.py __virtual__ (#32421)

* Ignore Raspbian in service.py __virtual__

This prevents more than one execution module from trying to load as the
service virtual module.

Refs: #32413

* pack __salt__ before loading provider overrides

We can (and should) pack here since we're just packing a reference to the
object. __salt__ needs to be available when we're loading our provider
overrides

* Fix broken __salt__ dict in provider override

Using ret.items() here sets ``__salt__`` to its items (tuple containing
function name and reference), breaking usage of ``__salt__`` inside
overridden functions.

* Merge #32293 with test fixes (#32418)

* Fix issue #11497

* Remove check for working directory presence in tests

* Fix Domainname introspection

Default value needs to be extracted from the container itself,
because dockerd set Domainname value when network_mode=host.

* Add pgjsonb_queue to queue doc index

* Pylint fixes

* Pass parser options into batch mode

Resolves #31738

* Changed the target file in file.symlink test (#32443)

* Argument name in docs should match actual arg name (#32445)

Fixes #31851

* tests.integration: bypass MacOS TMPDIR, gettempdir (#32447)

Updates 0edd532, 8f558a5.

When logging in as root over `ssh root@host`, `$TMPDIR` and
`tempfile.gettempdir()` are both set to a variation of:
```
/private/var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/
```
When logging in as root over `sudo -i`, `$TMPDIR` is unset and
`tempfile.gettempdir()` is set to `/tmp`.

My guess is that the second case is an unintended or uncorrected omision
by Apple as they have introduced the longer, randomized temp path in a
recent version of MacOS.

* Issue #28706: Fix state user.present behavior. (#32448)

- As mentionned in issue #28706, state user.present no longer remove
      user from groups if the keyword 'groups' with empty value '[]' is not
      explicitly set, salt will assume current groups are still wanted.

* tests.integration: fix 4230c8a

* Move the tables of virtual modules to individual documentation pages

* Add new doc pages to toctree

* Add external ref to windows package manager docs

* Improve docstrings

* Add documentation on virtual module provider overrides to the module docs

* Clarify the scope of the provider param in states.

* Add link to provider override docs to all package providers

* Add link to provider override docs to all service providers

* Add link to provider override docs to all user providers

* dd link to provider override docs to all shadow providers

* Add link to provider override docs to all group providers

* Backport 31164 and 31364 (#32474)

* Don't send REQ while another one is waiting for response.

The message has to be removed from the queue the only *after* it's
already processed to don't confuse send() functionality that expects
empty queue means: there's no active sendings.

* Fixed zeromq ReqMessageClient destroy

* Add link to provider override docs to opkg.py

This is a companion to https://github.com/saltstack/salt/pull/32458, but
this module was not added until the 2016.3 branch, so the documentation
is being updated there for this module.

* Add documentation for some master/minion configs (#32454)

Refs #32400

Adds docs for:

- cli_summary
- event_return_queue
- event_return_whitelist
- event_return_blacklist
- file_recv_max_size
- fileserver_followsymlinks
- fileserver_ignoresymlinks
- fileserver_limit_traversal

* Automatically detect correct MySQL password column for 5.7 and fix setting passwords (#32440)

* Automatically detect MySQL password column

* Fix changing password in MySQL 5.7

* Fix lint test

* Fix unit tests (?)

They will still fail if "authentication_string" is legitimately the right column name, but I don't know what to do about that.

* Additional unit test fix

* Only unsub if we have a jid

Closes #32479
2016-04-11 17:07:15 -06:00
rallytime
4f03f2311f Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/salt.py
  - salt/modules/win_pkg.py
  - salt/transport/tcp.py
2016-04-11 14:33:21 -06:00
Justin Anderson
116c91e293 Changed the target file in file.symlink test (#32443) 2016-04-08 16:00:15 -06:00
rallytime
7f8eb751a0 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/cli/daemons.py
  - salt/modules/win_servermanager.py
  - tests/unit/modules/win_servermanager_test.py
2016-04-08 10:09:03 -06:00
rallytime
9531ea6ef5 Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/topics/highavailability/index.rst
  - salt/loader.py
  - salt/modules/service.py
  - salt/states/cmd.py
  - tests/unit/states/cmd_test.py
2016-04-07 16:10:32 -06:00
Nicole Thomas
0809126d8e Merge #32293 with test fixes (#32418)
* Fix issue #11497

* Remove check for working directory presence in tests
2016-04-07 14:55:25 -06:00
Justin Anderson
28ea60f28e Fixes test failure where Fedora 23 has /etc/grub.conf by default 2016-04-07 11:40:12 -06:00
rallytime
760f479424 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/scripts.py
  - salt/state.py
  - tests/unit/config/config_test.py
2016-04-05 15:09:27 -06:00
rallytime
eb6773823b Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/rh_service.py
2016-04-01 10:33:44 -06:00
twangboy
5ca4ad6675 Fix unit tests for state 2016-03-30 17:12:12 -06:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
2016-03-30 15:33:13 -06:00
Nicolas Delaby
c989ae5a7e Merge user defined labels with one carried by the image 2016-03-29 11:50:08 +02:00
rallytime
d684d49490 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/releases/2015.8.8.rst
2016-03-28 11:16:22 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
2016-03-25 11:47:16 -06:00
rallytime
6886681410 Fix test failures 2016-03-24 16:45:03 -06:00
rallytime
a333210a08 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/conf.py
  - salt/modules/rabbitmq.py
  - salt/states/rabbitmq_user.py
  - tests/unit/states/rabbitmq_user_test.py
2016-03-23 16:10:31 -06:00
Brian Stevenson
1500aae027 set deleted value to list 2016-03-23 13:47:12 -07:00
Brian Stevenson
1dc8f5f289 unit test update
grain value looks for list in assertion
2016-03-23 10:50:32 -07:00
rallytime
fa09de7a58 Merge branch '2015.8' into '2016.3'
Conflicts:
  - tests/unit/states/rabbitmq_user_test.py
2016-03-23 10:56:25 -06:00
Nicole Thomas
37c410fee4 Merge pull request #32079 from rallytime/merge-32041
Merge #32041 with test removal
2016-03-23 09:42:35 -06:00
rallytime
b13fdc1831 Remove useless tests 2016-03-23 08:49:52 -06:00
Stefan Schweer
1ee6e7b04f replaced ',' for whitespace as split seperator for rabbitmq tags
- fixed unit tests
   * fixed test for states.rabbitmq_user.present
2016-03-23 11:55:27 +01:00
Kris Raney
3c6d0e8fc1 Make sure there are no connection object cache hits on boto_* unit tests. 2016-03-22 14:49:18 -06:00
Nicole Thomas
9216e303e1 Merge pull request #31961 from kraney/kraney_bugfix
Make sure there are no connection object cache hits on boto_* unit te…
2016-03-22 14:38:46 -06:00
Colton Myers
95c08f55e9 Tear out useless unit test 2016-03-22 13:46:06 -06:00
Stefan Schweer
d317f7134f replaced ',' for whitespace as split seperator for rabbitmq tags
- fixed unit tests
   * fixed test for states.rabbitmq_user.present
2016-03-22 18:01:57 +01:00
Andreas Lutro
46018e4535 update kapacitor tests 2016-03-22 15:10:46 +01:00
Kris Raney
b4889024c5 Merge branch 'develop' into kraney_bugfix 2016-03-22 09:05:58 -05:00
Nicolas Delaby
e511864a55 Fix ports exposition when protocol is passed.
fixes #32013
2016-03-21 10:44:22 +01:00
rallytime
308aa5fd61 Merge branch '2016.3' into 'develop'
Conflicts:
  - conf/master
  - conf/minion
  - doc/ref/proxy/all/index.rst
  - salt/cli/daemons.py
  - salt/modules/key.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py
  - tests/unit/daemons_test.py
2016-03-18 10:57:15 -06:00
Kris Raney
890648aca0 Make sure there are no connection object cache hits on boto_* unit tests. 2016-03-17 15:07:43 -05:00
Mike Place
c28fc6e1d8 Merge pull request #31893 from Unity-Technologies/hotfix/windows-proxy-enable
Hotfix/windows proxy enable
2016-03-15 12:58:33 -06:00
Daniel Hobley
415cc8efab Make sure we enable the proxy settings on windows 2016-03-15 12:02:12 +01:00
Daniel Hobley
55f7ab1fba Fixed a bug where a cert was not correctly updated
If the certificate supplied had a different hash than the previous but the name was the same the change was ignored, this commit fixes that.
2016-03-11 11:52:15 -06:00
Nicole Thomas
cce0af9a2e Merge pull request #31792 from kraney/boto_elasticsearch
Add boto_elasticsearch_domain module
2016-03-11 08:57:27 -07:00
Kris Raney
b0f0601bfc More pylint fun 2016-03-10 21:02:06 -06:00
Kris Raney
15675c78c8 Add boto3 requirement to boto_vpc unit tests 2016-03-10 17:03:10 -06:00
Kris Raney
4161a7e789 Merge branch 'develop' into boto_vpc 2016-03-10 17:02:08 -06:00
Justin Findlay
08493d85fd states.file unit tests: mark tests destructive for touching file 2016-03-10 10:57:20 -07:00
Justin Findlay
7a8061cc1e states.file unit tests: use existing file for unmocked tests 2016-03-10 10:57:20 -07:00
Kris Raney
bae454625f Add boto_elasticsearch_domain module 2016-03-10 09:55:56 -06:00
Daniel Hobley
14ddae0aa8 Fixed installing keychain certificates from salt fileserver 2016-03-09 18:16:47 -06:00
Andreas Lutro
170742f861 update tests with new changes structure 2016-03-09 19:16:40 +01:00
Andreas Lutro
1f90583ee8 tweak behaviour and add tests for kapacitor 2016-03-09 08:15:58 +01:00
Kris Raney
4809e09f52 Fix pylint errors 2016-03-08 11:54:03 -06:00
rallytime
838dc12b77 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/exceptions.py
  - salt/pillar/foreman.py
  - salt/returners/local_cache.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py

The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
2016-03-08 10:14:32 -07:00
Mike Place
24568b1a5d Merge pull request #31711 from ticosax/fix-port-and-volume-discovery
[dockerng] Port and Volume comparison should consider Dockerfile
2016-03-07 11:25:19 -07:00
Kris Raney
3487f55e83 Add NAT Gateway support to boto_vpc 2016-03-07 09:41:03 -06:00
Nicolas Delaby
3837cf44ca Fix network_present by dealing with containers ID's instead of names.
Because docker inspect network returns attached containers by their Ids.
2016-03-07 10:30:58 +01:00
Nicolas Delaby
cf38691597 Port and Volume comparison should consider Dockerfile
`EXPOSE` and `VOLUME` declaration of a Dockerfile are exactly like
user declaration those parameters in their sls for dockerng.running

Considering Dockerfile containing this line:

```
EXPOSE 80
```

Those 2 sls are now considered strictly equivalent.

```yaml
container:
    dockerng.running:
      image: alpine
      ports:
        - 80/tcp
```

```yaml
container:
    dockerng.running:
      image: alpine
```
2016-03-07 10:11:52 +01:00
Mike Place
78c89d22f5 Merge pull request #31637 from kraney/boto_cognitoidentity
pool_absent when the given pool name does not exist should return Tru…
2016-03-03 09:45:34 -07:00
Christophe Drevet-Droguet
fc9dd356e8 test case: test_list_present_nested_already 2016-03-03 15:17:43 +01:00
Winston Liu
a39d0d4312 pool_absent when the given pool name does not exist should return True instead of False. 2016-03-02 13:30:40 -08:00
rallytime
40cd0ac8fe Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/states/file.py
  - tests/runtests.py
2016-02-25 16:21:15 -07:00
hlub
1494c44918 Refactored GlusterFS support
Usage of GlusterFS states did not change except the state 'created' was deprecated in favor of more descriptive name 'volume_present'.
- Improved separation of functionality in the execution module from the states. Module functions now return booleans instead of varying
strings. Parsing those strings in the states was very error-prone. In glusterfs.peer() function this problem was earlier solved by returning
a dict containing both the exit value and output string of the gluster call. This could be a good idea, although without calling the gluster
calls twice, and applied to other functios too.
- Calls to gluster are now logged more verbosely, while a failing call no longer raises an immediate exception.
- Improved checking and verbosity in the state level. Cleaned code a lot, removed some bugs and other odd behaviour.
- Updated tests to match the changes. Refactored some test code to be more readable. Added assertions to test that some functions are not
called when things are already in the desired state. Preferred changing behaviour of the mocked functions while proceeding instead of listing
all of the return values first.
- Replaced glusterfs.list_peers() with more informative peer_status() and deprecated the old name. The function now returns a dict with UUIDs as its keys.
- glusterfs.info() can now be called without volume name. It always returns a dictionary. Use this function instead of status() in sates.
- Functions glusterfs.delete() and glusterfs.create() were deprecated and renamed to delete_volume() and create_volume().
2016-02-25 10:46:43 -07:00
Mike Place
e483978fc8 Merge pull request #31423 from twangboy/win_system_dev
Fix uppercase computer names
2016-02-25 09:15:58 -07:00
Nicolas Delaby
d2bcc37416 Pull missing images when calling dockerng.running
fixes #29727
2016-02-24 10:08:03 -07:00
twangboy
144f7206fe Fix uppercase computer names 2016-02-22 16:42:08 -07:00
Mike Place
2bd9af38b0 Merge pull request #31329 from kraney/boto_iam
Extend boto_iam with support for managed policies
2016-02-22 12:28:30 -07:00
Kris Raney
04b3a24e78 Update unit tests to reflect changes 2016-02-22 10:58:23 -06:00
rallytime
38f89bf8fd Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
2016-02-21 15:23:24 -07:00
rallytime
4baea26c58 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/topics/netapi/index.rst
  - salt/modules/win_servermanager.py
  - salt/modules/zypper.py
2016-02-20 12:27:41 -07:00
Nicolas Delaby
8c86eeb4dc Pull missing images when calling dockerng.running
fixes #29727
2016-02-19 15:43:52 +01:00
Ronald van Zantvoort
3110e3424f Additional fixes to test output, unit tests fixes 2016-02-19 13:11:59 +01:00
Mike Place
f0ba9c1eca Merge pull request #31326 from ticosax/2015.8-dockerng-detect-settings-removal
[dockerng ] Detect settings removal
2016-02-18 15:02:50 -07:00
Mike Place
3832f9b874 Merge pull request #30979 from dschaller/npm-cache-clean
Adding NPM cache_cleaned state & module functions
2016-02-18 14:51:04 -07:00
Mike Place
02f79dc2b3 Merge pull request #31322 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-02-18 14:28:02 -07:00
Nicolas Delaby
7bedd86ebe Add detection of removed settings.
When removing settings from dockerng.running state definition,
changes where ignored as `_compare()` was iterating only over user defined
parameters.

By looping over all available options we are now sure to not miss
removed entries.

Extend definition of expected default values:

 - Some default values are predictable and hardcoded in the VALID_CREATE_OPTS dict.
 - Some default needs to be read from images (`image_path`)
 - Some defaults values are unpredictable (hostname, mac_address)
 we are comparing desired value against value reported by the container
 (`get_default_from_container`).
2016-02-18 20:23:31 +01:00
rallytime
cc29092dcb Merge branch '2016.3' into 'develop' 2016-02-18 11:33:24 -07:00
rallytime
01aa33ac12 Merge branch '2015.8' into '2016.3' 2016-02-18 11:13:23 -07:00
rallytime
7ea9dacbdd Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
  - salt/minion.py
  - salt/modules/win_update.py
  - salt/modules/yumpkg.py
  - salt/utils/pkg/rpm.py
2016-02-18 11:10:44 -07:00
Erik Johnson
cf2ce95e61 Update test to reflect new position of contents param
The addition of the new skip_verify argument to
salt.modules.file.manage_file() means that the position of contents
param in returner.call_args[0] has changed. This commit updates this
test to reflect the new position.

Additionally, a comment has been added to hopefully make failures in
this test easier to grok for people moving forward.
2016-02-17 20:54:44 -06:00
Mike Place
74a8f008f5 Merge pull request #31143 from kraney/boto_apigateway
Boto apigateway
2016-02-17 15:17:16 -07:00
Joe Julian
783e9b2e13 Rework tests and fix reverse peering with gluster 3.7
Reworked the test structure design for the gluster module and state so I
could create a test that mimiced the behavior difference between 3.7 and
prior versions when reverse probing by ip a server that already exists.

Added the additional data given by gluster 3.7 to the output of
glusterfs.list_peers to allow us to compare a requested peering against
a host's aliases.

Fixes #30932
2016-02-17 13:10:07 -08:00
rallytime
023ad4635c Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/modules/win_update.py
  - salt/states/win_update.py
2016-02-17 09:33:08 -07:00
Derek Schaller
8d7ab01c67 Fixing npm cache cleaned lint errors 2016-02-12 20:35:13 -08:00
Derek Schaller
6c88c43f28 Merging in cachedout's test fixes 2016-02-12 20:09:22 -08:00
Derek Schaller
4a133d5ddc cache_clean should return a mocked value 2016-02-12 19:51:22 -08:00
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
2016-02-12 14:38:50 -07:00
Mike Place
498dec2e91 Fix tests 2016-02-12 10:56:01 -07:00
Derek Schaller
b5815d367e Reset the name to valid package in npm cache_cleaned unit test 2016-02-11 22:22:21 -08:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
2016-02-11 22:33:49 -07:00
Derek Schaller
47f8aeee97 Cleaning up npm cache_cleaned unit tests expected response 2016-02-11 20:39:42 -08:00
Derek Schaller
fe56101584 Update unit test to reflect npm ls directory structure 2016-02-11 19:41:08 -08:00
Winston Liu
b994bcfae5 lint warnings/errors. 2016-02-11 14:24:35 -08:00
Mike Place
a4040da46d Fix bad unit test 2016-02-11 10:31:40 -07:00
Winston Liu
824960503c lint warnings/errors. 2016-02-10 15:05:53 -08:00
Mike Place
5bf5848e04 Fixup unit test 2016-02-10 14:36:21 -07:00
Winston Liu
7df27fe0c9 Merge branch 'boto_cognitoidentity' into boto_apigateway 2016-02-10 13:00:30 -08:00
Mike Place
7c07d0597b Merge pull request #31094 from kraney/boto_cognitoidentity
Boto cognitoidentity
2016-02-10 13:50:04 -07:00
Winston Liu
4ee6c93838 fixed lint warnings/errors. 2016-02-10 11:43:47 -08:00
Winston Liu
efc374f968 'comment' fix up's in the returned dictionary. 2016-02-10 09:42:14 -08:00
Winston Liu
f21ebbd096 Merge branch 'boto_cognitoidentity' into boto_apigateway 2016-02-09 16:57:57 -08:00
Winston Liu
ce206c1e28 present and absent states added for cognito identity pool. 2016-02-09 16:54:05 -08:00
Mike Place
c3f115724a Merge pull request #30987 from youngnick/add-back-localhost-peer-handling
Changed glusterfs.peer() module so state can handle localhost peering attempts.
2016-02-09 10:51:58 -07:00
Derek Schaller
fc2b60effe Cleaning up logic in unit tests for cache_cleaned state 2016-02-09 09:13:17 -08:00
Derek Schaller
2e3ebf806e Update npm state return name to None in unit tests 2016-02-08 22:00:18 -08:00
Derek Schaller
b020169ec7 Use the variable value in unit tests instead of hardcoded string 2016-02-08 20:57:47 -08:00
Derek Schaller
a824f56216 Update expected NPM cache_cleaned response to include name 2016-02-08 20:18:16 -08:00
Derek Schaller
8437cba2e6 Undo unintended unit test changes to npm bootstrap 2016-02-08 19:29:12 -08:00
Nick Young
730b5ef3e2 Update tests to cover new peering return val. 2016-02-09 10:58:44 +11:00
Mike Place
3b7b6f2398 Merge pull request #31002 from rmtmckenzie/cloud-lxc-provide-fix
Fix lxc cloud provided minion reporting present
2016-02-08 11:14:50 -07:00
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