Commit Graph

25885 Commits

Author SHA1 Message Date
Pedro Algarvio
a4df038aeb .format() instead of concatenating. 2014-02-12 15:56:21 +00:00
Pedro Algarvio
e918b6e0ef Don't hardcode the cloud cache directory
Use the setup configurable `salt.syspaths` module variables.
2014-02-12 15:53:38 +00:00
Joseph Hall
0d652dcc0b Merge pull request #10378 from hipikat/digitalocean-backups
Add backups_enabled for Digital Ocean salt-cloud provider
2014-02-12 07:39:03 -07:00
Adam Wright
43ce5be53b Refactor without loop on tuple. 2014-02-12 21:58:42 +08:00
Joseph Hall
2b060fce5e Merge pull request #10381 from ranl/develop
solr module: add support for username and password
2014-02-12 06:54:34 -07:00
ranl
4ebcdffcf8 solr module: add support for username and password 2014-02-12 15:12:08 +02:00
Joseph Hall
4732257530 Merge pull request #10377 from Stelminator/lint_fixes_2014_02_11
lint fixes
2014-02-12 05:32:15 -07:00
Adam Wright
1bb773a61e Add private_networking and backups_enabled options to docs. 2014-02-12 16:26:17 +08:00
Adam Wright
60bf6ce776 Add backups_enabed option to Digital Ocean create().
- Group backups_enabled and private_networking, the two binary options.
- private_networking now absent if excluded rather than 'false'.
- Deal with non-binary arguments explicitly as other providers do.

Digital Ocean profiles can now take 'backups_enabled: [True|False]'. (As
of Jan 2014 this option must be specified on instance creation and can
no longer be enabled for already-created droplets, so it's fairly
necessary.)

An incidental change is that private_networking won't default to False
if not specified - by salt-cloud - but that is still the provider's
default, and where the default should be coming from if a profile isn't
explicit.
2014-02-12 16:17:26 +08:00
Christopher A. Stelma
6d47af0b58 whitespace lint 2014-02-11 23:38:25 -08:00
Christopher A. Stelma
a436668891 lint - Unnecessary parens after u'return' keyword 2014-02-11 23:36:41 -08:00
Christopher A. Stelma
2d4e051a97 lint - Unnecessary parens after u'if' keyword 2014-02-11 23:35:02 -08:00
Christopher A. Stelma
940c13c8a2 comment lint 2014-02-11 23:33:47 -08:00
Christopher A. Stelma
487c4d3ba0 lint - __init__ method from base class 'Exception' is not called 2014-02-11 23:28:16 -08:00
Christopher A. Stelma
71d90e1350 lint whitespace 2014-02-11 23:27:36 -08:00
Christopher A. Stelma
bf0ba2e6e3 lint - Undefined variable 'CalledProcessError' 2014-02-11 23:23:27 -08:00
Christopher A. Stelma
929ecb1409 lint fix RaetError.__str__ 2014-02-11 23:13:57 -08:00
Christopher A. Stelma
74dc96bdef lint whitespace 2014-02-11 23:12:57 -08:00
Christopher A. Stelma
1085a85c8f lint whitespace fixes 2014-02-11 22:45:48 -08:00
Thomas S Hatch
7af0a90d95 Update the packaging conventions doc 2014-02-11 21:35:27 -07:00
Thomas S Hatch
30b3b602e7 Merge pull request #10371 from s0undt3ch/hotfix/lint
Lint Fixes
2014-02-11 16:50:19 -07:00
Thomas S Hatch
7e4c781fe9 Revert "Do additional preparation in a separate method."
This reverts commit e3f568e96c.
2014-02-11 16:48:35 -07:00
Thomas S Hatch
c0783c02fb Merge pull request #10372 from basepi/preseeddocs9997
Fix insecure recommendations in preseed tutorial, Fix #9997
2014-02-11 16:42:33 -07:00
Colton Myers
7b493bb024 Remove trailing whitespace from preseeding tutorial 2014-02-11 16:24:40 -07:00
Colton Myers
f1654b67a5 Fix insecure recommendations in preseed tutorial, Fix #9997 2014-02-11 16:24:15 -07:00
Pedro Algarvio
3391ce00af White-space related lint fixes. 2014-02-11 23:12:40 +00:00
Pedro Algarvio
ece3b06c4c White-space related lint fixes. 2014-02-11 23:04:33 +00:00
Pedro Algarvio
b69fbe4cbf White-space related lint fixes. 2014-02-11 23:03:24 +00:00
Pedro Algarvio
cc0393b1fb White-space related lint fixes. 2014-02-11 23:02:31 +00:00
Pedro Algarvio
0d1cf6edde White-space related lint fixes. 2014-02-11 23:00:54 +00:00
Thomas S Hatch
a7baf5936c Revert "add sequence filter for jinja"
This reverts commit cbe04b8231.
2014-02-11 15:59:22 -07:00
Thomas S Hatch
4a68e3b376 Merge pull request #10368 from terminalmage/10087
Log 'zfs help' output at debug
2014-02-11 15:46:30 -07:00
Pedro Algarvio
7a071bdf79 Merge pull request #10370 from techhat/azure
management_host should be optional
2014-02-11 22:43:08 +00:00
Thomas S Hatch
c6812e6196 Merge pull request #10365 from cachedout/footer
Update the footer to align with new .com site.
2014-02-11 15:42:49 -07:00
Joseph Hall
94f70e0804 management_host should be optional 2014-02-11 15:40:32 -07:00
Thomas S Hatch
3cbe200eb1 Merge pull request #10361 from johnnoone/jinja-filter
add sequence filter for jinja
2014-02-11 15:38:32 -07:00
Thomas S Hatch
11b29560c8 Merge pull request #10348 from bbinet/fix_short_timeout_issue
minion connection timeout is too small
2014-02-11 15:32:02 -07:00
Thomas S Hatch
828d473c65 Merge pull request #10345 from s0undt3ch/hotfix/lint
Lint fixes
2014-02-11 15:31:09 -07:00
Thomas S Hatch
4b6992844e Merge pull request #10340 from zheng1/patch-1
add support to config azure management_host
2014-02-11 15:27:42 -07:00
Thomas S Hatch
5239c8b192 Merge pull request #10337 from bemehow/blockdev
blockdev state, module and test
2014-02-11 15:25:23 -07:00
Thomas S Hatch
4065bae532 Merge pull request #10336 from halfss/patch-3
bug: syndic does not return in 1 seconds
2014-02-11 15:20:24 -07:00
Thomas S Hatch
7cee83f230 Merge pull request #10335 from dmyerscough/develop
Unhandled exception in salt-run #9750
2014-02-11 15:14:57 -07:00
Thomas S Hatch
dac00f0c47 Merge pull request #10334 from ajw0100/fix-hacking-doc
Ensure `master_port` in minion config matches `ret_port` in master config
2014-02-11 15:14:04 -07:00
Mike Place
06a8ae4fc4 Merge pull request #10369 from rallytime/dig_test
all methods in dig.py are tested
2014-02-11 15:11:55 -07:00
Thomas S Hatch
b18c2859c7 Merge pull request #10329 from pengyao/linux_interfaces
fixed linux nic name match
2014-02-11 15:11:32 -07:00
Thomas S Hatch
a822717eb8 Merge pull request #10307 from makinacorpus/jinja_in
Be sure not to loose any var in case of multi macro inheritance
2014-02-11 15:11:09 -07:00
rallytime
c2f8f2bfa0 all methods in dig.py are tested 2014-02-11 15:07:42 -07:00
Erik Johnson
ce8b798a1a Log 'zfs help' output at debug
This suppresses the output from this command unless the minion is
running in debug mode.
2014-02-11 15:59:48 -06:00
Mike Place
012e4ed900 Merge pull request #10366 from rallytime/dig_test
More dig tests
2014-02-11 14:33:17 -07:00
rallytime
446cf9b6d4 code cleanup 2014-02-11 14:30:07 -07:00