Erik Johnson
5cd4000862
Add information on gitfs_provider to gitfs walkthrough
2014-05-21 15:00:29 -05:00
Erik Johnson
3bcfc735f8
Add dulwich to gitfs_provider docs
2014-05-21 15:00:19 -05:00
Joseph Hall
6ceafd8b7b
Merge pull request #12937 from jacksontj/concurrency_control
...
Zookeeper based concurrency control
2014-05-21 11:12:26 -06:00
Thomas Jackson
acfa783bf4
Fix some pylint errors
2014-05-21 09:49:16 -07:00
Colton Myers
d6201878bb
Merge pull request #12936 from cachedout/9556
...
Pylint zcbuildout
2014-05-21 10:48:03 -06:00
Thomas Jackson
f3fbb65ab0
Complete the docs for this module, and include an example
2014-05-21 09:17:17 -07:00
Mike Place
888662692f
Pylint zcbuildout
...
I see no evidence of this argument in use. Removed and modified test.
Closes #9556
2014-05-21 10:11:25 -06:00
Thomas Jackson
8840c6567f
Switch to using a semaphore (mostly a built-in of the kazoo client)
2014-05-21 09:00:34 -07:00
Joseph Hall
3aca4979fc
Merge pull request #12620 from jcockhren/elasticsearch_returner
...
elasticsearch returner
2014-05-21 07:46:10 -06:00
Joseph Hall
3fe1be7d6e
Merge pull request #12910 from pengyao/generate_password
...
Add generate_password to shadow module
2014-05-21 07:45:31 -06:00
Joseph Hall
030677f295
Merge pull request #12918 from whiteinge/doc-cmd-equal-sign
...
Added note about using = in cmd.run commands
2014-05-21 07:42:34 -06:00
Joseph Hall
8f3696e340
Merge pull request #12929 from whiteinge/doc-boto-rst-fixes
...
Tidied up some rST syntax in the boto state modules
2014-05-21 07:41:44 -06:00
Joseph Hall
e50ac752ec
Merge pull request #12930 from whiteinge/doc-salt-doc
...
Doc salt doc
2014-05-21 07:41:23 -06:00
Joseph Hall
a7d578aaee
Merge pull request #12934 from gtmanfred/develop
...
do deep copy before creating CloudClient
2014-05-21 07:40:27 -06:00
Daniel Wallace
d151b378dc
do deep copy before creating CloudClient
2014-05-21 08:21:13 -05:00
Joseph Hall
46e526cf66
Merge pull request #12924 from gtmanfred/cloud
...
Include salt cloud modules configurations from pillars
2014-05-21 06:12:23 -06:00
Pedro Algarvio
faa44aa77a
Merge pull request #12931 from terminalmage/docs
...
Correct inaccuracies in gitfs walkthrough
2014-05-21 12:56:58 +01:00
Erik Johnson
93245d1e0e
Correct inaccuracies in gitfs walkthrough
...
Also, added some information on upcoming features
2014-05-21 01:35:00 -05:00
Erik Johnson
8d4370accc
Fix indentation
...
This brings the note about the gitfs walthrough outside of the YAML
code-block.
2014-05-21 01:34:28 -05:00
Seth House
a3f858b7df
Tidied up some rST syntax in the boto state modules
2014-05-20 23:57:13 -06:00
Seth House
8a3cce4620
Added documentation on how to write Salt documentation
...
Closes #12792
2014-05-20 23:50:52 -06:00
Seth House
64b8fb6a81
Added label to the docs for writing execution modules
2014-05-20 23:30:02 -06:00
Daniel Wallace
d2c970cdb5
should be using pop for a clean update later
2014-05-20 23:30:49 -05:00
Seth House
b30732ce63
Merge pull request #12927 from gravyboat/develop
...
Updated the quickstart so we can get rid of the standalone minion docs.
2014-05-20 21:35:38 -06:00
Forrest Alvarez
b588393a7b
Updated the quickstart so we can get rid of the standalone minion docs.
2014-05-21 03:33:09 +00:00
Daniel Wallace
c43403c4d9
copy pillars before acting on them
...
If we do the .pop() then they dictionary won't exist the next time
we come back to it when we do multiple calls to the cloud module inside
cloud states.
2014-05-20 22:26:06 -05:00
Seth House
4e483bff23
Merge pull request #12926 from gravyboat/develop
...
Updated the troubleshooting index with some link fixes for 12791.
2014-05-20 20:44:04 -06:00
Forrest Alvarez
8c8060e6ea
Updated the troubleshooting index with some link fixes for 12791.
2014-05-21 02:42:12 +00:00
Erik Johnson
7cedb9ef47
Merge pull request #12925 from hulu/simplify-conds
...
simplify conditions in utils.network due to short-circuit eval
2014-05-20 20:05:12 -05:00
Daniel Wallace
87bd50f01a
if cache dir doesn't exist, make it
2014-05-20 19:22:02 -05:00
Daniel Wallace
80459b57b1
Cloud profiles need the profile name inside
2014-05-20 19:12:31 -05:00
Chris Rebert
4b6b7eaec0
simplify conditions in utils.network due to short-circuit eval
2014-05-20 17:05:15 -07:00
Daniel Wallace
9bfdb1de72
We use cloud instead of clouds everywhere else
2014-05-20 18:32:19 -05:00
Daniel Wallace
1e62d0f9bf
format the profiles like salt-cloud is expecting them
...
inside the provider.
2014-05-20 18:31:33 -05:00
Daniel Wallace
19e791f31d
space pillar data better
2014-05-20 17:59:36 -05:00
Daniel Wallace
ce6155a272
Overwrite opts with what is in the pillars
...
I want to include all the things from the pillars, and have them
override everything that would be in the cloud configs. We can make it
so that they do not update variables if it is already defined in
/etc/salt/cloud*, but I feel this way is better.
2014-05-20 17:57:24 -05:00
Daniel Wallace
4d54796c3c
Document using Pillars for cloud config
2014-05-20 17:56:48 -05:00
Daniel Wallace
42bfb64d1f
Allow cloud information to come from pillar data
2014-05-20 17:45:34 -05:00
Seth House
2dc7feb4d6
Merge pull request #12923 from lyft/boto-documentation
...
Adding boto_* modules and states to documentation.
2014-05-20 16:07:43 -06:00
Ryan Lane
92f21c7b05
Adding boto_* modules and states to documentation.
2014-05-20 18:06:17 -04:00
Joseph Hall
11762f2ea9
Merge branch 'yanatan16-patch-linode-libcloud-args' into develop
2014-05-20 15:39:41 -06:00
Joseph Hall
f29e1a06ec
Cleaning up whitespace
2014-05-20 15:39:30 -06:00
Jon Eisen
d4a49e4bca
Allow arbitrary libcloud args in salt cloud profile
2014-05-20 14:15:03 -07:00
Joseph Hall
0ac13b73f6
Merge pull request #12919 from gtmanfred/develop
...
revert 00bd39fd8d
2014-05-20 14:32:46 -06:00
Daniel Wallace
9abb33f883
revert 00bd39fd8d
2014-05-20 15:29:53 -05:00
Seth House
80cf8e5f12
Added note about using = in cmd.run commands
...
Refs #5884
2014-05-20 13:43:00 -06:00
pengyao
2b8fa6cf26
adjust salt to crypt_salt for gen_hash
2014-05-21 01:09:36 +08:00
pengyao
059a7a2f76
compatible lower Crypto version
...
RHEL6/CentOS python-Crypto is v2.0.1
2014-05-21 00:59:37 +08:00
pengyao
60cf38f64a
Use salt.utils.pycrypt to generate hashed password
2014-05-21 00:55:25 +08:00
pengyao
65731fff94
Add algorithm argument to get_hash
2014-05-21 00:13:18 +08:00
