valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
37,005 Commits 24 Branches 182 Tags 341 MiB
a3707e2bab
Commit Graph

37005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
bc2c4f876b Merge pull request #15871 from graingert/patch-2 
Fix salt.states.rabbitmq_plugin:disabled.__doc__
 2014-09-17 14:32:03 -06:00
Roy Wellington Ⅳ
a492c53ba6 Use octal. 
Since it's a permission. I can't do decimal -> octal -> unix perms in my head.
 2014-09-17 13:31:15 -07:00
Thomas S Hatch
8ace732052 Merge pull request #15861 from kostko/revert-15550 
Unbreak salt-ssh highstate TypeError
 2014-09-17 14:28:57 -06:00
Thomas S Hatch
fb50b05574 Merge pull request #15860 from kostko/fix-salt-ssh-ret 
Fix salt-ssh return value handling
 2014-09-17 14:15:37 -06:00
Thomas S Hatch
91769fbdbd Merge pull request #15849 from jacksontj/develop 
Add a comment explaining the except
 2014-09-17 14:14:43 -06:00
Thomas S Hatch
16ede267f5 Merge pull request #15837 from nmadhok/fix-doc 
Fix doc salt.states.file
 2014-09-17 14:10:26 -06:00
Joseph Hall
9466dba1ce Merge pull request #15835 from wesleylancel/digital-ocean-api-v2 
Add support for Digital Ocean's API v2
 2014-09-17 14:07:29 -06:00
Nicole Thomas
ce02ad59fd Merge pull request #15877 from s0undt3ch/develop 
Correct `--output-file-append` test
 2014-09-17 13:23:13 -06:00
Pedro Algarvio
8e3f9963cb Correct --output-file-append test 2014-09-17 19:40:58 +01:00
Gareth J. Greenaway
a948da60d5 First pass at adding functionality to disable state runs. These can be highstate, sls files or state functions. 2014-09-17 11:10:33 -07:00
Thomas Grainger
59731615f3 Fix salt.states.rabbitmq_plugin:disabled.__doc__ 2014-09-17 18:00:32 +01:00
Nicole Thomas
95d2ee79d6 Merge pull request #15865 from techhat/issue15831 
Cleanup from issue #15831
 2014-09-17 08:36:49 -06:00
Joseph Hall
d398082de4 Cleanup from issue #15831 2014-09-17 07:59:02 -06:00
Joseph Hall
eaae71889d Merge pull request #15831 from ror6ax/devmap 
devmap module added
 2014-09-17 07:53:02 -06:00
Pedro Algarvio
32868c6561 Merge pull request #15858 from cvrebert/patch-1 
salt.output.nested: rm unused import of sys module
 2014-09-17 12:14:41 +01:00
Paul Tonelli
2c5da447b5 Adds a function to store/update dns serial numbers 
avoid manually updating the serial number of a
zone file each time the zone file changes.

Example use:

/etc/bind/example.com.zone.include:
  file.managed:
    - source: salt://dns/example.com.zone.include
    - template: jinja
    - user: root
    - group: root
    - mode: 644
    - require:
      - pkg: bind9
    - watch_in:
      - service: bind9

/etc/bind/example.com.zone:
  module.wait:
    - name: dnsutils.serial
    - update: True
    - zone: examplecom
    - watch:
      - file: /etc/bind/example.com.zone.include
  file.managed:
    - source: salt://dns/example.com.zone
    - template: jinja
    - require:
      - module: /etc/bind/example.com.zone

The include file contains all the dynamically generated zone data, the
example.com zone files is mostly static and has a serial number like:

{{ salt['dnsutils.serial']('examplecom') }}      ; serial number YYMMDDNN
 2014-09-17 11:12:58 +02:00
Pedro Algarvio
edd364c781 Merge pull request #15859 from cvrebert/patch-2 
salt.utils.process: rm duplicate import of signal module
 2014-09-17 08:05:33 +01:00
Jernej Kos
22191e61d5 Revert commit 1a90b5f. 2014-09-17 09:03:38 +02:00
Chris Rebert
59ada03b85 salt.utils.process: rm duplicate import of signal module 
************* Module salt.utils.process
salt/utils/process.py:9: [W0404(reimported), ] Reimport 'signal' (imported line 5)
 2014-09-16 23:15:36 -07:00
Chris Rebert
f19af1c786 salt.output.nested: rm unused import of sys module 
************* Module salt.output.nested
salt/output/nested.py:29: [W0611(unused-import), ] Unused import sys
 2014-09-16 23:13:51 -07:00
Jernej Kos
902a3d773b Fix salt-ssh return value handling. 2014-09-17 08:02:54 +02:00
ror6ax
e550590ac5 lint fixes, docstring at beginning of the file 2014-09-17 06:59:26 +01:00
Thomas Jackson
9e088931a5 Don't need to connect to the publish sockets, it will do that automatically when you ask for an event 2014-09-16 19:19:06 -07:00
Thomas Jackson
4aa63584e8 Make this a debug line, we see it a lot and don't really care :) 2014-09-16 18:16:44 -07:00
Thomas Jackson
4cacebda3d Fix regression in url encoded salt-api messages 
Most clients that do url encoding include other data in the Content-Type field (requests for example sets "application/x-www-form-urlencoded; charset=utf-8"). This changes the api to be a more forgiving server which will make any non-list struct a list
 2014-09-16 17:41:41 -07:00
Erik Johnson
111a09f2ad Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	salt/minion.py
	salt/output/nested.py
 2014-09-16 18:46:48 -05:00
Thomas Jackson
ff2a35f443 Make sure to not stall (just in case) 2014-09-16 16:25:40 -07:00
David Boucha
caccd64dc6 Merge pull request #15853 from terminalmage/buildpackage-el5 
Fix --define directive for Cent5 builds
 2014-09-16 17:21:14 -06:00
Erik Johnson
3f19d518fb Fix --define directive for Cent5 builds 2014-09-16 18:16:44 -05:00
Thomas Jackson
681ad81bcf Add "wait_for_kill" to process_manager to avoid join() stalling forever 2014-09-16 15:31:57 -07:00
Thomas S Hatch
c8b8cb3682 Merge pull request #15848 from cachedout/multimaster_opts 
Re-inject opts into modules under multi-master mode.
 2014-09-16 16:02:14 -06:00
Thomas Jackson
04ae99eca0 Add a comment explaining the except 2014-09-16 14:31:43 -07:00
Mike Place
e237179706 Re-inject opts into modules under multi-master mode. 2014-09-16 15:16:32 -06:00
Thomas S Hatch
4df1ba300c Merge pull request #15839 from jacksontj/develop 
Handle OSErrorin processmanager
 2014-09-16 15:05:07 -06:00
Thomas Jackson
e048935b70 An additional race condition in shutdown-- if the signal is sent to all children 2014-09-16 13:49:14 -07:00
Thomas S Hatch
de5c78ce9c Merge pull request #15843 from thatch45/ssh_version 
Add ssh version check
 2014-09-16 14:28:46 -06:00
Thomas Jackson
29110d0a92 Cleanup, the function name changed 2014-09-16 13:22:55 -07:00
Thomas Jackson
d31ee00522 Break on error, to avoid races and stuff 2014-09-16 13:16:20 -07:00
Thomas S Hatch
9849bf3dee Merge pull request #15841 from thatch45/random_audit 
Add some calls to systemrandom where it might be good to have a
 2014-09-16 13:55:49 -06:00
Colton Myers
8168230eab Merge pull request #15821 from rallytime/azure_cloud_tests 
Add Azure cloud provider tests
 2014-09-16 12:55:45 -06:00
Thomas S Hatch
12b9b52dcb Add some calls to systemrandom where it might be good to have a 
little better random data
 2014-09-16 12:37:49 -06:00
Thomas S Hatch
d1671943d7 Merge pull request #15840 from rallytime/fix_develop_tests 
Fix test failures on develop
 2014-09-16 12:30:38 -06:00
Thomas S Hatch
6e6a0ae420 Merge pull request #15838 from thatch45/random_fix 
Always use system random
 2014-09-16 12:24:40 -06:00
rallytime
064868b87a Fix test failures on develop 2014-09-16 12:23:06 -06:00
Thomas Jackson
cd965ffad1 Handle OSError, you will get this because the signal handler interrupts the systemcall to avoid traces like: 
```
Traceback (most recent call last):
  File "/usr/lib64/python2.6/multiprocessing/process.py", line 232, in _bootstrap
    self.run()
  File "/usr/lib64/python2.6/multiprocessing/process.py", line 88, in run
    self._target(*self._args, **self._kwargs)
  File "/home/thjackso/src/salt/salt/master.py", line 308, in run_reqserver
    reqserv.run()
  File "/home/thjackso/src/salt/salt/master.py", line 506, in run
    self.__bind()
  File "/home/thjackso/src/salt/salt/master.py", line 500, in __bind
    self.process_manager.run()
  File "/home/thjackso/src/salt/salt/utils/process.py", line 180, in run
    pid, exit_status = os.wait()
OSError: [Errno 4] Interrupted system call
```
 2014-09-16 11:17:30 -07:00
Thomas S Hatch
62b94b1e24 Always use system random 2014-09-16 11:43:25 -06:00
Thomas S Hatch
c85e889eb4 Add ssh version chgeck 2014-09-16 11:40:36 -06:00
Nitin Madhok
8d8b6522a8 Removing trailing whitespace 2014-09-16 12:58:59 -04:00
Nitin Madhok
a3f0f8269d Fix doc salt.states.file 2014-09-16 12:30:18 -04:00
Thomas S Hatch
b376633a3d Merge pull request #15826 from makinacorpus/b5 
Fix typo in salt call parsing
 2014-09-16 10:01:27 -06:00