Thomas S Hatch
ce28ee1b89
Merge pull request #16890 from rallytime/bp-16798
...
Backport #16798 to 2014.7
2014-10-24 16:35:09 -06:00
Mike Place
0492e84130
Catch error conditions in quota.get_mode
...
Closes #16381
2014-10-24 16:34:56 -06:00
Thomas S Hatch
e8738638f5
Merge pull request #16886 from techhat/filemap
...
Add file_map to salt.utils.cloud.bootstrap-enabled providers
2014-10-24 16:33:40 -06:00
Tanoti
6858ce751d
Fixed invalid archive type error message, was reporting 'name' not 'archive_format'
2014-10-24 16:31:17 -06:00
Henrik Holmboe
0e772aefe7
Update conf.py as well
2014-10-24 16:27:37 -06:00
Henrik Holmboe
1fc008bf25
Point to the correct latest 2014.1.13 release
...
This is recurring and #12720 is tracking the issue.
Conflicts:
doc/topics/releases/index.rst
2014-10-24 16:27:11 -06:00
rallytime
617d777fa9
Release notes for 2014.1.13
2014-10-24 16:22:53 -06:00
Thomas S Hatch
c12dc911b2
Merge pull request #16841 from isbm/salt-zypper
...
Package lock management support for Zypper
2014-10-24 16:16:20 -06:00
rallytime
f94cf6ad68
Change profile name for Digital Ocean cloud tests
...
Digital Ocean changed their image-naming scheme. This should fix the failing tests.
2014-10-24 16:14:02 -06:00
Thomas S Hatch
0fed446cd4
Merge pull request #16877 from jasonrm/fix/digitalocean-list-images
...
Fix salt-cloud list-images for DigitalOcean images
2014-10-24 16:05:29 -06:00
Thomas S Hatch
d40d675b3e
Merge pull request #16812 from syphernl/fix/tomcat_tabstrip
...
Strip off tabs for tomcat version calls
2014-10-24 16:03:23 -06:00
Thomas S Hatch
c6718fc373
Merge pull request #16884 from terminalmage/issue16874
...
Install repoquery if not present on yum-based distro
2014-10-24 16:02:04 -06:00
Thomas S Hatch
ce21d6ea4a
Merge pull request #16881 from jacksontj/2014.7
...
Fixes for Syndic
2014-10-24 16:01:23 -06:00
vs
6f85a95ea5
only add mine.update to schedular if function is available
2014-10-24 15:59:42 -06:00
Mike Place
ab0b45cab7
Avoid key error in connected_ids()
...
Continue through the loop if we could't access the grains instead of
crashing and burning.
Closes #15143
2014-10-24 15:55:58 -06:00
Thomas Jackson
3438db0a0e
Fix for #16888
...
We can't set the default value to something if you want the config to be relative to cachedir.
Since there is already code in apply_minion_config to take care of this we remove this, meaning now that if you set cachedir it won't break these
2014-10-24 14:49:49 -07:00
Samuel Smith
a2d77c4f87
Merge pull request #16887 from SmithSamuelM/sam_dev1
...
Added partial support for Multi-Master in Raet
2014-10-24 15:43:41 -06:00
Samuel M Smith
acf381e307
Fixed pylint warnings
2014-10-24 15:40:39 -06:00
Samuel M Smith
8ea8881ef2
Merge remote-tracking branch 'upstream/develop' into sam_dev1
2014-10-24 15:31:04 -06:00
rallytime
19d70dfac5
Added another test to module.run state unit tests
2014-10-24 15:28:03 -06:00
Joseph Hall
79c3e1e0dc
Add file_map to salt.utils.cloud.bootstrap-enabled providers
2014-10-24 15:24:02 -06:00
Thomas Jackson
bd4c3ba583
Cleanup all other returners to handle the new passed_jid argument
2014-10-24 14:17:58 -07:00
Erik Johnson
d1e867c718
Remove known issue comment for salt-ssh
2014-10-24 16:16:33 -05:00
Erik Johnson
bfc64130d9
Add notice on automatic installation of repoquery
2014-10-24 16:16:27 -05:00
Erik Johnson
706f53941b
Add notice on automatic installation of repoquery
2014-10-24 16:15:48 -05:00
Erik Johnson
ff851cffb6
Install repoquery if not present on yum-based distro
...
Resolves #16874 .
2014-10-24 15:50:31 -05:00
Thomas Jackson
ef9b54672e
Fix for #16825
...
In the case that you are a lower level master (under a syndic) we weren't calling prep_jid, which meant that the job wasn't initialized in the cache. Now we call prep_jid all the time, optionally with a jid passed in. This way the master can ensure that it is ready to store information about this jid when it goes further down the track (ret, save_load, etc.)
2014-10-24 13:19:26 -07:00
Thomas Jackson
def11a2128
Fix event forwarding, someone (during refactoring?) had removed registering the event socket to the poller, which meant that the syndic would never forward events
2014-10-24 13:16:26 -07:00
Jason R. McNeil
21806091d3
Correctly detect additional pages in DigitalOcean API v2
2014-10-24 09:05:21 -07:00
Jason R. McNeil
88e0fd64f5
Use the image id as name is not unique for DigitalOcean images.
2014-10-24 08:54:40 -07:00
Joseph Hall
79dacabf18
Merge pull request #16875 from rallytime/release_notes
...
Added updates to 2014.7.0 release notes
2014-10-24 09:34:29 -06:00
rallytime
b90ba8cf4e
Added updates to 2014.7.0 release notes
2014-10-24 09:29:13 -06:00
rallytime
f6490e9572
Add initial unit tests for module.run state function
2014-10-24 08:56:40 -06:00
Bo Maryniuk
4586d73bc1
Get known package patterns, available in Zypper repos
2014-10-24 15:28:24 +02:00
Frank Klaassen
9da4500e7f
fix lstrip
2014-10-24 14:40:29 +02:00
Bo Maryniuk
72724a529f
Moved file ownership by a package to the lowpkg module.
2014-10-24 14:00:37 +02:00
Bo Maryniuk
396f4054f9
Added file operations for the package management
2014-10-24 13:43:43 +02:00
Bo Maryniuk
7baecf346b
Add package verification
2014-10-24 13:15:31 +02:00
Bo Maryniuk
4fc90923cc
Enable RPM support for SUSE family
2014-10-24 13:14:58 +02:00
Bo Maryniuk
646a571c15
Fix pylint issues.
2014-10-24 12:22:17 +02:00
Thomas S Hatch
50d51e76e0
Merge pull request #16863 from jasonrm/feature/all-tools-saltfile
...
Add the `SaltfileMixIn` to all CLI tool parsers.
2014-10-23 20:48:16 -06:00
Damian Myerscough
d1e9a7c080
Initial drac management
2014-10-23 19:33:51 -07:00
Steven Butterworth
b4a8e8f918
Provide the ability to pass environment variables into pip build process
2014-10-23 22:17:57 -04:00
Thomas S Hatch
3dda426d68
Merge pull request #16862 from thatch45/raet_intro
...
Raet intro
2014-10-23 19:54:45 -06:00
Samuel M Smith
0f7b42705a
Added support for 'raet_clear_remotes' opt in RoadStack setup and Minion Join behaviors
2014-10-23 19:01:57 -06:00
Jason R. McNeil
7b3d76b269
Add the SaltfileMixIn to all CLI tool parsers.
2014-10-23 17:52:14 -07:00
Thomas S Hatch
e9b29ea3e6
Redirect tot he correct page
2014-10-23 18:24:32 -06:00
Samuel M Smith
1fdc8012ad
Change raet_join_fresh to raet_clear_remotes
...
as more descriptive of what really happens
2014-10-23 18:20:05 -06:00
Thomas S Hatch
910991a468
update raet intro
2014-10-23 18:15:24 -06:00
Samuel M Smith
f1f580ad08
Added 'raet_join_fresh' to opts
...
If TRUE when RoadStack starts up it blows away persisted remotes
If FALSE then it uses its persited remotes
On a minion this means that if TRUE it will use the opt 'master' to determine which masters
to join to Otherwise it will join to preexiting masters it joined to last time it ran.
On a master this means that if TRUE it forgets all the minions and they must rejoin
If FALSE it will start using presence on all preexisting minions
2014-10-23 17:55:07 -06:00
