Repository: jclouds Updated Branches: refs/heads/master 28ed95518 -> c1ce819f6
Change the template to use CentOS instead. Avoids some openjdk-6 problems. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/de88a72e Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/de88a72e Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/de88a72e Branch: refs/heads/master Commit: de88a72e7aa91622f0b970f8ed799b7b1222f700 Parents: 28ed955 Author: Zack Shoylev <[email protected]> Authored: Fri May 27 06:48:14 2016 -0500 Committer: Zack Shoylev <[email protected]> Committed: Tue Jun 7 17:37:33 2016 -0500 ---------------------------------------------------------------------- .../compute/config/BaseComputeServiceContextModule.java | 10 +++++----- .../compute/internal/BaseComputeServiceLiveTest.java | 6 +++--- .../cloudservers/us/CloudServersUSProviderMetadata.java | 6 +++++- 3 files changed, 13 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/de88a72e/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java b/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java index 3e83617..4acaef9 100644 --- a/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java +++ b/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java @@ -93,9 +93,9 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule { }).to(TemplateOptionsToStatement.class); bind(LoginCredentials.class).annotatedWith(Names.named("image")).toProvider( GetLoginForProviderFromPropertiesAndStoreCredentialsOrReturnNull.class); - + bindCredentialsOverriderFunction(); - + install(new FactoryModuleBuilder() .implement(RunScriptOnNodeUsingSsh.class, Names.named("direct"), RunScriptOnNodeUsingSsh.class) .implement(RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilComplete.class, Names.named("blocking"), @@ -195,7 +195,7 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule { template.imageId(imageId); return template; } - + @Provides @Singleton protected final Map<OsFamily, LoginCredentials> provideOsFamilyToCredentials(Injector injector) { @@ -205,7 +205,7 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule { protected Map<OsFamily, LoginCredentials> osFamilyToCredentials(Injector injector) { return ImmutableMap.of(OsFamily.WINDOWS, LoginCredentials.builder().user("Administrator").build()); } - + /** * The default options if none are provided. */ @@ -238,7 +238,7 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule { }, images); } - + @Provides @Singleton @Memoized http://git-wip-us.apache.org/repos/asf/jclouds/blob/de88a72e/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java ---------------------------------------------------------------------- diff --git a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java index 245d6bc..a056184 100644 --- a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java @@ -651,7 +651,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte int toDestroy = refreshNodes().size(); Set<? extends NodeMetadata> destroyed = client.destroyNodesMatching(inGroup(group)); assertEquals(toDestroy, destroyed.size()); - Uninterruptibles.sleepUninterruptibly(10, TimeUnit.SECONDS); + Uninterruptibles.sleepUninterruptibly(100, TimeUnit.SECONDS); for (NodeMetadata node : filter(client.listNodesDetailsMatching(all()), inGroup(group))) { assert node.getStatus() == Status.TERMINATED : node; assert view.utils().credentialStore().get("node#" + node.getId()) == null : "credential should have been null for " @@ -849,7 +849,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte checkVolumes(hardware); } } - + protected void checkVolumes(Hardware hardware) { assert hardware.getVolumes().size() > 0 : hardware; } @@ -859,7 +859,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte // Allow to override the comparison but keeping testng dependencies happy doCompareSizes(); } - + protected void doCompareSizes() throws Exception { Hardware defaultSize = client.templateBuilder().build().getHardware(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/de88a72e/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java index a2286a7..2c7a619 100644 --- a/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java +++ b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java @@ -72,7 +72,11 @@ public class CloudServersUSProviderMetadata extends BaseProviderMetadata { properties.setProperty(PROPERTY_REGION + ".IAD." + ISO3166_CODES, "US-VA"); properties.setProperty(PROPERTY_REGION + ".SYD." + ISO3166_CODES, "AU-NSW"); properties.setProperty(PROPERTY_REGION + ".HKG." + ISO3166_CODES, "HK"); - properties.setProperty(TEMPLATE, "imageNameMatches=.*Ubuntu.*"); + /* + * Debian - script problems + * Ubuntu - script problems + * */ + properties.setProperty(TEMPLATE, "imageNameMatches=.*CentOS.*7.*,os64Bit=true"); return properties; }
