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
60,655 Commits 24 Branches 182 Tags 341 MiB
d592d8636b
Commit Graph

60655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Prince
d592d8636b Fix regression in file_tree pillar (Fixes #31223.) 2016-02-15 14:06:25 -05:00
Nicole Thomas
415654ee9e Merge pull request #31182 from rallytime/bp-31172 
Back-port #31172 to 2015.8
 2016-02-13 14:36:07 -07:00
Nicole Thomas
434e05667a Merge pull request #31191 from rallytime/fix-27498 
Make sure doc example matches kwarg
 2016-02-13 14:34:57 -07:00
rallytime
0bdbaa49d1 Make sure doc example matches kwarg 
Fixes #27498
 2016-02-12 16:58:20 -07:00
Mike Place
c5e5af827c Merge pull request #31171 from Ch3LL/megan-20158 
added logic to check for installed package
 2016-02-12 15:10:21 -07:00
Mike Place
a024d3536f Merge pull request #31177 from Ch3LL/test_content_pillars 
add integration test for issue #30934
 2016-02-12 15:09:31 -07:00
Mike Place
1f22335e28 Merge pull request #31181 from cachedout/lint_20158 
Lint 2015.8 branch
 2016-02-12 14:57:02 -07:00
Joseph Hall
a743778e98 Use correct deploy directory 2016-02-12 14:45:00 -07:00
Mike Place
4c0be11627 Lint 2015.8 branch 2016-02-12 14:43:34 -07:00
Ch3LL
9204e3f562 add integration test for issue 30934w 2016-02-12 12:21:50 -07:00
Ch3LL
a12e2f566b fix lint error 2016-02-12 11:38:29 -07:00
Mike Place
4d1b49c1e7 Merge pull request #31169 from rallytime/bp-29718 
Back-port #29718 to 2015.8
 2016-02-12 11:28:13 -07:00
Mike Place
f2efd3e6c1 Merge pull request #31170 from rallytime/bp-31157 
Back-port #31157 to 2015.8
 2016-02-12 11:27:49 -07:00
Ch3LL
a123efd4ef added logic to check for installed package 2016-02-12 11:01:35 -07:00
Captain Inspiration
27776b5f4e Fix locale generation on Ubuntu 2016-02-12 10:26:06 -07:00
Tarjei Husøy
ceae2a16f8 Support match-sets in iptables module 
Based on work by @l13t in https://github.com/saltstack/salt/pull/29426.

Added tests and fixed incorrect appending of the built rule.

Closes #29423.
 2016-02-12 10:24:50 -07:00
Mike Place
7f49fbb70d Merge pull request #31147 from cro/fx2_doc 
Documentation clarifications.
 2016-02-12 10:16:27 -07:00
Mike Place
7986b9e033 Merge pull request #31153 from edencrane/fix-network-connect-invalid-hostname 
Fixed invalid host causing 'reference to variable before assignment'
 2016-02-12 09:30:19 -07:00
Mike Place
f5ab76801b Merge pull request #31152 from garethgreenaway/30994_beacon_add_failing_and_other_fixes 
fixes to beacon module, state module and friends
 2016-02-12 09:27:40 -07:00
Eden Crane
a14c4bb5f2 Fixed invalid host causing 'reference to variable before assignment' 
The current version of exception handling for network.connect references variable '_address', but '_address' is not defined if a call to socket.getaddrinfo failed in the same try block.

eg.
>salt '<minion>' network.connect junkdomain 80
    The minion function caused an exception: Traceback (most recent call last):
      File "/usr/lib/python2.7/site-packages/salt/minion.py", line 1071, in _thread_return
        return_data = func(*args, **kwargs)
      File "/usr/lib/python2.7/site-packages/salt/modules/network.py", line 1104, in connect
        ret['comment'] = 'Unable to connect to {0} ({1}) on {2} port {3}'.format(host, _address[0], proto, port)
    UnboundLocalError: local variable '_address' referenced before assignment

This patch catches socket.getaddrinfo execption socket.gaierror and returns with a friendly fail message.
 2016-02-11 22:18:08 -08:00
Gareth J. Greenaway
91b14dca40 fixing the beacon module and state module to handle passing enabled properly. Also reworking how what is returned from the validating functions is handled to ensure when beacon configurations aren't validate the results indicate exactly why. 2016-02-11 22:06:01 -08:00
jacobhammons
c8047d979d Merge pull request #31149 from jfindlay/2015.8 
add 2015.8.7 release notes
 2016-02-11 17:06:15 -07:00
Justin Findlay
b58783b895 add 2015.8.7 release notes 2016-02-11 17:04:34 -07:00
C. R. Oldham
a005e4af55 Documentation clarifications. 2016-02-11 15:05:35 -07:00
Mike Place
5c394ac49c Merge pull request #31134 from isbm/isbm-zypper-list-products 
Fix types in the output data and return just a list of products
 2016-02-11 13:19:22 -07:00
Mike Place
8f2e3a26e5 Merge pull request #31120 from gtmanfred/2015.8 
Clean up some bugs in the nova driver
 2016-02-11 13:17:41 -07:00
Mike Place
2d592a398e Merge pull request #31132 from rallytime/fix-31099 
Make sure required profile configurations passed in a map file work
 2016-02-11 13:16:46 -07:00
rallytime
1da03da9df Pylint fix 2016-02-11 11:34:27 -07:00
Daniel Wallace
4a411c0817 fix comment 2016-02-11 12:10:52 -06:00
Mike Place
b831e0a865 Merge pull request #31131 from Ch3LL/megan-20158 
integration test for issue #31014
 2016-02-11 10:33:23 -07:00
Mike Place
e378afd891 Merge pull request #31133 from cachedout/fixup_31121 
Fixup 31121
 2016-02-11 10:32:24 -07:00
Mike Place
a4040da46d Fix bad unit test 2016-02-11 10:31:40 -07:00
Bo Maryniuk
670a326e3d Fix types in the output data and return just a list of products 2016-02-11 18:28:14 +01:00
rallytime
337592ec56 Make sure required profile configurations passed in a map file work 2016-02-11 10:13:37 -07:00
Mike Place
a4a40262f8 Merge pull request #31125 from isbm/isbm-salt-api-service 
Force-kill websocket's child processes faster than default two minutes.
 2016-02-11 09:50:57 -07:00
Mike Place
79c85859bc Merge pull request #31119 from sakateka/fix-for-ipv6only-failover 
fixes for ipv6-only multi-master faliover
 2016-02-11 09:21:45 -07:00
Bo Maryniuk
f73f70375c Force-kill websocket's child processes faster than default two minutes. 2016-02-11 15:16:43 +01:00
Jacek Hojczak
0e68fafb74 Fix alternative module and state. 2016-02-11 09:40:26 +01:00
Daniel Wallace
47ecb7a150 include all ips in public_ips or private_ips 2016-02-11 00:14:49 -06:00
Daniel Wallace
b2e8202f5d dont exit on a missing server 
This errors if a server gets deleted between when the server_list and
show_server commands are run.  When running map files to build servers, this
could cause the entire map to be evaluated as needing to be run.

If a server disappears, just continue and don't include it.
 2016-02-10 23:55:42 -06:00
Daniel Wallace
8ad1ee6db4 clean up references to access_ip extra network 
This should make this slightly better, and have everything documented a bit
better.  If salt-cloud to use an extra network that isn't in public_ips or
private_ips, we will overwrite public_ips, and exit.

Then private_ips and public_ips are handled as normal.

Also remove some redundant code that isn't needed
 2016-02-10 23:54:12 -06:00
Ch3LL
af82b1233a integration test for issue #31014 2016-02-10 21:46:22 -07:00
Sergey Kacheev
2c45d151d1 fix unintentional breaking changes 2016-02-11 10:16:29 +06:00
Sergey Kacheev
043a5e6fd7 fixes for ipv6-only multi-master faliover 2016-02-11 10:04:20 +06:00
Mike Place
825b510030 Merge pull request #31107 from techhat/nebulaprivip 
Don't try to add a non-existent IP address
 2016-02-10 14:52:42 -07:00
Mike Place
c56a819fd8 Merge pull request #31108 from jtand/npm_test_fix 
Changed npm integration test to install request.
 2016-02-10 14:52:02 -07:00
justinta89
a5eac47b25 Changed npm integration test to install request. 
Later versions of npm were having trouble installing pm2 with the git link.
 2016-02-10 14:31:16 -07:00
Joseph Hall
1fa69982c4 Don't try to add a non-existent IP address 2016-02-10 14:23:53 -07:00
Mike Place
de1abae9d1 Merge pull request #31105 from cachedout/lint_30975 
Lint 30975
 2016-02-10 14:11:21 -07:00
Mike Place
446b4c2aff Lint #30975 2016-02-10 14:04:59 -07:00