Skip to content

Commit

Permalink
This closes #518
Browse files Browse the repository at this point in the history
  • Loading branch information
aledsage committed Jan 16, 2017
2 parents 69a453c + 295dbb2 commit 2bdbf14
Showing 1 changed file with 7 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public ComputeService findComputeService(ConfigBag conf, boolean allowReuse) {
// retrying their API calls.
properties.setProperty(Constants.PROPERTY_RETRY_DELAY_START, "500");
properties.setProperty(Constants.PROPERTY_MAX_RETRIES, "6");

// Enable aws-ec2 lazy image fetching, if given a specific imageId; otherwise customize for specific owners; or all as a last resort
// See https://issues.apache.org/jira/browse/WHIRR-416
if ("aws-ec2".equals(provider)) {
Expand Down Expand Up @@ -139,6 +139,12 @@ public ComputeService findComputeService(ConfigBag conf, boolean allowReuse) {
// the default timeout was 500ms so let's raise it in case that helps
properties.setProperty(EC2Constants.PROPERTY_EC2_TIMEOUT_SECURITYGROUP_PRESENT, ""+Duration.seconds(30).toMilliseconds());
}
else if ("azurecompute-arm".equals(provider)) {
String region = conf.get(CLOUD_REGION_ID);
if (Strings.isNonBlank(region)) {
properties.setProperty(LocationConstants.PROPERTY_REGIONS, region);
}
}

// FIXME Deprecated mechanism, should have a ConfigKey for overrides
Map<String, Object> extra = Maps.filterKeys(conf.getAllConfig(), Predicates.containsPattern("^jclouds\\."));
Expand Down

0 comments on commit 2bdbf14

Please sign in to comment.