Commit Graph

30824 Commits

Author SHA1 Message Date
pengyao
65731fff94 Add algorithm argument to get_hash 2014-05-21 00:13:18 +08:00
pengyao
c26c9afb24 Add generate_password to shadow module 2014-05-20 18:06:21 +08:00
Thomas S Hatch
0efb50cde6 Merge pull request #12885 from ranl/win_useradd_userprofile
win_useradd: getting %USERPROFILE% from the registry
2014-05-20 06:32:13 +02:00
Seth House
7d484dc86a Restore trackalyzer stuff; opt-in within on_saltstack conditional 2014-05-19 18:29:09 -06:00
David Boucha
956a3d878f Merge pull request #12905 from UtahDave/develop
add windows 2014.1.4 installer links to docs
2014-05-19 18:24:33 -06:00
David Boucha
6b60f45afe add windows 2014.1.4 installer links to docs 2014-05-19 18:22:52 -06:00
David Boucha
9bbbb46193 Merge pull request #12904 from UtahDave/develop
bump windows installer version number
2014-05-19 18:18:35 -06:00
David Boucha
679b178111 bump windows installer version number 2014-05-19 17:57:50 -06:00
Joseph Hall
92364a4496 Merge pull request #12900 from KennethWilke/develop
more yamly yaml
2014-05-19 16:45:17 -06:00
Pedro Algarvio
29862b5e2e Merge pull request #12901 from terminalmage/clean-saltenv
Make saltenv stripping more concise
2014-05-19 22:52:18 +01:00
Erik Johnson
d179db530b Make saltenv stripping more concise
We're already filtering __pub_* arguments from the kwargs before using
them to write the key/value pairs in repo config files, no need to do
two extra dict lookups here. This commit excludes saltenv from the repo
args in the same list comprehension where __pub_* arguments are
filtered.
2014-05-19 16:41:55 -05:00
Colton Myers
5d92657b25 Merge pull request #12896 from bechtoldt/develop
updating homebrew installation URL in Mac OS X Walkthrough TUT (doc)
2014-05-19 15:26:32 -06:00
Colton Myers
1ddcc738e9 Merge pull request #12894 from cachedout/pydsl_exc
PyDSL exception handling
2014-05-19 15:25:36 -06:00
Colton Myers
d6a126a482 Merge pull request #12897 from terminalmage/issue12883
Fix traceback when syncing custom types
2014-05-19 15:25:15 -06:00
Colton Myers
73458ef974 Merge pull request #12898 from cachedout/publish_exc
Catch exception in publish when in masterless.
2014-05-19 15:24:34 -06:00
KennethWilke
713a0ed4eb more yamly yaml 2014-05-19 16:24:27 -05:00
Colton Myers
f1fb48f277 Merge pull request #12899 from cachedout/schedule_doc
More comprehensive documentation on scheduler
2014-05-19 15:24:03 -06:00
Colton Myers
d584faa75b Merge pull request #12893 from basepi/streetsahead
Fix test states for `test=True`
2014-05-19 15:23:00 -06:00
Mike Place
a9f20df543 Pylint 2014-05-19 15:00:16 -06:00
Mike Place
8b03270e1f More comprehensive documentation on scheduler 2014-05-19 14:58:24 -06:00
Mike Place
0082fadece Catch exception in publish when in masterless. 2014-05-19 14:28:09 -06:00
Mike Place
45ed9ce896 Merge pull request #12895 from basepi/mysqlqueryversionadded
Add verisonadded for mysql_query.py
2014-05-19 12:45:50 -06:00
Erik Johnson
728cda2b9a Fix traceback when syncing custom types
This fixes a traceback which occurs when a rendering error occurs when
the top files are checked before custom types are synced.
2014-05-19 13:30:02 -05:00
Erik Johnson
419156a82b Use !r formatting instead of double quotes 2014-05-19 13:28:50 -05:00
Arnold Bechtoldt
04a0133945 updating homebrew installation URL 2014-05-19 20:27:43 +02:00
Colton Myers
cd18e58474 Add verisonadded for mysql_query.py 2014-05-19 12:20:17 -06:00
Mike Place
9c9d50207a PyDSL exception handling
Re-raise rendering errors as our own exception class.
2014-05-19 11:36:24 -06:00
Colton Myers
5eb941b8fb Fix test=True for states without changes
If no changes are going to be made, result should be True or False, None
is reserved for when changes are going to be made.
2014-05-19 11:16:17 -06:00
Colton Myers
78c8190373 Remove slang from test states 2014-05-19 11:11:56 -06:00
Joseph Hall
efc8747c36 Merge pull request #12891 from gtmanfred/develop
remove saltenv from repo_opts in yumpkg.py
2014-05-19 10:37:06 -06:00
Daniel Wallace
72d2a28999 remove saltenv from repo_opts in yumpkg.py
Closes 12887
2014-05-19 11:08:54 -05:00
Joseph Hall
2fe5b0db4b Merge pull request #12886 from techhat/osaz
Add note regarding libcloud trunk
2014-05-19 07:19:55 -06:00
Joseph Hall
752d7bec02 Add note regarding libcloud trunk 2014-05-19 07:19:01 -06:00
Joseph Hall
9199e63850 Merge pull request #12882 from grischa/openstack_availability_zones
added optional availability zones to openstack cloud driver
2014-05-19 07:17:26 -06:00
ranl
57a57b2798 win_useradd: getting %USERPROFILE% from the registry 2014-05-19 15:12:17 +03:00
Pedro Algarvio
e7e22cf6a4 Merge pull request #12881 from gtmanfred/zshell
Add zshell completion for salt salt-call and salt-cp
2014-05-19 08:08:40 +01:00
Daniel Wallace
8eb99c846b Add zshell completion for salt salt-call and salt-cp
I will do bash completion soonish
2014-05-19 00:41:09 -05:00
Grischa Meyer
0dd31e5bd9 added optional availability zones to openstack cloud driver 2014-05-19 15:35:54 +10:00
Joseph Hall
6cc3af207e Merge pull request #12877 from gtmanfred/cache
cache on create for more drivers.
2014-05-18 19:17:24 -06:00
Daniel Wallace
bae1793ca6 pylint fixes 2014-05-18 19:51:51 -05:00
Daniel Wallace
a4369adcda add rackspace to the create caching
Also clean up some of the caching.

These are the remaining drivers who do not cache on create

botocore_aws.py
cloudstack.py
ec2.py
gogrid.py
joyent.py
linode.py
proxmox.py
saltify.py
2014-05-18 19:31:15 -05:00
Daniel Wallace
10aaddc10a make more providers cache data and delete it correctly 2014-05-18 19:23:32 -05:00
Joseph Hall
c9b306572a Merge pull request #12876 from gtmanfred/cache
fix up cache problems
2014-05-18 17:53:40 -06:00
Joseph Hall
64da42458e Merge pull request #12875 from terminalmage/docs
Add note about new hard dep for python-requests
2014-05-18 17:51:08 -06:00
Daniel Wallace
5ae7069d17 cache minion in all show_instance() functions 2014-05-18 18:14:02 -05:00
Daniel Wallace
8cb4187a22 fix pylint errors
double space and lxc had name, instead of vm_ again
2014-05-18 18:03:17 -05:00
Erik Johnson
89f685b7d4 Add note about new hard dep for python-requests 2014-05-18 17:55:16 -05:00
Daniel Wallace
fe0146016f pass the provider to the delete_minion_cache
It was not being passed to delete in the correct directory, because it
wasn't recreating prov_dir correctly. This fixes the issue.

Now the cache is up to date, and adds the minion to
/var/cache/salt/cloud on create, and deletes it on delete, also deletes
it if it is missing.  This could be used to key off a wheel.key.delete
in the reactor of old minions.
2014-05-18 17:52:47 -05:00
Daniel Wallace
371cf1ce15 cache each node individually on a show_instance() 2014-05-18 17:24:09 -05:00
Joseph Hall
23f5e36b50 Merge pull request #12873 from gtmanfred/develop
Some final cleanup of the nova driver
2014-05-18 06:03:17 -06:00