mirror of https://github.com/apache/jclouds.git
updated templates for rackspace
This commit is contained in:
parent
d809bc524e
commit
d2f60e49a4
|
@ -54,7 +54,7 @@ public class CloudServersUKTemplateBuilderLiveTest extends BaseTemplateBuilderLi
|
||||||
case UBUNTU:
|
case UBUNTU:
|
||||||
return !(input.version.startsWith("12.04") || input.version.startsWith("11.10")) && input.is64Bit;
|
return !(input.version.startsWith("12.04") || input.version.startsWith("11.10")) && input.is64Bit;
|
||||||
case DEBIAN:
|
case DEBIAN:
|
||||||
return input.is64Bit;
|
return input.is64Bit && !input.version.matches("[56].0");
|
||||||
case CENTOS:
|
case CENTOS:
|
||||||
return !(input.version.matches("5.[0237]") || input.version.equals("6.0")) && input.is64Bit;
|
return !(input.version.matches("5.[0237]") || input.version.equals("6.0")) && input.is64Bit;
|
||||||
case WINDOWS:
|
case WINDOWS:
|
||||||
|
|
|
@ -52,11 +52,9 @@ public class CloudServersUSTemplateBuilderLiveTest extends BaseTemplateBuilderLi
|
||||||
public boolean apply(OsFamilyVersion64Bit input) {
|
public boolean apply(OsFamilyVersion64Bit input) {
|
||||||
switch (input.family) {
|
switch (input.family) {
|
||||||
case UBUNTU:
|
case UBUNTU:
|
||||||
return !(input.version.startsWith("12.04") || input.version.startsWith("11.10") || input.version
|
return !(input.version.startsWith("12.04") || input.version.startsWith("11.10")) && input.is64Bit;
|
||||||
.equals("8.04"))
|
|
||||||
&& input.is64Bit;
|
|
||||||
case DEBIAN:
|
case DEBIAN:
|
||||||
return input.is64Bit;
|
return input.is64Bit && !input.version.matches("[56].0");
|
||||||
case CENTOS:
|
case CENTOS:
|
||||||
return !(input.version.matches("5.[0237]") || input.version.equals("6.0")) && input.is64Bit;
|
return !(input.version.matches("5.[0237]") || input.version.equals("6.0")) && input.is64Bit;
|
||||||
case WINDOWS:
|
case WINDOWS:
|
||||||
|
|
Loading…
Reference in New Issue