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

Change the template to use CentOS instead. Avoids some openjdk-6 problems.

This commit is contained in:
Zack Shoylev 2016-05-27 06:48:14 -05:00
parent 28ed955183
commit de88a72e7a
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java
View File

@ -93,9 +93,9 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule {
}).to(TemplateOptionsToStatement.class); }).to(TemplateOptionsToStatement.class);
bind(LoginCredentials.class).annotatedWith(Names.named("image")).toProvider( bind(LoginCredentials.class).annotatedWith(Names.named("image")).toProvider(
GetLoginForProviderFromPropertiesAndStoreCredentialsOrReturnNull.class); GetLoginForProviderFromPropertiesAndStoreCredentialsOrReturnNull.class);
bindCredentialsOverriderFunction(); bindCredentialsOverriderFunction();
install(new FactoryModuleBuilder() install(new FactoryModuleBuilder()
.implement(RunScriptOnNodeUsingSsh.class, Names.named("direct"), RunScriptOnNodeUsingSsh.class) .implement(RunScriptOnNodeUsingSsh.class, Names.named("direct"), RunScriptOnNodeUsingSsh.class)
.implement(RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilComplete.class, Names.named("blocking"), .implement(RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilComplete.class, Names.named("blocking"),
@ -195,7 +195,7 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule {
template.imageId(imageId); template.imageId(imageId);
return template; return template;
} }
@Provides @Provides
@Singleton @Singleton
protected final Map<OsFamily, LoginCredentials> provideOsFamilyToCredentials(Injector injector) { 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) { protected Map<OsFamily, LoginCredentials> osFamilyToCredentials(Injector injector) {
return ImmutableMap.of(OsFamily.WINDOWS, LoginCredentials.builder().user("Administrator").build()); return ImmutableMap.of(OsFamily.WINDOWS, LoginCredentials.builder().user("Administrator").build());
} }
/** /**
* The default options if none are provided. * The default options if none are provided.
*/ */
@ -238,7 +238,7 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule {
}, images); }, images);
} }
@Provides @Provides
@Singleton @Singleton
@Memoized @Memoized

6
compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
View File

@ -651,7 +651,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte
int toDestroy = refreshNodes().size(); int toDestroy = refreshNodes().size();
Set<? extends NodeMetadata> destroyed = client.destroyNodesMatching(inGroup(group)); Set<? extends NodeMetadata> destroyed = client.destroyNodesMatching(inGroup(group));
assertEquals(toDestroy, destroyed.size()); assertEquals(toDestroy, destroyed.size());
Uninterruptibles.sleepUninterruptibly(10, TimeUnit.SECONDS); Uninterruptibles.sleepUninterruptibly(100, TimeUnit.SECONDS);
for (NodeMetadata node : filter(client.listNodesDetailsMatching(all()), inGroup(group))) { for (NodeMetadata node : filter(client.listNodesDetailsMatching(all()), inGroup(group))) {
assert node.getStatus() == Status.TERMINATED : node; assert node.getStatus() == Status.TERMINATED : node;
assert view.utils().credentialStore().get("node#" + node.getId()) == null : "credential should have been null for " 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); checkVolumes(hardware);
} }
} }
protected void checkVolumes(Hardware hardware) { protected void checkVolumes(Hardware hardware) {
assert hardware.getVolumes().size() > 0 : 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 // Allow to override the comparison but keeping testng dependencies happy
doCompareSizes(); doCompareSizes();
} }
protected void doCompareSizes() throws Exception { protected void doCompareSizes() throws Exception {
Hardware defaultSize = client.templateBuilder().build().getHardware(); Hardware defaultSize = client.templateBuilder().build().getHardware();

6
providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java
View File

@ -72,7 +72,11 @@ public class CloudServersUSProviderMetadata extends BaseProviderMetadata {
properties.setProperty(PROPERTY_REGION + ".IAD." + ISO3166_CODES, "US-VA"); properties.setProperty(PROPERTY_REGION + ".IAD." + ISO3166_CODES, "US-VA");
properties.setProperty(PROPERTY_REGION + ".SYD." + ISO3166_CODES, "AU-NSW"); properties.setProperty(PROPERTY_REGION + ".SYD." + ISO3166_CODES, "AU-NSW");
properties.setProperty(PROPERTY_REGION + ".HKG." + ISO3166_CODES, "HK"); 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; return properties;
} }