valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,929 Commits 24 Branches 182 Tags 341 MiB
53e0b56b13
Commit Graph

65929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
kstreee
f56a551a22 [saltstack/salt#31194] Fix issue of running multiple salt-api instances. 
- Change return value from 'True' to '__virtualname__' in rest_cherrypy/__init__.py
The __virtualname__ value must be set as name of salt-api instance, thus the code try to get the instance name from __init__.py's directory name.
- Change setting __virtualname__ logic because the rest_tornado has a same issue with the rest_cherrypy.
- Typo, 'orig_sesion' to 'orig_session' in rest_cherrypy/app.py
 2016-02-18 12:02:39 +09:00
Mike Place
e36a53e05e Merge pull request #31161 from papoyan/develop 
added a feature to hash a password if provided as clear text
 2016-02-16 19:24:32 -07:00
Mike Place
11bcac2635 Merge pull request #31246 from cachedout/document_31218 
Document new functionality for packaging external modules
 2016-02-16 19:23:57 -07:00
Papoyan, Nerses
3e122d2b13 changed the comments to make it clear what it does 2016-02-16 16:50:33 -06:00
Mike Place
45c37ccdae Merge pull request #31192 from shpsec-david/selinux-mode-toggle 
Selinux mode toggle
 2016-02-16 11:37:26 -07:00
Mike Place
40c03425f2 Merge pull request #31242 from rallytime/doc-onfail-change 
Document onfail requisite bugfix behavior change
 2016-02-16 11:36:52 -07:00
Mike Place
93f84fe942 Document new functionality for packaging external modules 
Refs #31218
 2016-02-16 11:23:33 -07:00
rallytime
8e3fd82718 Document onfail requisite bugfix behavior change 
Refs #22370 and #31235
 2016-02-16 10:44:42 -07:00
Mike Place
ce3b4ed6e4 Merge pull request #31218 from s0undt3ch/features/entry-points 
Allow loading external modules using setuptools entry points
 2016-02-16 10:41:51 -07:00
u425
ddbed636c0 fixing spacing lint error 2016-02-16 09:31:22 -08:00
Mike Place
70637d0beb Merge pull request #31235 from DSRCompany/issues/22370_trigger_onfail_with_or_logic 
Trigger onfail state if any target failed
 2016-02-16 10:17:58 -07:00
Mike Place
c1f2d33bce Merge pull request #31204 from ydupont/develop 
Add writing cloud cache to nova
 2016-02-16 10:02:40 -07:00
Mike Place
cb0a8017b2 Merge pull request #31187 from Ashald/patch-1 
Full control over client options in Consul pillar
 2016-02-16 09:51:26 -07:00
Mike Place
743240731f Merge pull request #31207 from thusoy/boto-missing-lib-logging 
Remove error logging of missing boto libraries
 2016-02-16 09:36:13 -07:00
Mike Place
405d0aef1c Merge pull request #31184 from cachedout/document_consul_change 
Document change in consul pillars
 2016-02-16 09:11:52 -07:00
Tarjei Husøy
6a7e516d7a Remove error logging of missing boto libraries 
Current behavior always error logs, even if the module is not going to
be used. The loader will raise a proper error if it's attempted
accessed without having loaded properly anyway, and if that happens I'm
assuming you'll turn on debug logging and look for the cause. The
loader also logs which modules are not loaded and their reason, thus
there's no point in repeating the module name in the error message.
 2016-02-16 07:46:37 -08:00
Mike Place
3b6646c63b Merge pull request #31195 from garethgreenaway/30994_develop_beacon_add_failing_and_other_fixes 
30994 develop beacon add failing and other fixes
 2016-02-16 08:45:35 -07:00
Mike Place
06c7a72843 Merge pull request #31215 from eyj/pr-locale-gen 
Remove charmap from locale-gen argument on Ubuntu (fixes #31214)
 2016-02-16 08:40:16 -07:00
Mike Place
0d0c2f539e Merge pull request #31213 from jbonachera/develop 
ini_manage dry-run time optimisation
 2016-02-16 08:26:06 -07:00
Mike Place
79fd317ee8 Merge pull request #31230 from khorben/khorben/netbsd-sockstat 
Use sockstat(1) on NetBSD
 2016-02-16 08:24:18 -07:00
Dmitry Kuzmenko
187da2c3aa Trigger onfail state if any target failed 
Previously onfail used AND logic, so it triggered the onfail state
only if all targets failed. This fix changes the logic to trigger
onfail state if ANY of targets is failed.
 2016-02-16 16:00:37 +03:00
Gareth J. Greenaway
9bd784a1f1 some beacons are using the validate functions to ensure they're able to run, make sure they're handling the return data correctly. Tests for adb beacon rely on certain information being logged, adding those back in. 2016-02-15 19:31:13 -08:00
Pierre Pronchery
d0c229995f Use sockstat(1) on NetBSD 2016-02-16 02:32:14 +01:00
Gareth J. Greenaway
c588803bb6 lint issues, unreachable code. 2016-02-15 10:19:00 -08:00
C. R. Oldham
15f5ae7454 Merge pull request #31180 from rallytime/merge-forward-develop 
Merge branch '2016.3' into 'develop'
 2016-02-15 09:35:46 -07:00
Joseph Hall
5d123e60c7 Merge pull request #31186 from Ashald/patch-3 
Consul SDB driver
 2016-02-15 09:14:08 -07:00
Pedro Algarvio
4d3c13b88c Allow loading external modules using setuptools entry points 2016-02-15 12:38:27 +00:00
EYJ
ab79b5763c Remove charmap from locale-gen argument on Ubuntu (fixes #31214) 2016-02-15 11:01:17 +01:00
Julien BONACHERA
c44a7ce644 ini_manage dry-run time optimisation 
Preload all the INI section in options_present and options_absent,
instead of calling ini.get_option() for each managed option.
Fixes #31154
 2016-02-15 10:09:37 +01:00
Borys Pierov
073f8f2dc8 Consul SDB driver 
A simple SDB driver for Consul. Allows full control over all client options.
 2016-02-15 00:47:47 -05:00
Borys Pierov
d044078204 Full control over client options in Consul pillar 2016-02-15 00:37:31 -05:00
Yves Dupont
21a5341d99 formatting fix 2016-02-14 13:25:21 +01:00
Yves Dupont
27cc5e1070 fixed misplaced change 2016-02-14 12:45:19 +01:00
Yves Dupont
adc7b7f3e4 Add writing cloud cache to nova 
Add writing cloud cache to nova when creating or destroying vms
 2016-02-14 12:15:12 +01:00
Gareth J. Greenaway
9c4dbadaa7 removing unneeded import for logging 2016-02-12 22:15:00 -08:00
Gareth J. Greenaway
a8eb591ba1 Adding #31152 to develop. Adding updates to beacons in develop. 2016-02-12 21:41:19 -08:00
Gareth J. Greenaway
fa1310c651 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. 
Signed-off-by: Gareth J. Greenaway <gareth@wiked.org>
 2016-02-12 21:09:48 -08:00
rallytime
acc7a5f9ff Add broadcast_change function from 2016.3 from #30800 2016-02-12 15:21:46 -07:00
Mike Place
4cc033f8b9 Document change in consul pillars 
Refs #31165
 2016-02-12 15:13:53 -07:00
Mike Place
afdcc8126d Merge pull request #31165 from ketzacoatl/strip-whitespace-from-consul-ext-pillar 
strip whitespace from pillar keys looked up in consul
 2016-02-12 15:11:44 -07:00
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
 2016-02-12 14:38:50 -07:00
Papoyan, Nerses
94633f5664 combined password and hash_password checks. 2016-02-12 15:22:15 -06:00
Papoyan, Nerses
c828324964 changed the prefix of the comments 2016-02-12 12:44:38 -06:00
Mike Place
b7d19d0208 Merge pull request #31164 from DSRCompany/issues/29643_fix_invalid_redcode 
Issues/29643 fix invalid redcode
 2016-02-12 11:28:55 -07:00
Mike Place
d2f7c1e2a7 Merge pull request #31168 from rallytime/bp-31164 
Back-port #31164 to 2016.3
 2016-02-12 11:26:55 -07:00
Mike Place
09ef49bc3c Merge pull request #31144 from UtahDave/service_delete2 
Delete a service on rhel6
 2016-02-12 11:25:05 -07:00
Mike Place
225a99aa9b Merge pull request #31138 from rallytime/bp-31116 
Back-port #31116 to 2016.3
 2016-02-12 11:24:51 -07:00
Colton Myers
4799bbf095 Merge pull request #31151 from basepi/merge-forward-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-02-12 11:07:36 -07:00