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
66,626 Commits 24 Branches 182 Tags 341 MiB
7fdf13bd73
Commit Graph

66626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ronald van Zantvoort
7fdf13bd73 Recommit letsencrypt-auto mod/state in develop 2016-02-25 14:46:18 +01:00
Mike Place
cd595104bf Merge pull request #31449 from justindesilets/add-service_name-key-to-service-beacon 
Added the key value service_name to service beacon
 2016-02-24 09:56:15 -07:00
Mike Place
ef47a88202 Merge pull request #31359 from Ashald/feature/event-send-saltenv-pillarenv 
Include saltenv/pillarenv into data in event.send
 2016-02-24 09:40:54 -07:00
Nicole Thomas
3eeac55c6a Merge pull request #31382 from DSRCompany/issues/30183_fix_multimaster_failover 
Set auth retry count to 0 if multimaster mode is failover
 2016-02-24 09:13:37 -07:00
Nicole Thomas
52dae138bd Merge pull request #31448 from techhat/dnsarecord 
Properly handle A and AAAA records
 2016-02-24 08:29:07 -07:00
Nicole Thomas
b32dd6d332 Merge pull request #31452 from anandxoriant/develop 
Updated win_organization_name default value for vmware driver
 2016-02-24 08:27:27 -07:00
Anand Nevase
a93c7e2ffa change win_organization_name default value to Organization 2016-02-24 17:34:07 +05:30
Borys Pierov
ad6728aeec Include saltenv/pillarenv into data in event.send 
Based on with_env_opts flag
 2016-02-24 00:50:46 -05:00
Joseph Hall
2e72c29bf8 Properly handle A and AAAA records 2016-02-23 21:20:45 -07:00
jdesilet
7acea12cd0 Added the key value service_name to service beacon 
This feature allows you to call the service name as a key in reactor
files. The use case being that you can then create one reactor file
that can run states of the same name. An example being:

/srv/reactor/service.sls
service:
  local.state.sls:
    - tgt: {{ data['data']['id'] }}
    - arg:
      - {{ data['data']['service_name'] }}

Then if you had state with a matching name it could ensure the service
is set in the right state when any change is detected.
 2016-02-23 20:07:10 -07:00
Mike Place
437b98326f Merge pull request #31431 from jejenone/napalm_proxy_minion 
Napalm library based proxy minion
 2016-02-23 11:10:25 -07:00
Mike Place
abb4539dc8 Merge pull request #31358 from Ashald/bugfix/state-sls-environment 
Make sure state.sls preserves saltenv/pillarenv
 2016-02-23 10:54:04 -07:00
Mircea Ulinic
8ad5794b60 Proxy Minion for network devices using Napalm library 2016-02-23 17:44:39 +00:00
Mike Place
7b8ea4b203 Merge pull request #31381 from s0undt3ch/develop 
Add missing NullItem
 2016-02-23 10:12:54 -07:00
Mike Place
dbad00567b Merge pull request #31199 from FirefighterBlu3/py3-raet-log.warn 
Py3 raet log.warn
 2016-02-23 09:32:49 -07:00
Mike Place
43d531b93d Merge pull request #31392 from vodik/nftables 
Changes to nftables module
 2016-02-23 09:15:01 -07:00
Pedro Algarvio
4e630fcef6
Add missing NullItem 2016-02-23 15:54:31 +00:00
Mike Place
039e3dc0e3 Merge pull request #31433 from peter-slovak/fix-bug-28044 
Fix bug #28044 - look for 'pip' first, then 'pip2'
 2016-02-23 08:47:40 -07:00
Peter Slovak
91bb3913c1 Fix bug #28044 - look for 'pip' first, then 'pip2' 2016-02-23 15:06:58 +01:00
Mike Place
f833b6f5b6 Merge pull request #30891 from anandxoriant/develop 
Support for windows VM network (static/dhcp) configuration for vmware driver.
 2016-02-22 17:13:08 -07:00
Mike Place
f58cdda086 Merge pull request #31262 from Vaelatern/add_void 
Add support for Void Linux
 2016-02-22 16:28:46 -07:00
Mike Place
873061e2fa Merge pull request #31422 from cachedout/remove_runit_test 
Remove useless test
 2016-02-22 16:28:01 -07:00
Mike Place
56a899c8d9 Remove useless test 
This tests absolutely nothing and has no real point.
 2016-02-22 16:26:30 -07:00
Mike Place
08edcc0bb7 Merge pull request #31296 from kstreee/saltstack/salt#31194 
[saltstack/salt#31194] Fix issue of running multiple salt-api instances.
 2016-02-22 16:05:13 -07:00
David Ford
815c33e993 be more consistent with logging.warning vs logging.warn (deprecated) and quoting style 2016-02-22 21:30:15 +00:00
Erik Johnson
f2b50f27b7 Merge pull request #31387 from rattlesnack/develop 
Master running under non-privileged account and pygit2 as gitfs provider fails pre-flight check
 2016-02-22 14:14:00 -06:00
Mike Place
2bd9af38b0 Merge pull request #31329 from kraney/boto_iam 
Extend boto_iam with support for managed policies
 2016-02-22 12:28:30 -07:00
Kris Raney
04b3a24e78 Update unit tests to reflect changes 2016-02-22 10:58:23 -06:00
Mike Place
343789b456 Merge pull request #31364 from DSRCompany/issues/30183_multimaster_failover_switch 
Don't send REQ while another one is waiting for response.
 2016-02-22 09:45:23 -07:00
Mike Place
d9a5e581dd Merge pull request #31371 from techhat/vault 
Add pillar module for vault
 2016-02-22 09:29:51 -07:00
Mike Place
b493a685bb Merge pull request #31396 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-02-22 09:07:03 -07:00
Mike Place
6c9881e103 Merge pull request #31401 from nmadhok/patch-1 
Update README.rst
 2016-02-22 09:06:18 -07:00
Anand Nevase
12a0c76448 Updated Windows Fullname and Organization for vmware driver 2016-02-22 18:50:42 +05:30
Nitin Madhok
4f8b725793 Update README.rst 2016-02-22 01:53:27 -05:00
kstreee
53e0b56b13 [saltstack/salt#31194] Add documentation about running multiple salt-api modules, advised by @whiteinge. 2016-02-22 11:35:16 +09:00
kstreee
cfab276324 [saltstack/salt#31194] Make the code simple because IndexError exception has very rare chance to be raised at 'os.path.abspath(__file__).rsplit('/')[-2]', advised by @whiteinge. 2016-02-22 09:51:54 +09:00
rallytime
38f89bf8fd Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
 2016-02-21 15:23:24 -07:00
Simon Gomizelj
963e12ddc2 Add missing nftables families 
The inet family a special hybrid ipv4+ipv6 table, netdev for filtering
from ingress.
 2016-02-20 21:32:48 -05:00
Simon Gomizelj
c0ac0c0096 Fix check_table 
The output of 'nft list tables' has the family included in the output
 2016-02-20 21:32:48 -05:00
Ilia G Akilov
1f8276f2be minor bug fix, function name replaced with the call 2016-02-20 14:50:57 -05:00
Dmitry Kuzmenko
a60522daf8 Set auth retry count to 0 if multimaster mode is failover 2016-02-20 17:44:12 +03:00
Dmitry Kuzmenko
950098cf9c Don't send REQ while another one is waiting for response. 
The message has to be removed from the queue the only *after* it's
already processed to don't confuse send() functionality that expects
empty queue means: there's no active sendings.
 2016-02-20 17:39:25 +03:00
Mike Place
87032995ed Merge pull request #31372 from jfindlay/process_log 
utils.process: reduce log level
 2016-02-19 22:44:11 -07:00
Toyam Cox
7afbfe26fc Add support for Void Linux 2016-02-19 18:42:46 -05:00
Justin Findlay
238a95b258 utils.process: reduce log level 
Similar to 33844c3c.  Without this, the minion debug log fills up with
`Process manager iteration` at a rate of about 1 every 10-15 seconds.
 2016-02-19 15:34:03 -07:00
Joseph Hall
b162382797 Remove bad piece of docstring 2016-02-19 14:57:34 -07:00
Joseph Hall
ac04106750 Lint 2016-02-19 14:55:15 -07:00
Joseph Hall
5b1b46d068 Add pillar module for vault 2016-02-19 14:19:24 -07:00
Anand Nevase
41eb3847f2 Fixed lint error. 2016-02-20 02:00:42 +05:30
Borys Pierov
3459735684 Make sure state.sls preserves saltenv/pillarenv 2016-02-19 15:09:04 -05:00