From de88a72e7aa91622f0b970f8ed799b7b1222f700 Mon Sep 17 00:00:00 2001
From: Zack Shoylev <zack.shoylev@rackspace.com>
Date: Fri, 27 May 2016 06:48:14 -0500
Subject: [PATCH] Change the template to use CentOS instead. Avoids some
 openjdk-6 problems.

---
 .../config/BaseComputeServiceContextModule.java        | 10 +++++-----
 .../compute/internal/BaseComputeServiceLiveTest.java   |  6 +++---
 .../us/CloudServersUSProviderMetadata.java             |  6 +++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

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 3e83617b60..4acaef9fe1 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
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 245d6bcab6..a056184372 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();
 
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 a2286a7c60..2c7a619d8e 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;
    }