valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
61,921 Commits 24 Branches 182 Tags 341 MiB
5ed2867ec0
Commit Graph

604 Commits

Author SHA1 Message Date
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
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
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
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
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
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