Colton Myers
58aed60838
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/runners/lxc.py
2015-05-21 11:27:52 -06:00
rallytime
9e0ec07d85
Skip the gpodder pkgrepo test - they don't have vivid ppa up yet
2015-05-20 14:08:42 -06:00
rallytime
7ed776c293
Cloud tests should use an image that is LTS
...
Changes the test image to create for digital ocean cloud tests to be on Ubuntu 14.04, not 14.10
2015-05-18 14:04:24 -06:00
rallytime
4acf58e758
Switch digital ocean tests to v2 driver
...
This has been done on develop, but this handles the cloud test failures for 2015.5.
2015-05-18 13:44:08 -06:00
rallytime
7e15ff94ff
Move digital_ocean_v2 tests to be the defauly/only tests for digital ocean cloud tests
2015-05-14 15:25:00 -06:00
Thayne Harbaugh
6f4cfd01fc
Specify compound matches as lists
...
Compound matches, such as nodegroups, can now be specified as lists. This
avoids splitting on whitespace which may be part of a key or value.
Right now this only works for nodegroups. Making the argument to "-C"
(compound list) a JSON argument is a future task.
2015-04-24 17:00:04 -06:00
Colton Myers
ef583295d5
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/beacons/service.py
2015-04-20 11:41:25 -06:00
Thomas S Hatch
a7ff60491b
Merge pull request #22815 from plastikos/issue-22797
...
Fix failure with nested nodegroups:
2015-04-20 09:12:54 -06:00
Thayne Harbaugh
b37b6b2849
Add a test for incorrectly-nested nodegroups that cause a resolution loop.
2015-04-17 17:01:47 -06:00
Thayne Harbaugh
6c1d4d58e9
Fix failure with nested nodegroups:
...
If a nodegroup was re-used - even if it wasn't a circular reference - it
would fail the nodegroup expansion with the following message:
Failed nodegroup expansion: illegal nested nodegroup "min"
This was simply because already-visited nodegroups are pushed into `skip`
but were never popped.
* Add another test case for this situation.
* Pop the current nodegroup from `skip` when leaving the expansion
context
Fixes : #22797
2015-04-17 15:20:34 -06:00
Tomas Sirny
42d26cc699
Shorter disk resource definition
2015-04-17 16:30:06 +02:00
Tomas Sirny
5d93b7619d
Working test for extended profile
2015-04-17 15:40:08 +02:00
Tomas Sirny
6f34f0db74
Allow setting multiple disks and scopes on create of instance for GCE
2015-04-17 15:40:08 +02:00
Colton Myers
000de95974
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
2015-04-16 12:15:44 -06:00
Thomas S Hatch
586b81b33e
Add tests for the jinja demands
2015-04-15 16:39:08 -06:00
Damian Myerscough
c6e618bc5f
Digital Ocean APIv2 Integration Testing
2015-04-10 21:30:09 -07:00
Thayne Harbaugh
1c3536fb8e
Support nested nodegroups
...
Nodegroups can be recursively expanded without worrying about other
compound matcher expansions. Once the nodegroups are expanded on the
master the remaining flattened compound match can be expanded without the
nodegroup information.
2015-04-08 23:16:39 -06:00
Mike Place
018400d94c
Remove loop interval setting, was causing cpus to spin
2015-04-03 15:34:47 -06:00
Colton Myers
70406867a4
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/client/__init__.py
salt/modules/file.py
salt/modules/yumpkg.py
salt/modules/zypper.py
tests/integration/shell/auth.py
tests/unit/states/archive_test.py
tests/unit/states/module_test.py
2015-03-20 20:09:19 -06:00
Colton Myers
2b1f400ab4
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/topology/syndic.rst
salt/client/__init__.py
salt/daemons/masterapi.py
salt/minion.py
salt/modules/dockerio.py
2015-03-19 16:03:29 -06:00
Justin Findlay
f735f0b96d
add eauth pam group tests
...
Adds test for #17380 .
2015-03-17 14:25:57 -06:00
Mike Place
d04062a5ad
Remove loop interval setting, was causing cpus to spin
2015-03-13 16:00:32 -06:00
Colton Myers
d17c908b42
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/pillar/index.rst
salt/beacons/diskusage.py
salt/beacons/network_info.py
salt/minion.py
salt/modules/iptables.py
salt/modules/nacl.py
salt/modules/win_firewall.py
2015-03-09 12:52:14 -06:00
Tomas Sirny
494d7069fd
Working basic test for GCE cloud provider
2015-03-08 23:16:36 +01:00
Tomas Sirny
ee00477bae
Template configs for GCE cloud provider
2015-03-08 16:44:14 +01:00
Thomas Jackson
7a5ac0245d
Pylint fix
2015-03-06 17:47:18 -08:00
Thomas Jackson
9fa37fd46b
Add raw boolean support to depends decorator
2015-03-05 21:59:10 -08:00
C. R. Oldham
f171df4311
Merge forward 2015.2->develop
2015-03-01 19:54:22 -07:00
C. R. Oldham
00942f2060
Merge forward 2014.7->2015.2
2015-03-01 17:55:25 -07:00
Erik Johnson
94d55889d7
Resolve merge conflicts
2015-02-28 12:35:25 -06:00
Justin Findlay
17b8f73f1b
add cmd module integration tests
2015-02-27 16:30:05 -07:00
Colton Myers
c8eb2d4665
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/installation/windows.rst
salt/cloud/clouds/joyent.py
salt/daemons/flo/core.py
salt/minion.py
2015-02-23 14:25:51 -07:00
rallytime
b51492486f
Add Joyent cloud provider tests
2015-02-20 17:25:07 -07:00
Colton Myers
c3b7be0655
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/installation/rhel.rst
salt/output/__init__.py
salt/utils/__init__.py
2015-02-20 13:51:59 -07:00
rallytime
c3f786c966
listen and listen_in requisite tests
2015-02-19 16:13:23 -07:00
rallytime
1437c9a1f5
onfail and onfail_in requisite tests
2015-02-19 14:35:26 -07:00
rallytime
208b4906d8
Onchanges and onchanges_in requisite tests!
2015-02-19 13:06:38 -07:00
rallytime
8f0e80bd66
Add one onchanges requisite test
2015-02-18 17:16:07 -07:00
Colton Myers
f00465a8a1
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/event/index.rst
salt/loader.py
salt/modules/config.py
salt/modules/cyg.py
salt/modules/hg.py
salt/modules/lxc.py
salt/modules/upstart.py
salt/states/hg.py
salt/utils/cloud.py
salt/utils/dictupdate.py
salt/utils/schedule.py
tests/integration/fileserver/gitfs_test.py
tests/unit/pydsl_test.py
2015-02-18 11:55:29 -07:00
Justin Findlay
b39f962369
add state module requested state run tests
...
closes #16901
2015-02-17 14:23:14 -07:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
rallytime
dc23823897
Merge branch '2014.7' into '2015.2'
...
Conflicts:
salt/modules/localemod.py
2015-01-27 13:24:14 -07:00
rallytime
299374a211
Change image name in rackspace profile config to a valid one
2015-01-24 20:14:23 -07:00
Colton Myers
70489c62a7
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/cron.py
salt/modules/rabbitmq.py
salt/modules/smf.py
salt/modules/upstart.py
salt/modules/useradd.py
salt/modules/zpool.py
salt/pillar/git_pillar.py
2015-01-07 14:49:58 -07:00
Seth House
e96654744f
Added test for git_pillar branch to env mappings
2015-01-06 16:51:58 -07:00
Colton Myers
43df12b6cc
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/client/ssh/shell.py
salt/modules/file.py
tests/integration/states/file.py
2014-12-18 10:32:19 -07:00
Elias Probst
5a6811759f
Fix tests for #18841 .
2014-12-18 01:51:26 +01:00
Elias Probst
e82c6ba7c0
Add missing line.
2014-12-18 01:50:39 +01:00
Elias Probst
6363aa22ac
Add integration tests for 'modules.file.replace()'.
2014-12-17 12:06:58 +01:00
Colton Myers
716a7e3331
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/modules/bsd_shadow.py
salt/modules/freebsdjail.py
salt/modules/yumpkg.py
salt/modules/zfs.py
salt/modules/zypper.py
salt/netapi/rest_tornado/saltnado.py
salt/states/dockerio.py
2014-11-18 12:46:29 -07:00
