Updated Branches: refs/heads/vpc 965da2ce9 -> 3a6d89074
Commit for review-request: https://reviews.apache.org/r/6458/ Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3a6d8907 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3a6d8907 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3a6d8907 Branch: refs/heads/vpc Commit: 3a6d8907412ef4ab473d4a5cc3e4c3c4ab69cbe1 Parents: 965da2c Author: Kelven Yang <[email protected]> Authored: Wed Aug 8 17:18:31 2012 -0700 Committer: Kelven Yang <[email protected]> Committed: Wed Aug 8 17:18:31 2012 -0700 ---------------------------------------------------------------------- docs/en-US/prepare-system-vm-template.xml | 2 +- docs/en-US/release-notes-3.0.4.xml | 2 +- setup/db/templates.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3a6d8907/docs/en-US/prepare-system-vm-template.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/prepare-system-vm-template.xml b/docs/en-US/prepare-system-vm-template.xml index 060b892..ff4b58a 100644 --- a/docs/en-US/prepare-system-vm-template.xml +++ b/docs/en-US/prepare-system-vm-template.xml @@ -17,7 +17,7 @@ <programlisting># /usr/lib64/cloud/agent/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2 -h xenserver -s <optional-management-server-secret-key> -F</programlisting> </listitem> <listitem><para>For vSphere:</para> - <programlisting># /usr/lib64/cloud/agent/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.ova -h vmware -s <optional-management-server-secret-key> -F</programlisting> + <programlisting># /usr/lib64/cloud/agent/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/burbank/burbank-systemvm-08012012.ova -h vmware -s <optional-management-server-secret-key> -F</programlisting> </listitem> <listitem><para>For KVM:</para> <programlisting># /usr/lib64/cloud/agent/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 -h kvm -s <optional-management-server-secret-key> -F</programlisting> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3a6d8907/docs/en-US/release-notes-3.0.4.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/release-notes-3.0.4.xml b/docs/en-US/release-notes-3.0.4.xml index 21f47c6..26e3532 100644 --- a/docs/en-US/release-notes-3.0.4.xml +++ b/docs/en-US/release-notes-3.0.4.xml @@ -247,7 +247,7 @@ cloudAPIPort=8080 <entry><para>VMware</para></entry> <entry><para>Name: systemvm-vmware-3.0.0</para> <para>Description: systemvm-vmware-3.0.0</para> - <para>URL: http://download.cloud.com/templates/acton/acton-systemvm-02062012.ova</para> + <para>URL: http://download.cloud.com/templates/burbank/burbank-systemvm-08012012.ova</para> <para>Zone: Choose the zone where this hypervisor is used</para> <para>Hypervisor: VMware</para> <para>Format: OVA</para> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3a6d8907/setup/db/templates.sql ---------------------------------------------------------------------- diff --git a/setup/db/templates.sql b/setup/db/templates.sql index 71f2b9d..5f7924f 100755 --- a/setup/db/templates.sql +++ b/setup/db/templates.sql @@ -33,7 +33,7 @@ INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, VALUES (7, 'centos53-x64', 'CentOS 5.3(64-bit) no GUI (vSphere)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/CentOS5.3-x86_64.ova', 'f6f881b7f2292948d8494db837fe0f47', 0, 'CentOS 5.3(64-bit) no GUI (vSphere)', 'OVA', 12, 1, 1, 'VMware', 1); INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) - VALUES (8, 'routing-8', 'SystemVM Template (vSphere)', 0, now(), 'SYSTEM', 0, 32, 1, 'http://download.cloud.com/templates/acton/acton-systemvm-02062012.ova', 'e72b21c9541d005600297cb92d241434', 0, 'SystemVM Template (vSphere)', 'OVA', 15, 0, 1, 'VMware'); + VALUES (8, 'routing-8', 'SystemVM Template (vSphere)', 0, now(), 'SYSTEM', 0, 32, 1, 'http://download.cloud.com/templates/burbank/burbank-systemvm-08012012.ova', '7137e453f950079ea2ba6feaafd939e8', 0, 'SystemVM Template (vSphere)', 'OVA', 15, 0, 1, 'VMware'); INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) VALUES (9, 'routing-9', 'SystemVM Template (HyperV)', 0, now(), 'SYSTEM', 0, 32, 1, 'http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2', 'f613f38c96bf039f2e5cbf92fa8ad4f8', 0, 'SystemVM Template (HyperV)', 'VHD', 15, 0, 1, 'Hyperv');
