Signed-off-by: Alex Zeffertt <[email protected]>
# HG changeset patch # User Alex Zeffertt <[email protected]> # Date 1272380304 -3600 # Node ID 05274dded7d6c3a78b44bd58cf77bc3c558fc093 # Parent a10d35ad96419461abcfb00b81807b938a0191d7 CA-40882: In the SLES 10SP2 kernel the 3 VIF limit was removed so remove this limit in the template Signed-off-by: Alex Zeffertt <[email protected]> diff -r a10d35ad9641 -r 05274dded7d6 ocaml/xapi/create_templates.ml --- a/ocaml/xapi/create_templates.ml Tue Apr 27 14:29:01 2010 +0100 +++ b/ocaml/xapi/create_templates.ml Tue Apr 27 15:58:24 2010 +0100 @@ -399,13 +399,22 @@ vM_recommendations = recommendations ~memory:32 ~vifs:3 (); } +let sles10sp1_template name architecture flags = + let name = make_long_name name architecture in + let install_arch = technical_string_of_architecture architecture in + let bt = eli_install_template (default_memory_parameters 512L) name "sleslike" true "console=ttyS0 xencons=ttyS" in + { bt with + vM_other_config = (install_methods_otherconfig_key, "cdrom,nfs,http,ftp") :: ("install-arch",install_arch) :: bt.vM_other_config; + vM_recommendations = recommendations ~memory:32 ~vifs:3 (); + } + let sles10_template name architecture flags = let name = make_long_name name architecture in let install_arch = technical_string_of_architecture architecture in let bt = eli_install_template (default_memory_parameters 512L) name "sleslike" true "console=ttyS0 xencons=ttyS" in { bt with vM_other_config = (install_methods_otherconfig_key, "cdrom,nfs,http,ftp") :: ("install-arch",install_arch) :: bt.vM_other_config; - vM_recommendations = recommendations ~memory:32 ~vifs:3 (); + vM_recommendations = recommendations ~memory:32 (); } let sles11_template = sles10_template @@ -467,14 +476,14 @@ rhel5x_template "Oracle Enterprise Linux 5.3" X64 [ ]; rhel5x_template "Oracle Enterprise Linux 5.4" X64 [ ]; - sles_9_template "SUSE Linux Enterprise Server 9 SP4" X32 [ ]; - sles10_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 [ ]; - sles10_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 [ ]; + 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 [ ]; + 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 [ ]; debian_template "Debian Lenny 5.0" "lenny" X32 [ ];
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
