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
61,844 Commits 24 Branches 182 Tags 341 MiB
3989e5b3de
Commit Graph

599 Commits

Author SHA1 Message Date
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
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
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
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
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
twangboy
5ca4ad6675 Fix unit tests for state 2016-03-30 17:12:12 -06:00
Nicolas Delaby
c989ae5a7e Merge user defined labels with one carried by the image 2016-03-29 11:50:08 +02:00
rallytime
6886681410 Fix test failures 2016-03-24 16:45:03 -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
Colton Myers
95c08f55e9 Tear out useless unit test 2016-03-22 13:46:06 -06:00
Nicolas Delaby
e511864a55 Fix ports exposition when protocol is passed. 
fixes #32013
 2016-03-21 10:44:22 +01: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
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
Christophe Drevet-Droguet
fc9dd356e8 test case: test_list_present_nested_already 2016-03-03 15:17:43 +01:00
Nicolas Delaby
8c86eeb4dc Pull missing images when calling dockerng.running 
fixes #29727
 2016-02-19 15:43:52 +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
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
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
Mike Place
a4040da46d Fix bad unit test 2016-02-11 10:31:40 -07:00
Mike Place
5bf5848e04 Fixup unit test 2016-02-10 14:36:21 -07: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
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
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
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
rallytime
adb85892de Fix failing state module tests 2016-02-04 00:01:11 +00:00
Mike Place
3b246db0b0 Fix stupid test 2016-02-02 12:39:24 -07: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
rallytime
bf9ffded6d Refactor rabbitmq_cluster states to use test=true functionality correctly 
Fixes #7811
 2016-01-25 16:47:54 -07:00
rallytime
1e8e86007c Refactor rabbitmq_policy states to use test=true functionality correctly 
Fixes #25658
 2016-01-25 15:21:19 -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
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
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
Andreas Lutro
ca290ec3e1 change how alternatives states check for installed 2015-12-28 12:31:19 -07: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
Colton Myers
e59364ad1d Fix failing unit test 2015-12-08 13:45:34 -07: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
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