From d85917ee32b6c04c736e3bf32e3383e91c6a877a Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Fri, 27 May 2011 20:48:20 -0700 Subject: [PATCH] rackspace no longer supports windows 2008 SP1 --- .../compute/CloudServersUKTemplateBuilderLiveTest.java | 3 ++- .../compute/CloudServersUSTemplateBuilderLiveTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java b/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java index adf8d8dd1b..0558c9df23 100644 --- a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java +++ b/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java @@ -55,7 +55,8 @@ public class CloudServersUKTemplateBuilderLiveTest extends BaseTemplateBuilderLi case CENTOS: return input.version.matches("5.[023]") || !input.is64Bit; case WINDOWS: - return input.version.equals("2008") || input.version.indexOf("2003") != -1 + return input.version.equals("2008") || input.version.equals("2008 R1") + || input.version.indexOf("2003") != -1 || (input.version.equals("2008 R2") && !input.is64Bit); default: return true; diff --git a/providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java b/providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java index e9980126e7..7ea8feb3a6 100644 --- a/providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java +++ b/providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java @@ -55,7 +55,8 @@ public class CloudServersUSTemplateBuilderLiveTest extends BaseTemplateBuilderLi case CENTOS: return input.version.matches("5.[023]") || !input.is64Bit; case WINDOWS: - return input.version.equals("2008") || input.version.indexOf("2003") != -1 + return input.version.equals("2008") || input.version.equals("2008 R1") + || input.version.indexOf("2003") != -1 || (input.version.equals("2008 R2") && !input.is64Bit); default: return true;