CA-47556: Revert to PV template for RHEL 6 64 bit for now

From ticket description:

See CP-1876 - RH have changed their kernel to require an option to use PV on HVM.
We currently have no way to set that option ourselves so would rely on the customer
doing it which they will be very unlikely to do in most cases. Also it's not easy
to switch from emulated drivers to PV therefore the chances are customers will end
up with a poorly performing fully HVM VM.

For RTM I suggest we revert to using the PV template for 64 bit (just like we do
for 32 bit). This is a simple revert of the template code.

Long term we want to move to HVM to avoid the performance penalty of 64 bit PV but
RH6 isn't quite ready yet. This could be a change we make when we turn RH6 support
into fully supported, rather than experimental, in a future LCM update

Signed-off-by: Alex Zeffertt <alex.zeffertt@eu.citrix.com>

diff --git a/ocaml/xapi/create_templates.ml b/ocaml/xapi/create_templates.ml
index 867b885e01ef289ac385aafe3d0894a840265e9d..976991edfe56771742f37a426d6faa36f8dd6498 100644 (file)
--- a/ocaml/xapi/create_templates.ml
+++ b/ocaml/xapi/create_templates.ml
@@ -413,12 +413,13 @@ let sles10_template name architecture ?(is_experimental=false) flags =
 
 let sles11_template = sles10_template
 
-let debian_template name release architecture ?(is_experimental=false) flags =
+let debian_template name release architecture ?(supports_cd=true) ?(is_experimental=false) flags =
        let name = make_long_name name architecture is_experimental in
        let install_arch = technical_string_of_architecture architecture in
        let bt = eli_install_template (default_memory_parameters 128L) name "debianlike" false "-- quiet console=hvc0" in
+       let methods = if supports_cd then "cdrom,http,ftp" else "http,ftp" in
        { bt with 
-               vM_other_config = (install_methods_otherconfig_key, "cdrom,http,ftp") :: ("install-arch", install_arch) :: ("debian-release", release) :: bt.vM_other_config;
+               vM_other_config = (install_methods_otherconfig_key, methods) :: ("install-arch", install_arch) :: ("debian-release", release) :: bt.vM_other_config;
                vM_name_description = bt.vM_name_description ^ (match release with
                        | "lenny"   -> "\nOfficial Debian Lenny CD/DVD images do not support XenServer. To find ISO images that do, please refer to: http://community.citrix.com/display/xs/Debian+Lenny"
                        | "squeeze" -> "\nIn order to install Debian Squeeze from CD/DVD the multi-arch ISO image is required."
@@ -446,6 +447,7 @@ let create_all_templates rpc session_id =
                rhel5x_template "Oracle Enterprise Linux 5" X32 [    ];
                rhel5x_template "Oracle Enterprise Linux 5" X64 [    ];
                rhel6x_template "Red Hat Enterprise Linux 6"   X32 ~is_experimental:true [    ];
+               rhel6x_template "Red Hat Enterprise Linux 6"   X64 ~is_experimental:true [    ];
 
                sles_9_template    "SUSE Linux Enterprise Server 9 SP4"  X32 [    ];
                sles10sp1_template "SUSE Linux Enterprise Server 10 SP1" X32 [    ];
@@ -461,8 +463,8 @@ let create_all_templates rpc session_id =
                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 ~is_experimental:true [    ];
-               debian_template "Ubuntu Lucid Lynx 10.04" "lucid" X32  [    ];
-               debian_template "Ubuntu Lucid Lynx 10.04" "lucid" X64_debianlike  [    ];
+               debian_template "Ubuntu Lucid Lynx 10.04" "lucid" X32 ~supports_cd:false [    ];
+               debian_template "Ubuntu Lucid Lynx 10.04" "lucid" X64_debianlike ~supports_cd:false [    ];
 
                sdk_install_template
        ] in
@@ -487,7 +489,6 @@ let create_all_templates rpc session_id =
                hvm_template "Windows Server 2008"        X64  512 24 [n;x;v;];
                hvm_template "Windows Server 2008 R2"     X64  512 24 [n;  v;];
                hvm_template "Windows Server 2008 R2"     X64  512 24 [n;x;v;];
-               hvm_template "Red Hat Enterprise Linux 6" X64  ~is_experimental:true 512 8  [n;    ];
        ] in
 
        (* put default_template key in static_templates other_config of static_templates: *)