Thomas S Hatch
a10e5ed01e
Fix issue where id was only assigned if there was no fqdn
...
Fix from #4422
2013-04-08 19:31:02 -06:00
Thomas S Hatch
3ee3100f7f
Merge pull request #4434 from jacksontj/develop
...
Adding default value for range_server in minion config
2013-04-08 14:03:07 -07:00
Thomas S Hatch
3a2c126e4f
Merge pull request #4435 from giantlock/develop
...
fix backtrace when environment empty
2013-04-08 14:02:33 -07:00
Thomas Jackson
f41b3397c7
Adding default value for range_server in minion config (this is for the range compound matcher, and any other range useage in the minion)
2013-04-08 13:42:59 -07:00
Denis Generalov
ca47ef75e8
fix backtrace when environment empty
2013-04-09 00:42:29 +04:00
Thomas S Hatch
39117a65c4
Fix #4427
2013-04-08 13:41:47 -06:00
Thomas S Hatch
924e374832
Strip out ec2 specific calls pending a better more generic solution
2013-04-08 12:03:33 -06:00
Thomas S Hatch
ab28a6a8cc
Merge pull request #4422 from ahammond/guess_id_from_ip
...
guess id from ip
2013-04-08 11:05:10 -07:00
Thomas S Hatch
e283d61f47
Merge pull request #4431 from giantlock/develop
...
fix #4429
2013-04-08 11:04:18 -07:00
Denis Generalov
90f88eb998
fix #4429
2013-04-08 20:37:38 +04:00
Andrew Hammond
2032055259
guess id from ip
2013-04-07 22:56:35 -07:00
Thomas S Hatch
e84677e6d0
Fix #4202
...
If pkg.install returns a string append it to the comment and make
sure changes is a dict
2013-04-07 23:40:12 -06:00
Thomas S Hatch
23b306ed64
Add check for changes to be a dict, still need to track down
...
the vialating state
2013-04-07 23:14:10 -06:00
Thomas S Hatch
5fb5060f78
Fix #4323
...
Add a try/except block around cache lookup since the cachedir might not be there
2013-04-07 21:55:58 -06:00
Thomas S Hatch
f30c6bef9b
Fix #4405
...
Now states will not run if errors are detected in the pillar.
This is a module layer abstraction and is not managed in the
compiler, meaning that anyone writing higher layer access to states
need to run this check manually.
The check can be bypassed via the force=True option for the
state.highstate, state.sls and state.top functions
2013-04-07 21:44:47 -06:00
Thomas S Hatch
3aa8b5d17b
Start work on #4405
...
This commit adds the errors to the pillar. The next step is to have
state runs fail if errors are found in the pillar.
2013-04-07 21:30:59 -06:00
Thomas S Hatch
ad85d619ad
Merge pull request #4419 from terminalmage/issue2783
...
Make pkg.installed state multiple-version aware
2013-04-07 19:59:58 -07:00
Thomas S Hatch
d5e4dec311
Fix #4417
...
This adresses the root of the problem, and ensures that the single
locaded module keeps the same context, shared with the standard
loaded modules
2013-04-07 20:55:52 -06:00
Joseph Hall
fe36487ccc
Merge pull request #4421 from terminalmage/docs
...
Add docs on installing w/easy_install
2013-04-07 17:29:42 -07:00
Erik Johnson
a0d0db6ed1
Add docs on installing w/easy_install
2013-04-07 17:05:31 -05:00
Joseph Hall
c2384ca587
Merge pull request #4420 from terminalmage/issue4321
...
Set osrelease grain on Solaris hosts
2013-04-07 13:36:31 -07:00
Erik Johnson
f2daa55c41
Set osrelease grain on Solaris hosts
...
This fixes #4321 .
2013-04-07 15:24:48 -05:00
Erik Johnson
333b584a53
Make pkg.installed state multiple-version aware
...
This commit uses the "versions_as_list" kwarg that was recently added,
so that version specification works as expected for instances where more
than one version of a package is installed.
This fixes #2783 .
2013-04-07 15:14:44 -05:00
Erik Johnson
6746c63740
Merge pull request #4416 from terminalmage/docs
...
Update renderer docs
2013-04-06 22:52:40 -07:00
Erik Johnson
a099d8df57
Update renderer docs
...
Remove reference to the python renderer being added in the future, as it
has been around for some time.
2013-04-07 00:51:19 -05:00
Erik Johnson
0942e4f7a5
Merge pull request #4415 from terminalmage/quickfix
...
Remove unnecessary MacOS metadata file
2013-04-06 22:47:56 -07:00
Erik Johnson
0d1a450e60
Remove unnecessary MacOS metadata file
2013-04-07 00:47:22 -05:00
Thomas S Hatch
e0066013f9
Merge pull request #4412 from dlindquist/develop
...
service.start salt-minion hangs from console on CentOS
2013-04-06 20:07:47 -07:00
Thomas S Hatch
0538794ac6
Merge pull request #4408 from terminalmage/docs
...
Add info on specifying a list of file sources
2013-04-06 20:04:02 -07:00
David Lindquist
73dc0874c2
service.start salt-minion hangs from console on CentOS
...
Fixes #4410
2013-04-06 14:59:28 -07:00
Erik Johnson
7a98dbc2d1
Add info on specifying a list of file sources
...
I was surprised to not find this described at all in the docs. It's an
awesome feature, I think.
2013-04-05 23:39:29 -05:00
Joseph Hall
94a30a1169
Merge pull request #4406 from timhollinger/develop
...
Changed to 3rd person
2013-04-05 18:07:20 -07:00
Tim Hollinger
c773fc115c
Changed to 3rd person
...
Changed to 3rd person
2013-04-05 18:56:42 -06:00
Thomas S Hatch
e16f0037ed
Merge pull request #4404 from basepi/sedfix4353
...
Rewrite "success" requirements for file.sed
2013-04-05 17:15:11 -07:00
Thomas S Hatch
3a9fad9f33
Add rediculously forgiving syntax to environment declarations
...
We need to find the docs and tell eveyone to NOT use the old =
FOO=BAR way and to use FOO: BAR so it sticks with the YAML
Fix #4325
2013-04-05 18:07:45 -06:00
Colton Myers
aed6c6a9b9
Fix file.sed so it at least checks the diff
...
If the 'before' pattern is found, and sed is run, but there is no
difference between the file before and after, then we return False.
2013-04-05 18:03:09 -06:00
Colton Myers
a33c890a07
Rewrite sed to not check the 'after' pattern; Fixes #4353
...
Sed is a stream editor. It doesn't have the ability to tell whether an
edit has already been made -- it just makes edits. Thus, we no longer
check if the 'after' pattern is present. If the 'before' pattern is
present, we run the sed command and return True. If the 'before'
pattern is not present, we say so and return True (because it probably
just means sed has been run already in a previous state.highstate).
This makes it so backreferences now work without returning False on
subsequent runs.
2013-04-05 18:03:09 -06:00
Colton Myers
8bfc91ed3b
Clean up some PEP8 and unused variables
...
Yes, I was very careful to make sure the unused variables were
*actually* unused.
2013-04-05 18:03:09 -06:00
Colton Myers
9f4ce7b38a
Add new debug log for "Missing Args" exceptions
2013-04-05 18:00:08 -06:00
Thomas S Hatch
2ff8e8ee20
Merge pull request #4403 from timhollinger/develop
...
minor fixes
2013-04-05 16:42:17 -07:00
Tim Hollinger
246a411178
minor change
...
s/to/as line 6
2013-04-05 17:41:39 -06:00
Tim Hollinger
50917223c2
minor fixes
...
Fixed Debian / Redhat httpd
2013-04-05 17:25:46 -06:00
Thomas S Hatch
bd06c18c2e
Add test.provider function.
...
This function will return the name of the provider for any given
module, so to discover the package provider:
salt '*' test.provider pkg
Fix #4375
2013-04-05 16:59:14 -06:00
Thomas S Hatch
474cb7c76a
Add VALID_PROTO info to pip module, REALLY fix #4378
2013-04-05 16:45:35 -06:00
Thomas S Hatch
3d4a326a6e
use salt.utils.valid_url for pip module
...
Fix #4378
2013-04-05 16:42:36 -06:00
Thomas S Hatch
d907ae1ca5
Merge pull request #4401 from cvrebert/patch-1
...
fix terminology: "PEP 8" the document; "pep8" the script
2013-04-05 15:33:31 -07:00
Chris Rebert
878e63d331
fix terminology: "PEP 8" the doc; "pep8" the script
...
PEPs aren't normally referred to with a dash (e.g. "PEP-8"), but rather with a space.
(Note how PEPs cross-reference each other.)
"PEP-08" is completely nonstandard.
Python 2 PEPs run into the triple-digits; Python 3 PEPs are/were 4-digit (3xxx).
So padding it to 2 digits is completely weird.
2013-04-05 15:28:24 -07:00
Thomas S Hatch
2c0f79df57
Add valid_url function
2013-04-05 16:09:17 -06:00
Thomas S Hatch
d13493cc6a
Merge pull request #4400 from basepi/supgroups
...
Compare sorted supplemental groups
2013-04-05 15:12:16 -07:00
Colton Myers
7bc7900f93
Compare sorted supplemental groups
2013-04-05 15:53:41 -06:00
