Mike Place
5ef50d60cd
Merge pull request #28406 from rallytime/bp-28381
...
Back-port #28381 to 2015.5
2015-10-29 13:10:37 -06:00
Mike Place
30d5f7bbae
Merge pull request #28413 from rallytime/bp-28400
...
Back-port #28400 to 2015.5
2015-10-29 12:06:46 -06:00
Mike Place
f3e61db045
Merge pull request #28407 from DSRCompany/issues/24910_token_auth_fix_2014
...
Don't request creds if auth with key.
2015-10-29 10:12:30 -06:00
Krzysztof Pawłowski
ae1921b922
Do not execute _preflight_check if not_installed list is empty in _find_install_targets. Calling with empty list on rhel/centos cause execution of repoquery --whatprovides without pkg list which is memory consumptive task for host and also for red hat satellite server.
2015-10-29 12:08:17 -04:00
Erik Johnson
045d540aff
Merge pull request #28366 from erchn/fix_yumpkg_mod_repo_disabled
...
mark repo not enabled when pkgrepo state passes in disable: True
2015-10-29 09:55:54 -06:00
Dmitry Kuzmenko
b7b5bec309
Don't request creds if auth with key.
2015-10-29 18:32:58 +03:00
Jason Wolfe
e5322d2c44
Add FreeBSD detection for VirtualBox
2015-10-29 10:50:37 -04:00
Mike Place
3923f4a569
Merge pull request #28373 from beverlcl/fix-use_carrier-28372
...
Fixing bug #28372 for use_carrier option on bonding network interfaces.
2015-10-29 08:45:57 -06:00
Chris Beverly
32cffeceb6
Fixing bug #28372 for use_carrier option on bonding network interfaces.
2015-10-28 13:47:31 -07:00
Mike Place
e07e3f257b
Merge pull request #28359 from rallytime/bp-28358
...
Back-port #28358 to 2015.5
2015-10-28 14:43:04 -06:00
Ethan Erchinger
8187a4ce20
re-arrange things a bit to have less overall changes
2015-10-28 20:38:10 +00:00
Ethan Erchinger
f1d570ff18
move todelete above disabled check, add comment
2015-10-28 20:34:37 +00:00
Ethan Erchinger
64feec413f
also remove disabled key from repo_opts
2015-10-28 19:08:32 +00:00
Ethan Erchinger
2f2ebb7bb6
mark repo not enabled when pkgrepo state passes in disable: True
2015-10-28 18:48:06 +00:00
Arthur Lutz
9cacbf582b
docstring typo fix - list returners not runners
2015-10-28 12:40:28 -04:00
Mike Place
282be7ba5a
Merge pull request #28346 from twangboy/fix_installer
...
Fix installer
2015-10-28 08:21:34 -06:00
twangboy
f65e3e5275
Updated documentation to reflect the new parameter
2015-10-27 15:56:53 -06:00
twangboy
a0c5223554
Fixes #27923 and #28000
...
Fixed a bug where the installer wouldn't grab current config if the salt
service was stopped
Added a switch to start the salt service at the end
Switch works with both silent and GUI installs
/start-service=1 will start the service
/start-service=0 will not start the service
Default is to start the service
2015-10-27 15:43:22 -06:00
Colton Myers
7858f04ebc
Merge pull request #28315 from gwaters/update-pillar-doc
...
Adding a working example of setting pillar data on the cli
2015-10-27 09:27:49 -06:00
Gary Waters
b15285c0b4
adding a working example of setting pillar data on the cli
2015-10-26 14:22:38 -07:00
Mike Place
45305ccf29
Merge pull request #28211 from terminalmage/legacy_git_pillar-2015.5
...
Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch)
2015-10-26 08:14:02 -06:00
Pedro Algarvio
a6cc84c407
Merge pull request #28263 from cachedout/issue_26411-1
...
New channel for event.send
2015-10-26 14:07:06 +00:00
Mike Place
788e1463d8
Merge pull request #28293 from cachedout/fix_28271
...
Minor grammar changes
2015-10-26 06:15:42 -06:00
Mike Place
499ed8519b
Minor grammar changes to #28271
2015-10-26 06:15:19 -06:00
Mike Place
e178af0b90
Merge pull request #28271 from gwaters/update-tutorial-documentation
...
Update tutorial documentation
2015-10-26 06:12:37 -06:00
Justin Findlay
e3eff9b909
Merge pull request #28280 from 0xf10e/patch-1
...
Correct Jinja function load_* to import_*
2015-10-24 22:11:10 -06:00
Erik Johnson
0d6a4ac115
Remove non-functional test
...
This test was written using an incorrect assumption that the
pillar_roots key created during git_pillar execution lives any longer
than the run that compiles the git_pillar data for a given git_pillar.
2015-10-24 17:39:16 -05:00
Florian Ermisch
6d4316b0ac
Correct Jinja function load_* to import_*
...
Fixes #28248 .
Also added a YAML example because really, who wants to write json by hand? ;)
Don't know if this is mentioned in the pillar docs but would be very useful there, too.
2015-10-24 12:13:37 +02:00
Gary Waters
f96d39483d
updated the tutorial with gravyboat's suggestions
2015-10-23 17:09:49 -07:00
Gary Waters
b1f4a2bdf4
i think i changed the wrong header, updated to fix
2015-10-23 15:45:17 -07:00
Gary Waters
846b3aece1
I found you can not run the cp.push commands until after enabling the feature in the conf, so I wanted to update the docs so others who try these commands wont bump into the same issue I had.
2015-10-23 15:34:31 -07:00
Mike Place
3b880a5f07
New channel for event.fire_master
...
Stand up a new channel if using salt-call.
Refs #26411
2015-10-23 15:20:13 -06:00
Mike Place
29e9533aab
Stand up a new channel if using salt-call
...
Refs #26411
2015-10-23 13:04:11 -06:00
Mike Place
909fa3dc97
Merge pull request #28255 from cachedout/cli_opt
...
Add __cli opt
2015-10-23 12:44:30 -06:00
Mike Place
a2408157de
Add __cli opt
...
Allows us to know what CLI command we are operating under. Especially useful for detecting uses of salt-call
2015-10-23 12:42:00 -06:00
Mike Place
0fa094ae11
Merge pull request #28213 from rallytime/boto_route53_state
...
If record returned None, don't continue with the state. Something went wrong
2015-10-23 07:54:50 -06:00
Mike Place
1768014705
Merge pull request #28238 from basepi/fix.schedule.present.28217
...
[2015.5] Fix schedule.present always diffing
2015-10-23 07:31:32 -06:00
Colton Myers
087a8dc3c2
Only insert enabled if it's a dict
2015-10-22 19:45:56 -06:00
Colton Myers
5b49f41fab
Fix schedule comparison to adjust for 'enabled' being added in schedule.list
2015-10-22 16:43:38 -06:00
Colton Myers
2dc1226ab8
Build new item with 'enabled' if available
2015-10-22 16:42:12 -06:00
twangboy
69c32a663e
Fixed some lint
2015-10-22 11:24:38 -06:00
rallytime
237d64ff11
If record returned None, don't continue with the state. Something went wrong.
2015-10-22 11:20:00 -06:00
twangboy
638dec5027
Fixed some tests... let's see if they're really are
2015-10-22 11:05:22 -06:00
Erik Johnson
ab991d61d9
Fix for ext_pillar being compiled twice in legacy git_pillar code (2015.5 branch)
...
This is #28210 , opened against the 2015.5 branch. This will conflict
when merged forward (into 2015.8) because of the git_pillar rewrite, and
the 2015.8 side of the conflict should be kept in all conflicts.
2015-10-22 11:14:53 -05:00
Mike Place
bdd48c92de
Merge pull request #28174 from lorengordon/file-replace-multiline
...
Add support for multiline regex in file.replace
2015-10-22 08:02:42 -06:00
Loren Gordon
acdef2da60
Update docstrings with new guidance
2015-10-22 08:49:03 -04:00
Loren Gordon
0835b005b7
Use a test that makes the extra file read unnecessary
...
The previous test was:
* `has_changes = result != r_data.read(filesize)`
This test was validating that `result` is not the same as the contents
of the file. The only way for `has_changes` to become true at this
point in code would be if `pattern` exists in the file (`nrepl > 0`),
and if `pattern == repl`.
The new test just checks explicitly for this one condition,
eliminating the extra file read.
2015-10-22 07:54:03 -04:00
twangboy
5ed7a99792
Replaced instances of shutil.rmtree in file state
2015-10-21 17:46:37 -06:00
twangboy
2651ce509f
Fix file.remove for windows
...
The linux version used shutil.rmtree to remove directories. When this hits a
symlink directory in Windows, it removes actual files from the Source.
Created a recursive function to detect symlinks and remove them correctly in
Windows.
2015-10-21 17:13:54 -06:00
Loren Gordon
6d6121a6e5
Use flags when checking whether content was added previously
2015-10-21 16:55:26 -04:00
