Commit Graph

55732 Commits

Author SHA1 Message Date
Mike Place
bcd91a9ecb Merge pull request #25245 from jdsieci/rh_int_conf_opts
Added new options for RH interface configuration
2015-07-13 15:16:11 -06:00
Mike Place
2989a35a52 Merge pull request #25385 from nmadhok/patch-2
Fix issue where KeyError is being raised for VM's in inaccessible state
2015-07-13 15:02:53 -06:00
Nitin Madhok
65ca2edc3f Fix issue where KeyError is being raised for VM's in inaccessible state 2015-07-13 16:51:09 -04:00
Mike Place
ad0e40d9a1 Merge pull request #24422 from bechtoldt/refactor_es_modules
Refactor Elasticsearch integration
2015-07-13 14:46:10 -06:00
Mike Place
3563894d03 Merge pull request #25377 from rallytime/refactor_open_nebula
Refactor/Update Open Nebula Cloud Driver
2015-07-13 14:43:06 -06:00
Mike Place
9a7c51c4d8 Merge pull request #25380 from sbraverman/docs-external_pillar
Updates documentation for external_pillar - example on how to use
2015-07-13 14:10:44 -06:00
Mike Place
dee9263bba Merge pull request #25256 from Rafflecopter/patch-2
Dont assume source_hash exists
2015-07-13 14:09:48 -06:00
rallytime
7fbc658710 Fix user:password strings 2015-07-13 13:19:11 -06:00
Steven Braverman
09c0c9c64e Updates documentation for external_pillar - example on how to use 2015-07-13 11:56:28 -07:00
Mike Place
86b19adb5a Merge pull request #25374 from cachedout/remove_kwargs_sqlite
Remove unecessary kwargs
2015-07-13 12:40:05 -06:00
Mike Place
b8b57d8fec Merge pull request #25378 from cachedout/lint_network
Lint #25165
2015-07-13 12:23:41 -06:00
Mike Place
f2cb999482 Lint #25165 2015-07-13 12:22:36 -06:00
Mike Place
ed3d1471b1 Merge pull request #25165 from pcdummy/noifupdown
Add the posibility to skip the reconfiguration of network interfaces
2015-07-13 12:21:41 -06:00
rallytime
fbf66af349 Pylint 2015-07-13 11:51:52 -06:00
Mike Place
3ef96ec381 Merge pull request #25261 from garethgreenaway/manage_reactors
Salt runner to manager Reactors
2015-07-13 11:17:28 -06:00
Mike Place
cebbfa9433 Merge pull request #25305 from gtmanfred/develop
update novaclient to use the new v2 if available
2015-07-13 11:13:52 -06:00
Mike Place
31d7d18277 Merge pull request #25376 from cachedout/lint_service
Lint fix
2015-07-13 11:06:03 -06:00
Mike Place
2b3b02e4a7 Lint fix 2015-07-13 11:04:59 -06:00
Mike Place
5b61b9763b Merge pull request #25313 from arthurlogilab/patch-8
[documentation] add documentation for mod_watch
2015-07-13 11:04:21 -06:00
Mike Place
72b673ff46 Merge pull request #25343 from benjamin-bergia/benjamin-bergia-patch-1
Add a method context containing the path
2015-07-13 11:00:05 -06:00
rallytime
b963e975be opennebula.destroy - provide more useful output rather than just node id 2015-07-13 10:58:17 -06:00
Mike Place
3e7a50602d Merge pull request #25365 from Ryanl92/grain_crash
Fix init_bin being None from #20124 + #24531
2015-07-13 10:58:08 -06:00
rallytime
c8349a11e6 Update docs for is_profile_configured 2015-07-13 10:58:08 -06:00
rallytime
28c090ccb7 Don't require opennebula profiles to have a size 2015-07-13 10:58:00 -06:00
Mike Place
4341e0f461 Versionadded 2015-07-13 10:56:53 -06:00
rallytime
ee288614bd Refactor and update OpenNebula cloud driver 2015-07-13 10:55:20 -06:00
Mike Place
63b47cfc07 Remove unecessary kwargs 2015-07-13 10:43:48 -06:00
Mike Place
55a9390270 Merge pull request #25338 from mikelodder7/develop
Create sqlite3.py
2015-07-13 10:41:37 -06:00
Mike Place
041f9f718a Merge pull request #25361 from tedski/25297-refresh_pillar_in_sync_all
perform `refresh_pillar` as part of `sync_all` when `refresh=True`
2015-07-13 10:36:08 -06:00
Mike Place
679741dfb6 Merge pull request #25370 from DSRCompany/minion.tok_fix
Fix: minion doesn't set tok property in masters list case.
2015-07-13 09:55:42 -06:00
Nicole Thomas
5d4bdb191b Merge pull request #25289 from krak3n/fix/boto_sns_cred_subscription
Fix: Boto SNS - Auth Basic Endpoint Compare
2015-07-13 08:36:27 -06:00
Nicole Thomas
049bbaddff Merge pull request #25355 from kaidokert/develop
EC2 cloud: Fix another availability zone mismatch
2015-07-13 08:32:20 -06:00
Dmitry Kuzmenko
7430c6d71f Fix: minion doesn't set tok property in masters list case. 2015-07-13 17:13:58 +03:00
Ryan Lewis
2db37fb19d Fix init_bin being None from #20124 + #24531
When the minion is run as a user without privelidge to see the init
binary the minion will not start. i.e. normal user and init is in /sbin/
 #24531 removed some paths from PATH which caused this to error in
 develop, if it is backported this should be as well.
2015-07-13 21:51:00 +12:00
Pedro Algarvio
c8f4d82fb5 Merge pull request #25353 from s0undt3ch/develop
Lint fixes to tests/modparser.py and some minor additions
2015-07-13 10:42:43 +01:00
Ted Strzalkowski
491de2df6c perform refresh_pillar as part of sync_all when refresh=True 2015-07-12 20:59:39 -07:00
Pedro Algarvio
2b14375b30 No empty docstrings 2015-07-12 19:26:33 +01:00
Pedro Algarvio
6294c67b12 Nicer handling of user keyboard interruption 2015-07-12 12:37:56 +01:00
Pedro Algarvio
0add87e7b9 Display the failed import reason 2015-07-12 12:30:24 +01:00
Pedro Algarvio
e6df8cbe24 Add allowed choices to output format.
Since we're using the print function, we can specify the file handler to
user and in this case we choose `sys.stderr`
2015-07-12 12:27:26 +01:00
Pedro Algarvio
ef75ea068c Lint fixes to tests/modparser.py 2015-07-12 12:22:28 +01:00
Pedro Algarvio
f00aa559e7 Merge pull request #25349 from thatch45/modparser
Add modparser script
2015-07-12 12:18:49 +01:00
Thomas S Hatch
50a55eca58 Add output options to modparser 2015-07-11 15:36:58 -06:00
Thomas S Hatch
3f282e21f1 Add modparser script 2015-07-11 15:25:36 -06:00
Justin Findlay
5840c2e06b Merge pull request #25316 from s0undt3ch/develop
Merge 2015.8 forward to develop
2015-07-11 13:29:53 -06:00
Arnold Bechtoldt
1eb978b609 Merge branch 'refactor_es_modules' of github.com:bechtoldt/salt into refactor_es_modules 2015-07-11 17:59:47 +02:00
Arnold Bechtoldt
f2f485dda4 remove log entry that was used for debugging only 2015-07-11 17:59:08 +02:00
Arnold Bechtoldt
60d818e872 improve profile mgmt 2015-07-11 17:59:08 +02:00
Arnold Bechtoldt
7d26e45979 raise exception in modules.elasticsearch when connection to ES cluster failed 2015-07-11 17:59:08 +02:00
Arnold Bechtoldt
af16c76422 refactor elasticsearch integration
* salt.modules.elasticsearch
* salt.states.elasticsearch*
* salt.returners.elasticsearch
2015-07-11 17:59:07 +02:00