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
Daniel Wallace
01a020c080
pass file contents for files: in nova
...
We just read in the contents if it is a file, otherwise use the string
or yaml multiline string in this object
2014-05-18 01:21:11 -05:00
Daniel Wallace
75785e9d55
remove the ex_ options from the nova driver
...
These are the options for the openstack driver
2014-05-18 01:11:28 -05:00
Joseph Hall
4d0bb14ebd
Merge pull request #12872 from gtmanfred/cache
...
Clean the cache if it isn't a valid json object
2014-05-17 19:48:54 -06:00
Daniel Wallace
ba318f670e
Clean the cache if it isn't a valid json object
...
Sometimes it isn't valid json for some reason... probably json.dump is
dropping in a 'This is not a valid json' error into the file instead. I
haven't been able to catch one in the process yet.
There should still be an error catch here anyway
2014-05-17 19:52:35 -05:00
Joseph Hall
19ff011d41
Merge pull request #12871 from gtmanfred/nova
...
Switch openstack drivers to useing show_instance
2014-05-17 18:36:29 -06:00
Daniel Wallace
9cce4c5c1a
return empty dict if server_show_libcloud fails
...
Should be an empty list, if it returns an index error, it means no
servers were matched.
2014-05-17 18:51:56 -05:00
Daniel Wallace
50942d2476
Set log level for requests in novaclient to WARNING
...
Just need to get rid of the stupid starting https connection message on
every requests connection in novaclient. It can be set in the __opts__,
but will be documented when the change in made later.
2014-05-17 18:35:24 -05:00
Daniel Wallace
0463781a71
Be consistent on state/status
...
Turns out libcloud needs it to be state, instead of status of the server
slice. Should be set now
2014-05-17 18:08:22 -05:00
Daniel Wallace
e02cc1da04
use show_instance for openstack driver too
...
show_instance for libcloud uses list_node_full already
2014-05-17 17:21:14 -05:00
Daniel Wallace
34c35cf541
cleanup nova driver using show_instance
...
There isn't a reason to use list_nodes_full just to find information about the
cloud server. It is already done to see if it the server already exists in the
salt.cloud.CloudClient to make sure one in the environment doesn't already
exist with that name.
2014-05-17 17:20:44 -05:00
Daniel Wallace
e8871a0d8c
use show_instance for nova.create
2014-05-17 16:45:28 -05:00
Joseph Hall
e7c84abfc6
Merge pull request #12870 from gtmanfred/cache
...
fix pylint errors
2014-05-17 15:26:10 -06:00
Daniel Wallace
29d103346c
fix the vm_ variable for lxc delete_minion_cache
2014-05-17 16:20:29 -05:00
Joseph Hall
44c50fb579
Merge pull request #12869 from gtmanfred/cache
...
use delete_minion_cachedir
2014-05-17 15:18:46 -06:00
Daniel Wallace
ebd50b506d
fix pylint errors
2014-05-17 16:16:48 -05:00
Daniel Wallace
685a295a82
add delete_minion_cachedir to destroy functions
...
Also to the missing_node_cache function to delete the cache on
list_nodes_full, if the server was deleted with something besides
salt-cloud.
2014-05-17 16:06:37 -05:00
Daniel Wallace
42b6eabe61
Delete cache when destroying minions
...
only if update_cachedir is set
2014-05-17 16:06:37 -05:00
Joseph Hall
23164772be
Merge pull request #12868 from gtmanfred/private_ips
...
fixes #12801
2014-05-17 14:28:33 -06:00
Daniel Wallace
a7c75d321f
fixes #12801
...
get ssh_interface if it is set, otherwise just use public_ips
2014-05-17 15:08:46 -05:00
Thomas Jackson
35b7c1b51d
Initial commit of a zookeeper concurrency control module
2014-05-17 10:59:02 -07:00
Thomas S Hatch
b924ef78c0
Merge pull request #12859 from ahmadsherif/develop
...
Move mine_interval example to a minion conf file
2014-05-17 12:02:22 -05:00
Thomas S Hatch
416bbd3278
Merge pull request #12857 from basepi/dockerchanges12109
...
Populate 'Changes' on docker.installed container creation
2014-05-17 12:01:42 -05:00
Thomas S Hatch
8c11967309
Merge pull request #12853 from cachedout/12408
...
Better sysctl test detection.
2014-05-17 11:59:14 -05:00
Thomas S Hatch
abc4fc47d6
Merge pull request #12850 from DockerNAS/utility_source_files
...
Added a _utils sync mechanism for distributing utility source files to minions (#12712 )
2014-05-17 11:58:39 -05:00
Thomas S Hatch
3111d1dd4c
Merge pull request #12844 from basepi/tomcatoutput12840
...
Add extra handling to highstate outputter for 'Comment'
2014-05-17 11:54:00 -05:00
Thomas S Hatch
438e69e5ba
Merge pull request #12841 from rogst/develop
...
Added module and state for adding new firewall rules
2014-05-17 11:52:12 -05:00
Pedro Algarvio
c295a988cf
Merge pull request #12846 from basepi/serviceenablefreebsd12836
...
Ensure that freebsd service rc.conf ends in newline before appending
2014-05-17 08:50:58 +01:00
Pedro Algarvio
41f9200985
Merge pull request #12860 from terminalmage/change-output-loglevel
...
Change default output loglevel to debug
2014-05-17 08:47:19 +01:00
Pedro Algarvio
740170177b
Merge pull request #12864 from whiteinge/doc-loader-note-keyerror-master_uri
...
Added note when using the loader to run modules that contact the master
2014-05-17 08:46:53 +01:00
Seth House
e3947b590c
Added note when using the loader to run modules that contact the master
...
Closes #12732
2014-05-16 18:25:14 -06:00
Seth House
c5fc18605b
Merge pull request #12863 from whiteinge/doc-rst-latex-fixes
...
Fixed rST syntax that was causing the PDF not to build
2014-05-16 18:16:59 -06:00
Seth House
041431da40
Fixed rST syntax that was causing the PDF not to build
2014-05-16 18:14:07 -06:00
