mirror of https://github.com/apache/jclouds.git
corrected default shutdown timeout and chef key path
This commit is contained in:
parent
117bd1ba6b
commit
55fa55a0dc
|
@ -77,7 +77,7 @@ public class ChefClientLiveTest {
|
|||
user = checkNotNull(System.getProperty("jclouds.test.user"));
|
||||
String keyfile = System.getProperty("jclouds.test.key");
|
||||
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),
|
||||
Charsets.UTF_8));
|
||||
adminConnection = createConnection(user, Files.toString(new File(keyfile), Charsets.UTF_8));
|
||||
|
|
|
@ -40,7 +40,7 @@ public interface ComputeServiceConstants {
|
|||
static class Timeouts {
|
||||
@Inject(optional = true)
|
||||
@Named(PROPERTY_TIMEOUT_NODE_TERMINATED)
|
||||
public long nodeTerminated = 600 * 1000;
|
||||
public long nodeTerminated = 15 * 1000;
|
||||
|
||||
@Inject(optional = true)
|
||||
@Named(PROPERTY_TIMEOUT_NODE_RUNNING)
|
||||
|
|
Loading…
Reference in New Issue