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
67,079 Commits 24 Branches 182 Tags 341 MiB
131d3a1911
Commit Graph

67079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amir Pakdel
131d3a1911 AWS securitygroupname and subnetname 
Added support for subnetname and securitygroupname for EC2
instances.
Since there can be one subnet assigned to an instance, subnetid
takes precedence over subnetname; but securitygroupid and
securitygroupname are merged together to create a songle
SecurityGroup list.
 2016-03-07 12:25:45 -05:00
Nicole Thomas
bed98d8061 Merge pull request #31677 from miihael/develop 
Return correct value for services that must be enabled in Systemd
 2016-03-06 10:31:08 -07:00
Mikhael A
828cf0c907 Return correct value for services that must be enabled in Systemd, not in SysV 
This fixes situations, when a server switched from SysV to Systemd.
SysV symlinks are still in place and Salt incorrectly determines, that
service is already enabled.

For example:
~$ salt-call --local service.enabled spamassassin
[INFO    ] Executing command 'systemctl is-enabled spamassassin.service'
[INFO    ] Executing command 'runlevel' in directory '/root'
local:
    True

However:

~$ systemctl is-enabled spamassassin.service
disabled

~$ find /etc/rc*.d/ -name
'*spamassassin'
/etc/rc0.d/K02spamassassin
/etc/rc1.d/K02spamassassin
/etc/rc2.d/S02spamassassin
/etc/rc3.d/S02spamassassin
/etc/rc4.d/S02spamassassin
/etc/rc5.d/S02spamassassin
/etc/rc6.d/K02spamassassin
 2016-03-06 17:01:07 +03:00
Nicole Thomas
cdac1ce59d Merge pull request #31686 from myii/PR_winrepo_dir_ng_typo 
Fix typo in example for section `winrepo_dir_ng`
 2016-03-05 09:17:37 -07:00
Nicole Thomas
141f94a310 Merge pull request #31694 from iggy/patch-2 
Add private_ips to list_nodes_full for vultrpy.py
 2016-03-05 09:03:53 -07:00
Brian Jackson
fa4449dba7 Add private_ips to list_nodes_full for vultrpy.py 
Add private_ips to list_nodes_full for vultrpy.py
 2016-03-04 18:19:42 -08:00
Nicole Thomas
71f8c7568e Merge pull request #31685 from rallytime/lint-31673 
Lint and change version added for #31673
 2016-03-04 15:44:09 -07:00
Imran Iqbal
1f0b742052 Fix typo in example for section winrepo_dir_ng 2016-03-04 22:19:25 +00:00
Mike Place
581503aa39 Merge pull request #31654 from alkivi-sas/win-firewall-addition 
added hability to use enabled and disabled specific profiles
 2016-03-04 15:02:45 -07:00
rallytime
4e88ffe3e4 Lint and change version added for #31673 
Merges #31673
 2016-03-04 15:02:19 -07:00
Nicole Thomas
e9324b527c Merge pull request #31684 from rallytime/versionadded-rdp 
Add versionadded directive to new rdp session functions
 2016-03-04 13:47:22 -07:00
rallytime
035b64554f Add versionadded directive to new rdp session functions 2016-03-04 13:03:53 -07:00
Alkivi
e5d9eab93b extra break to match guidelines 2016-03-04 11:03:26 +01:00
Christophe Drevet-Droguet
12db98ea23 grains.get ordered parameter implementation 2016-03-04 09:19:30 +01:00
Nicole Thomas
7e4553e436 Merge pull request #31659 from cachedout/lint_31554 
Lint 31554
 2016-03-03 13:27:11 -07:00
Mike Place
778519d863 Lint 
Closes #31554
 2016-03-03 11:52:37 -07:00
Raghu Toppur
7c2923395d fix regex so that entire line in mdadm config will be replaced, not only the matched prefix. Also, the update-initramfs utility is available only on Debian. On RedHat, use dracut. 2016-03-03 11:52:37 -07: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
Mike Place
55ca1aaeea Merge pull request #31649 from vtek21/develop 
Fix version not passed to pkg.remove module
 2016-03-03 09:20:27 -07:00
Mike Place
8664d1201a Merge pull request #31636 from nshalman/pkg-osx 
pkg/osx: build_pkg.sh needs to be called not sourced
 2016-03-03 09:13:11 -07:00
Alkivi
1b26886ec8 added hability to use enabled and disabled specific profiles 2016-03-03 16:27:16 +01:00
Ferdinant Visser
85022cc43b Fix version not passed to pkg.remove module 
In the pkg.py state the version was not passed to the pkg.remove function
preventing the uninstall of a specific version.
 2016-03-03 11:38:14 +01:00
Mike Place
bf4b651319 Merge pull request #31633 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-03-02 15:09:36 -07:00
Mike Place
b9eee1f143 Merge pull request #31631 from rallytime/versionadded_boto_apigateway 
Added "Carbon" to the versionadded tag in boto_apigateway state
 2016-03-02 14:49:26 -07:00
Mike Place
de62ca8578 Merge pull request #31555 from kstreee/saltstack/salt#31534 
[saltstack/salt#31534] Resolve data['arg'] type issue. Now rest_tornado can accept not only a list of string type for 'arg', but also a string type data for 'arg'.
 2016-03-02 14:49:09 -07: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
Nahum Shalman
08a2863676 pkg/osx: build_pkg.sh needs to be called not sourced 
If it's sourced it ignores the command line arguments
and that makes it fail.
 2016-03-02 16:01:20 -05:00
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
 2016-03-02 13:48:11 -07:00
Nicole Thomas
3867af7793 Merge pull request #31623 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-03-02 13:03:38 -07:00
rallytime
3379aefa49 Added "Carbon" to the versionadded tag in boto_apigateway state 2016-03-02 12:40:40 -07:00
Nicole Thomas
d01103d46e Merge pull request #31587 from kraney/boto_apigateway 
provided more flexibility for the lookup of lambda functions
 2016-03-02 12:37:06 -07:00
rallytime
ac69e4bf10 Fix merge bug caught by zypper test and user correct zypper test info 2016-03-02 12:19:47 -07:00
Nicole Thomas
4ea5c2aa7b Merge pull request #31625 from rallytime/merge-31577-with-docs 
Merge #31577 with doc additions about change
 2016-03-02 11:45:58 -07:00
Nicole Thomas
185c377f03 Merge pull request #31620 from kraney/kraney_bugfix 
Fix a regression I caused in boto_cognitoidentity
 2016-03-02 11:31:20 -07:00
rallytime
62390b616e Remove stray merge conflict line 2016-03-02 11:11:15 -07:00
rallytime
5a862d3449 Add documentation for the behavior change in #31577 
Refs #31577
 2016-03-02 11:03:49 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
 2016-03-02 10:26:13 -07:00
Nicole Thomas
24d9b7448f Merge pull request #31608 from StephenPCG/develop 
monit.summary should only return the exact match of given svc_name
 2016-03-02 09:45:20 -07:00
Nicole Thomas
e0975598dd Merge pull request #31607 from m03/fix-rdp-get_session-docstring 
Fix docstring code-block alignment in rdp
 2016-03-02 09:42:45 -07:00
Nicole Thomas
38ddd62aef Merge pull request #31594 from rallytime/bp-31589 
Back-port #31589 to 2015.8
 2016-03-02 09:33:24 -07:00
Nicole Thomas
66a2e5f52f Merge pull request #31589 from techhat/updatenode 
Ensure that the latest node data is returned
 2016-03-02 09:31:52 -07:00
Kris Raney
ba33404d3e Fix a regression I caused in boto_cognitoidentity 
I popped the wrong argument. This didn't fail in my module since I didn't use that argument, but caused a failure in cognitoidentity.
 2016-03-02 10:24:44 -06:00
C. R. Oldham
86a0fc46b4 Merge pull request #31604 from joejulian/2015.8_31596_workaround_no_xml_when_not_tty 
Workaround for non-xml output from gluster cli when not tty
 2016-03-02 08:53:44 -07:00
Nicole Thomas
09815d905f Merge pull request #31602 from cachedout/fix_31523 
Fix issue with salt-call hanging
 2016-03-02 08:48:56 -07:00
Nicole Thomas
36ce240596 Merge pull request #31583 from vutny/remove-trailing-white-spaces 
Remove trailing white spaces
 2016-03-02 08:38:01 -07:00
Denys Havrysh
bbcad93a8d Fix trailing white spaces in Salt PRM spec file 2016-03-02 10:42:00 +02:00
Denys Havrysh
86433f2378 Revert changes in files used by roots_test.py integration test 2016-03-02 10:00:45 +02:00
Zhang Cheng
0be38467cc monit.summary should only return the exact match of given svc_name 
If there exists two services whose names are "prog" and "prog_bin",
monit.summary("prog") would return both services.

states.monit.monitor uses monit.summary() to determine the status
of a given service, but it only scans the first kind of resource,
and complains service not found if the service is not in the first
resource kind. In the above example, previous code would return:

  File:
    prog_bin:
      Accessible
  Process:
    prog:
      Not monitored

And state.monit.monitor("prog") would fail with

  Comment: prog not found in configuration

With this patch, monit.summary will only return the exact match
of given svc_name, makes state.monit.monitor always happy.
 2016-03-02 11:51:51 +08:00
Morrie Winnett
546ae30fda Fix docstring code-block alignment in rdp 2016-03-01 19:07:33 -08:00
Joe Julian
c567a823a9 Workaround for non-xml output from gluster cli when not tty 
Gluster has a bug in versions prior to 3.6 in that they will replace the
cli output mode if isatty() returns false. This patch uses the script
utility to trick the cli into thinking it's being called from a tty to
allow xml output.

Upstream bug: https://bugzilla.redhat.com:443/show_bug.cgi?id=1047378

Fixes #31596
 2016-03-01 18:02:01 -08:00