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 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
Erik Johnson
63094f1463
Remove output_loglevel='debug'
...
With the default loglevel now set to debug, setting it to debug when
invoking cmd.* is redundant.
2014-05-16 17:50:53 -05:00
Erik Johnson
5cff1f81cc
Change default output_loglevel to debug
2014-05-16 17:30:14 -05:00
Ahmad Sherif
0d94f4326d
Move mine_interval example to a minion conf file
...
mine_interval has no effect when added in a pillar
2014-05-17 01:22:38 +03:00
Samuel Smith
11892ee78d
Merge pull request #12858 from SmithSamuelM/sam_raet_39
...
removed debug line
2014-05-16 16:17:59 -06:00
Samuel M Smith
a926d46421
removed debug line
2014-05-16 16:15:51 -06:00
Colton Myers
f1960a9f46
Populate 'Changes' on docker.installed container creation
2014-05-16 16:13:59 -06:00
Samuel Smith
92c5a084a9
Merge pull request #12856 from SmithSamuelM/sam_raet_39
...
Fixed a couple of bugs from latest develop. Added some changes for Raet changes
2014-05-16 16:10:39 -06:00
Samuel M Smith
5646e45e4b
Fixed bug in ip_addrs
...
On OS X there is no 'label' field
Cleaned up logic so more readable
2014-05-16 16:08:42 -06:00
Colton Myers
aec2379d9c
Merge pull request #12847 from basepi/archiveextracteddocs12498
...
Add note about ``if_missing`` to archive.extracted
2014-05-16 16:05:56 -06:00
Samuel M Smith
10395931f3
Merge remote-tracking branch 'upstream/develop' into sam_raet_39
2014-05-16 15:30:32 -06:00
Samuel M Smith
36ce0bbc69
fixed logic bug in check_minion_cache
2014-05-16 15:21:34 -06:00
Samuel M Smith
0ce16b83c3
fixed tests to add auto field in SafeKeep
...
try using name instead of eid do remote key
2014-05-16 15:09:09 -06:00
Seth House
c5ed43c86c
Merge pull request #12851 from rallytime/file_append_docs
...
Arg definitions added to states.file.append
2014-05-16 15:05:01 -06:00
Mike Place
85226a4dc2
Pylint
2014-05-16 15:00:34 -06:00
rallytime
1915dff8f9
Change lines to strings
2014-05-16 14:48:54 -06:00
Samuel M Smith
6eadb11215
delete key must be string
2014-05-16 14:42:01 -06:00
Samuel M Smith
6af40de8c5
persisting auto status
2014-05-16 14:32:34 -06:00
Mike Place
7dc4dbd3bb
Better sysctl test detection.
...
Closes #12408
2014-05-16 14:16:50 -06:00
Joseph Hall
7d4d3fa4f2
Merge pull request #12852 from rallytime/pylint_fix
...
Pylint fix
2014-05-16 14:02:32 -06:00
rallytime
7b6126973a
Pylint fix
2014-05-16 13:56:29 -06:00
Roger Steneteg
10a69dfa7d
Fixed incorrect indentation
2014-05-16 21:33:20 +02:00
rallytime
8167493584
Arg definitions added to states.file.append
2014-05-16 13:25:11 -06:00
