From 43e6d06396c2f2f13f7524f885c2831239253081 Mon Sep 17 00:00:00 2001 From: Alex Zeffertt Date: Thu, 8 Jul 2010 14:54:31 +0100 Subject: [PATCH] Coalesce RHEL/CentOS/OEL 5.x templates into one template per distro per arch Create 6 new templates (RHEL,CentOS,OEL)*(i386,x86_64) that can be used to install 5.x point release. For now we leave the old templates in place to prevent a failure in the regression testing. However, when XenRT has been updated to use the new templates we shall remove the old ones. Signed-off-by: Alex Zeffertt --- ocaml/xapi/create_templates.ml | 52 +++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/ocaml/xapi/create_templates.ml b/ocaml/xapi/create_templates.ml index fa233061..5997736f 100644 --- a/ocaml/xapi/create_templates.ml +++ b/ocaml/xapi/create_templates.ml @@ -408,6 +408,35 @@ let create_all_templates rpc session_id = rhel4x_template "Red Hat Enterprise Linux 4.6" X32 [ s;]; rhel4x_template "Red Hat Enterprise Linux 4.7" X32 [l;s;]; rhel4x_template "Red Hat Enterprise Linux 4.8" X32 [l; ]; + rhel4x_template "CentOS 4.5" X32 [ s;]; + rhel4x_template "CentOS 4.6" X32 [ s;]; + rhel4x_template "CentOS 4.7" X32 [l;s;]; + rhel4x_template "CentOS 4.8" X32 [l; ]; + rhel5x_template "Red Hat Enterprise Linux 5" X32 [ ]; + rhel5x_template "Red Hat Enterprise Linux 5" X64 [ ]; + rhel5x_template "CentOS 5" X32 [ ]; + rhel5x_template "CentOS 5" X64 [ ]; + rhel5x_template "Oracle Enterprise Linux 5" X32 [ ]; + rhel5x_template "Oracle Enterprise Linux 5" X64 [ ]; + + sles_9_template "SUSE Linux Enterprise Server 9 SP4" X32 [ ]; + sles10sp1_template "SUSE Linux Enterprise Server 10 SP1" X32 [ ]; + sles10_template "SUSE Linux Enterprise Server 10 SP2" X32 [ ]; + sles11_template "SUSE Linux Enterprise Server 11" X32 [ ]; + sles11_template "SUSE Linux Enterprise Server 11 SP1" X32 [ ]; + sles10sp1_template "SUSE Linux Enterprise Server 10 SP1" X64 [ ]; + sles10_template "SUSE Linux Enterprise Server 10 SP2" X64 [ ]; + sles10_template "SUSE Linux Enterprise Server 10 SP3" X64 [ ]; + sles11_template "SUSE Linux Enterprise Server 11" X64 [ ]; + sles11_template "SUSE Linux Enterprise Server 11 SP1" X64 [ ]; + + debian_template "Debian Lenny 5.0" "lenny" X32 [ ]; + debian_template "Debian Squeeze 6.0" "squeeze" X32 [ ]; + debian_template "Debian Squeeze 6.0" "squeeze" X64_debianlike [ ]; + debian_template "Ubuntu Lucid Lynx 10.04" "lucid" X32 [ ]; + debian_template "Ubuntu Lucid Lynx 10.04" "lucid" X64_debianlike [ ]; + + rhel5x_template "Red Hat Enterprise Linux 5.0" X32 [ ]; rhel5x_template "Red Hat Enterprise Linux 5.1" X32 [ ]; rhel5x_template "Red Hat Enterprise Linux 5.2" X32 [l; ]; @@ -420,11 +449,6 @@ let create_all_templates rpc session_id = rhel5x_template "Red Hat Enterprise Linux 5.3" X64 [ ]; rhel5x_template "Red Hat Enterprise Linux 5.4" X64 [ ]; rhel5x_template "Red Hat Enterprise Linux 5.5" X64 [ ]; - - rhel4x_template "CentOS 4.5" X32 [ s;]; - rhel4x_template "CentOS 4.6" X32 [ s;]; - rhel4x_template "CentOS 4.7" X32 [l;s;]; - rhel4x_template "CentOS 4.8" X32 [l; ]; rhel5x_template "CentOS 5.0" X32 [ ]; rhel5x_template "CentOS 5.1" X32 [ ]; rhel5x_template "CentOS 5.2" X32 [l; ]; @@ -437,7 +461,6 @@ let create_all_templates rpc session_id = rhel5x_template "CentOS 5.3" X64 [ ]; rhel5x_template "CentOS 5.4" X64 [ ]; rhel5x_template "CentOS 5.5" X64 [ ]; - rhel5x_template "Oracle Enterprise Linux 5.0" X32 [ ]; rhel5x_template "Oracle Enterprise Linux 5.1" X32 [ ]; rhel5x_template "Oracle Enterprise Linux 5.2" X32 [l; ]; @@ -451,23 +474,6 @@ let create_all_templates rpc session_id = rhel5x_template "Oracle Enterprise Linux 5.4" X64 [ ]; rhel5x_template "Oracle Enterprise Linux 5.5" X64 [ ]; - sles_9_template "SUSE Linux Enterprise Server 9 SP4" X32 [ ]; - sles10sp1_template "SUSE Linux Enterprise Server 10 SP1" X32 [ ]; - sles10_template "SUSE Linux Enterprise Server 10 SP2" X32 [ ]; - sles11_template "SUSE Linux Enterprise Server 11" X32 [ ]; - sles11_template "SUSE Linux Enterprise Server 11 SP1" X32 [ ]; - sles10sp1_template "SUSE Linux Enterprise Server 10 SP1" X64 [ ]; - sles10_template "SUSE Linux Enterprise Server 10 SP2" X64 [ ]; - sles10_template "SUSE Linux Enterprise Server 10 SP3" X64 [ ]; - sles11_template "SUSE Linux Enterprise Server 11" X64 [ ]; - sles11_template "SUSE Linux Enterprise Server 11 SP1" X64 [ ]; - - debian_template "Debian Lenny 5.0" "lenny" X32 [ ]; - debian_template "Debian Squeeze 6.0" "squeeze" X32 [ ]; - debian_template "Debian Squeeze 6.0" "squeeze" X64_debianlike [ ]; - debian_template "Ubuntu Lucid Lynx 10.04" "lucid" X32 [ ]; - debian_template "Ubuntu Lucid Lynx 10.04" "lucid" X64_debianlike [ ]; - sdk_install_template ] in -- 2.39.5