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

33060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Gareth J. Greenaway
75dc54ebc8 Lint fixes. 2014-06-24 17:00:47 -07:00
C. R. Oldham
e4a40fd835 Make code tiny bit clearer, fix pylint. 2014-06-24 17:41:18 -06:00
Gareth J. Greenaway
49d72640f8 Adding test=True ability to schedule module and state. 2014-06-24 16:33:25 -07:00
Daniel Wallace
ac8b639853 remove argument from xdg_config_dir 
Closes #13699
 2014-06-24 18:20:11 -05:00
Seth House
71888c5930 Fixed saltnado syspaths var name; CONF_DIR -> CONFIG_DIR 
Fixes #13700
 2014-06-24 17:17:20 -06:00
Chris Rebert
796e47aaa7 modules.lxc.init(): rename exists=>does_exist to avoid shadowing 
************* Module salt.modules.lxc
salt/modules/lxc.py:794: [W0621(redefined-outer-name), init] Redefining name 'exists' from outer scope (line 1469)
 2014-06-24 16:01:17 -07:00
C. R. Oldham
88ebdd97d6 Revert _ext_nodes change. 2014-06-24 16:55:16 -06:00
Mike Place
e01becc217 Improve initial pillar doc 
I think the pillar intro was too light on details. Hopefully this makes
it easier to follow.
 2014-06-24 16:47:45 -06:00
Thomas S Hatch
2b16eea71c Merge pull request #13693 from mgwilliams/highstate-whitelist 
fix bugs in highstate whitelist, add tests
 2014-06-24 15:42:56 -06:00
Matthew Williams
45fadcf885 fix bugs in highstate whitelist, add tests 2014-06-24 17:38:53 -04:00
David Boucha
c6b64c13e7 fix misspelling 2014-06-24 15:32:56 -06:00
Mike Place
b760b0b342 Migrate minion to centralized exit codes 2014-06-24 15:29:52 -06:00
Nicolas Delaby
6c847b91c7 docker api > 1.9 2014-06-24 22:56:55 +02:00
rallytime
c482bf2e6c Update "Getting Started with Digital Ocean" docs to include ssh requirements 2014-06-24 14:47:00 -06:00
Joseph Hall
6eb8517d0d Merge pull request #13688 from rallytime/digitalocean_tests 
Fix digital ocean provider integration tests
 2014-06-24 14:36:40 -06:00
rallytime
c001f717a4 Fix digital ocean provider integration tests 2014-06-24 14:33:15 -06:00
Nicolas Delaby
1b3fc8de25 docker-py==0.3.2 already reads '~/.dockercfg' 
So drop its support

Fixes #13305
 2014-06-24 22:28:10 +02:00