valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
33,293 Commits 24 Branches 182 Tags 341 MiB
1cd95aa0c8
Commit Graph

33293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
e61d9bf805 Merge pull request #13734 from lyft/s3-fix-for-headers 
Remove extra headers attribute from S3 util
 2014-06-25 13:37:05 -06:00
Ryan Lane
6926912d39 Fix incorrect already running to already started message check for supervisord 2014-06-25 14:34:02 -05:00
Ryan Lane
942721629a Remove extra headers attribute from S3 util 2014-06-25 14:28:25 -05:00
Aditya Kulkarni
3a59cbf9cb Add regression test for master_tops 2014-06-25 14:53:11 -04:00
Nicolas Delaby
b74b677819 Since we do not support older versions of docker-py than 0.3.2 
We can remove this backward compatibility error handler
 2014-06-25 20:32:00 +02:00
Gareth J. Greenaway
a46d44694f Adding the ability to manage hosts in /etc/hosts will multiple IP addresses, eg. both IPv4 and IPv4. Also added validation to ensure a valid IP address is only added. 2014-06-25 10:53:36 -07:00
David Boucha
502d9c895d Merge pull request #13725 from techhat/codeblocks 
Fixing styles of code-blocks
 2014-06-25 17:51:01 +00:00
Thomas S Hatch
e8b0681f50 Fist fix for #13726 2014-06-25 11:41:01 -06:00
Joseph Hall
0eb4fe13e1 Fixing styles of code-blocks 2014-06-25 11:20:05 -06:00
Erik Johnson
d726c2f48a Add additonal unit tests for pull request #13713 2014-06-25 11:52:02 -05:00
Erik Johnson
77a399908c Fix embedded data structure matches 
This fixes 2 issues introduced in 428bd43:

1. When traversing too far into a multi-level dict and a bare string is
   reached, trying to index it with the next dict level in the path
   expression results in an uncaught TypeError (caught by unit tests).

2. Continuing the match once a match is found in a dict embedded in a
   list fails (not caught by unit tests, new test(s) forthcoming).
 2014-06-25 11:44:09 -05:00
Thomas S Hatch
e73273dc14 Lint spacing fixes 2014-06-25 10:03:50 -06:00
Joseph Hall
f0ef36fd8f Merge pull request #13723 from mgwilliams/whitelist-docstring 
add whitelist to docstring for state.highstate
 2014-06-25 09:45:58 -06:00
Matthew Williams
9978c52ae5 add whitelist to docstring for state.highstate 2014-06-25 11:43:24 -04:00
Joseph Hall
1324138d7c Merge pull request #13722 from eykd/patch-1 
Capitalize 'Id' in image_infos
 2014-06-25 09:34:36 -06:00
David Eyk
bc255fe859 Capitalize 'Id' in image_infos 
This fixes a false negative result when the docker image has already been built.
 2014-06-25 08:32:54 -07:00
vs
d90d9d4208 correctly check for verify_master_pub_sign when no key accepted before 2014-06-25 08:12:19 -07:00
vs
f54b90b07c pylinting, better log messages, docstrings, no logic changes 2014-06-25 06:26:01 -07:00
vs
ebeb688d8c remove unneeded re import 2014-06-25 06:05:06 -07:00
vs
08bfddbf11 fix event-cal to be correct dict 2014-06-25 06:01:03 -07:00
vs
ed437c5e7c track connected status and re-init subsystems on new master 
keep track of self.connected and re-init the zmq-context, poller and
socket, if connecting to a new master
 2014-06-25 05:59:55 -07:00
vs
c818dfd009 make function more flexible and work with different master-ips and status 2014-06-25 04:34:16 -07:00
vs
1a656859bd cleanup old sreqs if the master changed 
Jumping back and forth between different masters will over time add more
and more sreqs to the sreq_cache. That might be ok in MultiMaster, with
signed master-pubkeys, we only want one single master sreq we re-use and
remove all the others.
 2014-06-25 04:24:04 -07:00
vs
decbe41612 verify master pubkey signature on first pubkey connection 
previously the minion would take any master pubkey for granted and
write it to minion_master.pub.
 2014-06-25 00:57:22 -07:00
vs
c447bd0847 Merge remote-tracking branch 'upstream/develop' into sign_master_keys 2014-06-25 00:12:36 -07:00
Thomas S Hatch
d5504945e8 Merge pull request #13718 from christabor/syntax-labels 
Add new styles for code blocks
 2014-06-25 00:08:48 -06:00
Thomas S Hatch
e4566371fa Merge pull request #13717 from bhepple/patch-1 
Update salt-minion
 2014-06-25 00:05:41 -06:00
Thomas S Hatch
549b6d7476 Merge pull request #13715 from jacksontj/develop 
Add more descriptive names to the process
 2014-06-25 00:04:24 -06:00
christobot
9786fe45d6 Add new styles for code blocks - addresses #13215 2014-06-24 22:30:09 -07:00
bhepple
ed3166990c Update salt-minion 
On our RHEL5 systems we're getting 2 and sometimes 3 or more salt-minions started. Somehow the check on /var/run/salt-minion.pid doesn't prevent this.

This patch stops the registered process and kills any further salt-minion processes, first trying -TERM and then -KILL signals.

It may be that other distros would like to use this same logic to tidy up, in which case the new code can be moved into place as appropriate.
 2014-06-25 14:58:02 +10:00
Thomas Jackson
ea5455e89a Add more descriptive names to the process (so you can tell which one is which in ps) 
- Add appendproctitle utils function
- Change master processes to call said function
 2014-06-24 20:47:25 -07:00
Thomas S Hatch
fef9dc6984 Merge pull request #13712 from allanhung/develop 
fix nodegroup_comp func
 2014-06-24 21:35:07 -06:00
Thomas S Hatch
1a92cec9f1 Merge pull request #13707 from garethgreenaway/schedule_module_test 
Adding test=True ability to schedule module and state.
 2014-06-24 21:34:16 -06:00
Thomas S Hatch
5abf54331e Merge pull request #13706 from whiteinge/saltnado-conf-dir-syspath 
Fixed saltnado syspaths var name; CONF_DIR -> CONFIG_DIR
 2014-06-24 21:33:39 -06:00
Thomas S Hatch
12509bc22a Merge pull request #13705 from gtmanfred/develop 
remove argument from xdg_config_dir
 2014-06-24 21:32:06 -06:00
Thomas S Hatch
591efba4a7 Merge pull request #13704 from hulu/lxc-shadow 
modules.lxc.init(): rename exists=>does_exist to avoid shadowing
 2014-06-24 21:31:22 -06:00
Thomas S Hatch
caf8c4094a Merge pull request #13701 from cachedout/pillar_doc_brushup 
Improve initial pillar doc
 2014-06-24 21:30:49 -06:00
Thomas S Hatch
f91df44c22 Merge pull request #13692 from UtahDave/fix_spelling 
fix misspelling
 2014-06-24 21:28:41 -06:00
Thomas S Hatch
35f21641a8 Merge pull request #13691 from cachedout/exit_codes 
Migrate minion to centralized exit codes
 2014-06-24 21:28:00 -06:00
Thomas S Hatch
b7542481f4 Merge pull request #13690 from ticosax/docker=1.0 
Docker=1.0
 2014-06-24 21:27:23 -06:00
Thomas S Hatch
22c3588c24 Merge pull request #13689 from rallytime/digital_ocean_docs 
Update Digital Ocean docs to include ssh_key_file requirements
 2014-06-24 21:24:23 -06:00
Thomas S Hatch
cbb8442a63 Merge pull request #13685 from bechtoldt/chmod_ssh_known_host 
chmod ssh known hosts file in set_ssh_known_host (salt.modules.ssh)
 2014-06-24 21:21:08 -06:00
Thomas S Hatch
5270cb7c90 Merge pull request #13679 from garethgreenaway/sysmod_work 
Adding state docstring to the state_doc function output.
 2014-06-24 21:13:42 -06:00
allan
cddc1c8397 fix nodegroup_comp func 2014-06-25 10:44:23 +08:00
Erik Johnson
428bd43af4 Allow traversing dicts nested with lists when matching 2014-06-24 21:42:31 -05:00
Thomas S Hatch
ba331043e0 Merge pull request #13666 from babilen/issues/#13665 
Revert "Add master local ip mapping to minion id checking"
 2014-06-24 20:21:32 -06:00
Thomas S Hatch
160467ea1f Merge pull request #13618 from whiteinge/cmd-event-returns 
Switch LocalClient().cmd() to watch returns same as Salt's CLI
 2014-06-24 20:18:48 -06:00
Thomas S Hatch
8a543e8d1c Merge pull request #13686 from cro/ext_nodes_fail2 
Fix ext_nodes breakage
 2014-06-24 20:13:27 -06:00
Erik Johnson
bc7de93615 Merge pull request #13711 from cachedout/dict_policy 
Formalize a policy for initializing dictionaries.
 2014-06-24 19:36:44 -05:00
Mike Place
915570f045 Formalize a policy for initializing dictionaries. 2014-06-24 18:35:13 -06:00