Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

corrected default shutdown timeout and chef key path

This commit is contained in:
Adrian Cole 2010-06-15 11:27:57 -04:00
parent 117bd1ba6b
commit 55fa55a0dc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chef/src/test/java/org/jclouds/chef/ChefClientLiveTest.java
View File

@ -77,7 +77,7 @@ public class ChefClientLiveTest {
user = checkNotNull(System.getProperty("jclouds.test.user")); user = checkNotNull(System.getProperty("jclouds.test.user"));
String keyfile = System.getProperty("jclouds.test.key"); String keyfile = System.getProperty("jclouds.test.key");
if (keyfile == null || keyfile.equals("")) if (keyfile == null || keyfile.equals(""))
keyfile = System.getProperty("user.home") + "/chef/" + user + ".pem"; keyfile = System.getProperty("user.home") + "/.chef/" + user + ".pem";
validatorConnection = createConnection(validator, Files.toString(new File(validatorKey), validatorConnection = createConnection(validator, Files.toString(new File(validatorKey),
Charsets.UTF_8)); Charsets.UTF_8));
adminConnection = createConnection(user, Files.toString(new File(keyfile), Charsets.UTF_8)); adminConnection = createConnection(user, Files.toString(new File(keyfile), Charsets.UTF_8));

2
compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java
View File

@ -40,7 +40,7 @@ public interface ComputeServiceConstants {
static class Timeouts { static class Timeouts {
@Inject(optional = true) @Inject(optional = true)
@Named(PROPERTY_TIMEOUT_NODE_TERMINATED) @Named(PROPERTY_TIMEOUT_NODE_TERMINATED)
public long nodeTerminated = 600 * 1000; public long nodeTerminated = 15 * 1000;
@Inject(optional = true) @Inject(optional = true)
@Named(PROPERTY_TIMEOUT_NODE_RUNNING) @Named(PROPERTY_TIMEOUT_NODE_RUNNING)