You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/08/12 03:28:50 UTC
[1/31] git commit: Merge branch 'master' into vpc
Updated Branches:
refs/heads/vpc d93c5d053 -> b61468d65
Merge branch 'master' into vpc
Conflicts:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b61468d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b61468d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b61468d6
Branch: refs/heads/vpc
Commit: b61468d65c4231b6629e9b4f271912f328c7567d
Parents: d93c5d0 6e33102
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Sat Aug 11 18:27:18 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Sat Aug 11 18:27:18 2012 -0700
----------------------------------------------------------------------
api/src/com/cloud/storage/Storage.java | 1 +
.../virtualnetwork/VirtualRoutingResource.java | 49 --
.../storage/template/DownloadManagerImpl.java | 2 +-
docs/en-US/Author_Group.xml | 25 +-
docs/en-US/Book_Info.xml | 40 +-
docs/en-US/Common_Content/Legal_Notice.xml | 30 +-
docs/en-US/LDAPserver-for-user-authentication.xml | 29 +-
docs/en-US/Preface.xml | 10 +-
docs/en-US/Revision_History.xml | 60 ++-
docs/en-US/SSL-keystore-path-and-password.xml | 8 +-
docs/en-US/VPN-user-usage-record-format.xml | 28 +-
docs/en-US/about-clusters.xml | 2 +-
docs/en-US/about-hosts.xml | 2 +-
docs/en-US/about-physical-networks.xml | 23 +-
docs/en-US/about-pods.xml | 2 +-
docs/en-US/about-primary-storage.xml | 2 +-
docs/en-US/about-secondary-storage.xml | 2 +-
docs/en-US/about-working-with-vms.xml | 24 +-
docs/en-US/about-zones.xml | 2 +-
docs/en-US/accessing-vms.xml | 28 +-
docs/en-US/acquire-new-ip-address.xml | 20 +-
docs/en-US/add-additional-guest-network.xml | 34 +-
docs/en-US/add-ingress-egress-rules.xml | 66 ++--
docs/en-US/add-iso.xml | 130 +++---
docs/en-US/add-load-balancer-rule.xml | 40 +-
.../en-US/add-password-management-to-templates.xml | 10 +-
docs/en-US/add-security-group.xml | 24 +-
docs/en-US/added-API-commands.xml | 284 ++++++------
docs/en-US/added-cloudPlatform-error-codes.xml | 224 ++++----
.../adding-IP-addresses-for-the-public-network.xml | 40 +-
docs/en-US/admin-guide.xml | 2 +-
docs/en-US/advanced-zone-configuration.xml | 2 +-
docs/en-US/advanced-zone-guest-ip-addresses.xml | 23 +-
docs/en-US/advanced-zone-network-traffic-types.xml | 25 +-
...dvanced-zone-physical-network-configuration.xml | 6 +-
docs/en-US/advanced-zone-public-ip-addresses.xml | 23 +-
docs/en-US/alerts.xml | 60 ++--
docs/en-US/api-reference.xml | 14 +-
docs/en-US/appendix-a-time-zones.xml | 234 +++++-----
docs/en-US/asynchronous-commands-example.xml | 174 ++++----
docs/en-US/asynchronous-commands.xml | 26 +-
docs/en-US/attach-iso-to-vm.xml | 26 +-
docs/en-US/attaching-volume.xml | 36 +-
.../automatic-snapshot-creation-retention.xml | 10 +-
docs/en-US/basic-zone-configuration.xml | 2 +-
docs/en-US/basic-zone-guest-ip-addresses.xml | 23 +-
docs/en-US/basic-zone-network-traffic-types.xml | 23 +-
.../basic-zone-physical-network-configuration.xml | 8 +-
docs/en-US/best-practices-for-vms.xml | 6 +-
docs/en-US/best-practices-primary-storage.xml | 12 +-
docs/en-US/best-practices-secondary-storage.xml | 14 +-
docs/en-US/best-practices-templates.xml | 4 +-
.../change-network-offering-on-guest-network.xml | 36 +-
docs/en-US/change-to-behavior-of-list-commands.xml | 116 +++---
docs/en-US/changing-root-password.xml | 2 +-
docs/en-US/changing-secondary-storage-ip.xml | 40 +-
docs/en-US/changing-secondary-storage-servers.xml | 20 +-
docs/en-US/changing-secondary-storage-serversp.xml | 20 +-
docs/en-US/changing-service-offering-for-vm.xml | 46 +-
docs/en-US/changing-vm-name-os-group.xml | 58 ++--
docs/en-US/cloud-infrastructure-concepts.xml | 2 +-
docs/en-US/cloud-infrastructure-overview.xml | 40 +-
docs/en-US/cloudstack-admin.xml | 4 +-
docs/en-US/cloudstack.xml | 2 +-
docs/en-US/cloudstack_admin.xml | 4 +-
docs/en-US/cloudstack_developers.xml | 4 +-
docs/en-US/cloudstack_features.xml | 84 ++--
docs/en-US/cloudstack_installation.xml | 4 +-
docs/en-US/cloudstack_system_requirements.xml | 88 ++--
docs/en-US/cloudstack_trial_installation.xml | 4 +-
docs/en-US/cloudstack_whatis.xml | 28 +-
docs/en-US/cluster-add.xml | 4 +-
docs/en-US/compatibility-matrix.xml | 180 ++++----
docs/en-US/concepts.xml | 8 +-
.../configure-guest-traffic-in-advanced-zone.xml | 50 +-
...onfigure-public-traffic-in-an-advanced-zone.xml | 19 +
docs/en-US/configure-usage-server.xml | 2 +-
docs/en-US/configure-vpn.xml | 52 +-
docs/en-US/convert-hyperv-vm-to-template.xml | 84 ++--
docs/en-US/create-bare-metal-template.xml | 42 +-
docs/en-US/create-template-from-existing-vm.xml | 46 +-
docs/en-US/create-templates-overview.xml | 18 +-
docs/en-US/create-windows-template.xml | 24 +-
docs/en-US/creating-new-volumes.xml | 32 +-
docs/en-US/creating-vms.xml | 46 +-
docs/en-US/dates-in-usage-record.xml | 14 +-
docs/en-US/default-template.xml | 12 +-
docs/en-US/delete-templates.xml | 6 +-
docs/en-US/deleting-vms.xml | 32 +-
docs/en-US/deployment-architecture-overview.xml | 36 +-
docs/en-US/detach-move-volumes.xml | 36 +-
docs/en-US/developer-getting-started.xml | 24 +-
docs/en-US/developer-guide.xml | 4 +-
docs/en-US/developer-introduction.xml | 6 +-
docs/en-US/developer_guide.xml | 4 +-
docs/en-US/disk-volume-usage-record-format.xml | 38 +-
docs/en-US/dns-dhcp.xml | 4 +-
docs/en-US/domains.xml | 6 +-
docs/en-US/enable-disable-static-nat.xml | 36 +-
docs/en-US/enable-security-groups.xml | 4 +-
docs/en-US/enabling-api-call-expiration.xml | 28 +-
docs/en-US/enabling-port-8096.xml | 24 +-
docs/en-US/end-user-ui-overview.xml | 4 +-
docs/en-US/error-handling.xml | 8 +-
docs/en-US/event-log-queries.xml | 2 +-
docs/en-US/event-types.xml | 392 +++++++-------
docs/en-US/events-log.xml | 2 +-
docs/en-US/events.xml | 2 +-
.../example-response-from-listUsageRecords.xml | 60 ++--
docs/en-US/export-template.xml | 4 +-
docs/en-US/feature-overview.xml | 84 ++--
docs/en-US/firewall-rules.xml | 60 ++--
docs/en-US/first_ms_node_install.xml | 56 +-
docs/en-US/globally-configured-limit.xml | 148 +++---
docs/en-US/globally-configured-limits.xml | 148 +++---
docs/en-US/guest-ip-ranges.xml | 4 +-
docs/en-US/guest-network.xml | 6 +-
docs/en-US/guest-traffic.xml | 24 +-
docs/en-US/host-add.xml | 4 +-
.../hypervisor-support-for-primarystorage.xml | 154 +++---
docs/en-US/import-ami.xml | 72 ++--
docs/en-US/incremental-snapshots-backup.xml | 52 +-
...l-setup-of-external-firewalls-loadbalancers.xml | 4 +-
docs/en-US/initialize-and-test.xml | 4 +-
.../install-database-on-management-server-node.xml | 126 +++---
docs/en-US/install-database-on-separate-node.xml | 136 +++---
.../install-management-server-multi-nodes.xml | 80 ++--
docs/en-US/install-management-server.xml | 50 +-
docs/en-US/installation-complete.xml | 26 +-
docs/en-US/installation-steps-overview.xml | 110 ++--
docs/en-US/installation.xml | 10 +-
docs/en-US/installation_overview.xml | 14 +-
docs/en-US/introduction.xml | 6 +-
docs/en-US/ip-load-balancing.xml | 16 +-
docs/en-US/ipaddress-usage-record-format.xml | 32 +-
docs/en-US/job-status.xml | 14 +-
docs/en-US/linux-installation.xml | 44 +-
...cy-port-forwarding-rule-usage-record-format.xml | 28 +-
docs/en-US/log-in.xml | 12 +-
docs/en-US/long-running-job-events.xml | 2 +-
.../en-US/maintenance-mode-for-primary-storage.xml | 6 +-
docs/en-US/making-api-request.xml | 42 +-
docs/en-US/management-server-install-flow.xml | 18 +-
.../management-server-installation-overview.xml | 40 +-
docs/en-US/management-server-overview.xml | 66 ++--
.../en-US/management_server_multi_node_install.xml | 8 +-
docs/en-US/management_server_overview.xml | 60 ++--
docs/en-US/manual-live-migration.xml | 52 +-
docs/en-US/max-result-page-returned.xml | 26 +-
.../migrate-datadisk-volume-new-storage-pool.xml | 18 +-
...grate-vm-rootvolume-volume-new-storage-pool.xml | 22 +-
docs/en-US/minimum-system-requirements.xml | 130 +++---
docs/en-US/multi_node_overview.xml | 36 +-
.../en-US/network-offering-usage-record-format.xml | 34 +-
docs/en-US/network-usage-record-format.xml | 28 +-
docs/en-US/networking-in-a-pod.xml | 30 +-
docs/en-US/networking-in-a-zone.xml | 20 +-
docs/en-US/networking-overview.xml | 18 +-
docs/en-US/networking_overview.xml | 18 +-
docs/en-US/nfs-shares-on-management-server.xml | 133 +++---
docs/en-US/nfs-shares-on-separate-server.xml | 48 +-
...guration-of-external-firewalls-loadbalancer.xml | 25 +-
.../over-provisioning-service-offering-limits.xml | 29 +-
docs/en-US/per-domain-limits.xml | 27 +-
docs/en-US/performance-monitoring.xml | 21 +-
.../physical-network-configuration-settings.xml | 25 +-
docs/en-US/pod-add.xml | 25 +-
docs/en-US/port-forwarding.xml | 70 ++-
docs/en-US/prepare-nfs-shares.xml | 49 ++-
docs/en-US/prepare-os.xml | 180 ++++---
docs/en-US/prepare-system-vm-template.xml | 23 +-
docs/en-US/prepare_os.xml | 174 ++++---
docs/en-US/primary-storage-add.xml | 27 +-
.../en-US/primary-storage-outage-and-data-loss.xml | 21 +-
docs/en-US/primary-storage.xml | 28 +-
docs/en-US/private-public-template.xml | 30 +-
docs/en-US/projects.xml | 30 +-
docs/en-US/provisioning-auth-api.xml | 27 +-
docs/en-US/provisioning-steps-overview.xml | 61 ++-
docs/en-US/provisioning-steps.xml | 27 +-
docs/en-US/provisioning.xml | 6 +-
docs/en-US/query-filter.xml | 90 ++--
docs/en-US/release-ip-address.xml | 51 ++-
docs/en-US/release-notes-3.0.4.xml | 115 +++--
docs/en-US/remove-member-from-project.xml | 25 +-
docs/en-US/removed-API-commands.xml | 38 ++-
docs/en-US/removing-vsphere-hosts.xml | 25 +-
docs/en-US/removing-xenserver-kvm-hosts.xml | 24 +-
docs/en-US/requirements-templates.xml | 29 +-
docs/en-US/resizing-volumes.xml | 45 ++-
docs/en-US/response-formats.xml | 88 ++--
docs/en-US/responses.xml | 29 +-
docs/en-US/roles.xml | 37 +-
docs/en-US/root-admin-ui-overview.xml | 25 +-
...untime-allocation-virtual-network-resources.xml | 23 +-
docs/en-US/runtime-behavior-of-primary-storage.xml | 32 +-
...cheduled-maintenance-maintenance-mode-hosts.xml | 23 +-
docs/en-US/search-base.xml | 71 ++-
docs/en-US/search-user-bind-dn.xml | 65 ++-
docs/en-US/secondary-storage-add.xml | 27 +-
.../secondary-storage-outage-and-data-loss.xml | 25 +-
docs/en-US/secondary-storage-vm.xml | 34 +-
docs/en-US/secondary-storage.xml | 27 +-
docs/en-US/security-groups.xml | 21 +-
docs/en-US/send-projects-membership-invitation.xml | 30 +-
docs/en-US/service-offerings.xml | 23 +-
docs/en-US/set-database-buffer-pool-size.xml | 23 +-
.../en-US/set-monitor-total-vm-limits-per-host.xml | 23 +-
docs/en-US/set-projects-creator-permissions.xml | 31 +-
docs/en-US/set-resource-limits-for-projects.xml | 24 +-
docs/en-US/set-up-invitations.xml | 38 +-
docs/en-US/set-up-network-for-users.xml | 24 +-
docs/en-US/set-usage-limit.xml | 25 +-
docs/en-US/shared-networks.xml | 25 +-
docs/en-US/signing-api-requests.xml | 96 +++--
docs/en-US/site-to-site-vpn.xml | 24 +-
docs/en-US/snapshot-restore.xml | 27 +-
docs/en-US/standard-events.xml | 25 +-
docs/en-US/static-nat.xml | 23 +-
.../en-US/sticky-session-policies-for-lb-rules.xml | 29 +-
docs/en-US/stop-restart-management-server.xml | 23 +-
docs/en-US/stopped-vm.xml | 45 ++-
docs/en-US/stopping-and-starting-vms.xml | 29 +-
docs/en-US/storage-tags.xml | 30 +-
docs/en-US/storage.xml | 29 +-
docs/en-US/suspend-project.xml | 28 +-
docs/en-US/sys-reliability-and-ha.xml | 23 +-
docs/en-US/sysprep-for-windows-server-2003R2.xml | 86 ++--
docs/en-US/sysprep-windows-server-2008R2.xml | 30 +-
docs/en-US/system-reserved-ip-addresses.xml | 29 +-
docs/en-US/system-service-offerings.xml | 25 +-
docs/en-US/system-vm-template.xml | 22 +-
.../template-iso-snapshot-usage-record-format.xml | 58 ++-
docs/en-US/templates.xml | 29 +-
docs/en-US/time-zones.xml | 249 +++++-----
docs/en-US/trial-installation.xml | 22 +-
docs/en-US/troubleshooting-alerts.xml | 24 +-
...ooting-dataloss-on-exported-primary-storage.xml | 29 +-
docs/en-US/troubleshooting-lb-rules-fails.xml | 23 +-
...ing-maintenance-mode-not-working-on-vCenter.xml | 23 +-
...troubleshooting-recover-lost-virtual-router.xml | 25 +-
.../en-US/troubleshooting-unable-to-deploy-vms.xml | 24 +-
.../troubleshooting-unable-to-power-on-vm.xml | 26 +-
.../troubleshooting-working-with-server-logs.xml | 30 +-
docs/en-US/troubleshooting.xml | 40 +-
docs/en-US/tuning.xml | 24 +-
docs/en-US/ui.xml | 4 +-
...pgrade-virtual-router-with-service-offering.xml | 2 +-
docs/en-US/upload-existing-volume-to-vm.xml | 100 ++--
docs/en-US/upload-template.xml | 74 ++--
docs/en-US/usage-record-format.xml | 18 +-
docs/en-US/usage-types.xml | 190 ++++----
docs/en-US/user-services-overview.xml | 122 +++---
docs/en-US/using-multiple-guest-networks.xml | 10 +-
docs/en-US/using-netscaler-load-balancers.xml | 4 +-
docs/en-US/using-swift-for-secondary-storage.xml | 8 +-
docs/en-US/using-vpn-with-mac.xml | 6 +-
docs/en-US/using-vpn-with-windows.xml | 32 +-
docs/en-US/virtual-machine-usage-record-format.xml | 38 +-
docs/en-US/vm-lifecycle.xml | 34 +-
docs/en-US/vm-storage-migration.xml | 8 +-
docs/en-US/volume-deletion-garbage-collection.xml | 20 +-
docs/en-US/volume-status.xml | 8 +-
docs/en-US/vpn.xml | 30 +-
docs/en-US/whatis.xml | 38 +-
docs/en-US/whats-in-this-adminguide.xml | 10 +-
docs/en-US/who-should-read-installation.xml | 16 +-
docs/en-US/windows-installation.xml | 4 +-
docs/en-US/working-with-iso.xml | 12 +-
docs/en-US/working-with-snapshots.xml | 18 +-
docs/en-US/working-with-templates.xml | 10 +-
docs/en-US/working-with-usage-data.xml | 2 +-
docs/en-US/working-with-volumes.xml | 10 +-
docs/en-US/zone-add.xml | 2 +-
docs/publican-cloudstack/en-US/Feedback.xml | 22 +-
docs/runbook/en-US/Author_Group.xml | 8 +-
docs/runbook/en-US/Book_Info.xml | 40 +-
docs/runbook/en-US/Chapter.xml | 2 +-
docs/runbook/en-US/Environment.xml | 12 +-
docs/runbook/en-US/Management.xml | 10 +-
docs/runbook/en-US/Overview.xml | 20 +-
docs/runbook/en-US/Preface.xml | 10 +-
docs/runbook/en-US/Revision_History.xml | 28 +-
docs/runbook/en-US/Runbook.xml | 10 +-
docs/runbook/en-US/kvm.xml | 2 +-
.../hypervisor/kvm/resource/BridgeVifDriver.java | 197 ++++++++
.../kvm/resource/LibvirtComputingResource.java | 177 +++----
.../cloud/hypervisor/kvm/resource/VifDriver.java | 39 ++
.../hypervisor/kvm/resource/VifDriverBase.java | 55 ++
.../kvm/storage/KVMStoragePoolManager.java | 4 +
.../kvm/storage/LibvirtStorageAdaptor.java | 16 +-
.../hypervisor/kvm/storage/LibvirtStoragePool.java | 6 +-
scripts/storage/qcow2/managesnapshot.sh | 136 +++++-
.../src/com/cloud/storage/StorageManagerImpl.java | 4 +-
ui/scripts/system.js | 11 +-
ui/scripts/zoneWizard.js | 1 +
296 files changed, 6731 insertions(+), 4668 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b61468d6/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --cc core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index ffc766c,3f4679d..965dd63
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@@ -681,74 -614,32 +681,31 @@@ public class VirtualRoutingResource imp
final String vlanId, final String vlanGateway,
final String vlanNetmask, final String vifMacAddress, String guestIp, int nicNum){
- final Script command = new Script(_ipassocPath, _timeout, s_logger);
- command.add( privateIpAddress);
+ String args = "";
if (add) {
- command.add("-A");
+ args += "-A";
} else {
- command.add("-D");
+ args += "-D";
}
-
+ String cidrSize = Long.toString(NetUtils.getCidrSize(vlanNetmask));
if (sourceNat) {
- command.add("-s");
- }
+ args +=" -s";
+ }
if (firstIP) {
- command.add( "-f");
-
+ args += " -f";
}
- String cidrSize = Long.toString(NetUtils.getCidrSize(vlanNetmask));
- command.add( "-l", publicIpAddress + "/" + cidrSize);
+ args += " -l ";
+ args += publicIpAddress + "/" + cidrSize;
+
String publicNic = "eth" + nicNum;
- command.add("-c", publicNic);
-
- command.add("-g", vlanGateway);
-
+ args += " -c ";
+ args += publicNic;
- return command.execute();
+ args +=" -g ";
+ args += vlanGateway;
+ return routerProxy("ipassoc.sh", privateIpAddress, args);
}
-
+
- private void deletExitingLinkLocalRoutTable(String linkLocalBr) {
- Script command = new Script("/bin/bash", _timeout);
- command.add("-c");
- command.add("ip route | grep " + NetUtils.getLinkLocalCIDR());
- OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
- String result = command.execute(parser);
- boolean foundLinkLocalBr = false;
- if (result == null && parser.getLines() != null) {
- String[] lines = parser.getLines().split("\\n");
- for (String line : lines) {
- String[] tokens = line.split(" ");
- if (!tokens[2].equalsIgnoreCase(linkLocalBr)) {
- Script.runSimpleBashScript("ip route del " + NetUtils.getLinkLocalCIDR());
- } else {
- foundLinkLocalBr = true;
- }
- }
- }
- if (!foundLinkLocalBr) {
- Script.runSimpleBashScript("ifconfig " + linkLocalBr + " 169.254.0.1;" + "ip route add " + NetUtils.getLinkLocalCIDR() + " dev " + linkLocalBr + " src " + NetUtils.getLinkLocalGateway());
- }
- }
-
- public void createControlNetwork(String privBrName) {
- deletExitingLinkLocalRoutTable(privBrName);
- if (!isBridgeExists(privBrName)) {
- Script.runSimpleBashScript("brctl addbr " + privBrName + "; ifconfig " + privBrName + " up; ifconfig " + privBrName + " 169.254.0.1", _timeout);
- }
- }
-
- private boolean isBridgeExists(String bridgeName) {
- Script command = new Script("/bin/sh", _timeout);
- command.add("-c");
- command.add("brctl show|grep " + bridgeName);
- final OutputInterpreter.OneLineParser parser = new OutputInterpreter.OneLineParser();
- String result = command.execute(parser);
- if (result != null || parser.getLine() == null) {
- return false;
- } else {
- return true;
- }
- }
-
private void deleteBridge(String brName) {
Script cmd = new Script("/bin/sh", _timeout);
cmd.add("-c");
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b61468d6/docs/en-US/prepare-system-vm-template.xml
----------------------------------------------------------------------
diff --cc docs/en-US/prepare-system-vm-template.xml
index ff4b58a,ffef8cd..85f144e
--- a/docs/en-US/prepare-system-vm-template.xml
+++ b/docs/en-US/prepare-system-vm-template.xml
@@@ -3,35 -3,54 +3,54 @@@
<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
%BOOK_ENTITIES;
]>
+
+ <!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
+
<section id="prepare-system-vm-template">
- <title>Prepare the System VM Template</title>
- <para>Secondary storage must be seeded with a template that is used for &PRODUCT; system VMs.</para>
- <note><para>When copying and pasting a command, be sure the command has pasted as a single line before executing. Some document viewers may introduce unwanted line breaks in copied text.</para></note>
- <orderedlist>
- <listitem><para>On the Management Server, run one or more of the following cloud-install-sys-tmplt commands to retrieve and decompress the system VM template. Run the command for each hypervisor type that you expect end users to run in this Zone.</para>
- <para>If your secondary storage mount point is not named /mnt/secondary, substitute your own mount point name.</para>
- <para>If you set the &PRODUCT; database encryption type to "web" when you set up the database, you must now add the parameter -s <management-server-secret-key>. See About Password and Key Encryption.</para>
- <para>This process will require approximately 5 GB of free space on the local file system and up to 30 minutes each time it runs.</para>
- <itemizedlist>
- <listitem><para>For XenServer:</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.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>
- </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>
- </listitem>
- </itemizedlist>
- </listitem>
+ <title>Prepare the System VM Template</title>
+ <para>Secondary storage must be seeded with a template that is used for &PRODUCT; system VMs.</para>
+ <note><para>When copying and pasting a command, be sure the command has pasted as a single line before executing. Some document viewers may introduce unwanted line breaks in copied text.</para></note>
+ <orderedlist>
+ <listitem><para>On the Management Server, run one or more of the following cloud-install-sys-tmplt commands to retrieve and decompress the system VM template. Run the command for each hypervisor type that you expect end users to run in this Zone.</para>
+ <para>If your secondary storage mount point is not named /mnt/secondary, substitute your own mount point name.</para>
+ <para>If you set the &PRODUCT; database encryption type to "web" when you set up the database, you must now add the parameter -s <management-server-secret-key>. See About Password and Key Encryption.</para>
+ <para>This process will require approximately 5 GB of free space on the local file system and up to 30 minutes each time it runs.</para>
+ <itemizedlist>
+ <listitem><para>For XenServer:</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.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/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>
+ </listitem>
+ </itemizedlist>
+ </listitem>
- <listitem><para>2. If you are using a separate NFS server, perform this step. If you are using the Management Server as the NFS server, you MUST NOT perform this step.</para>
+ <listitem><para>If you are using a separate NFS server, perform this step. If you are using the Management Server as the NFS server, you MUST NOT perform this step.</para>
- <para>When the script has finished, unmount secondary storage and remove the created directory.</para>
- <programlisting>
+ <para>When the script has finished, unmount secondary storage and remove the created directory.</para>
+ <programlisting>
# umount /mnt/secondary
# rmdir /mnt/secondary
- </programlisting>
- </listitem>
- <listitem><para>Repeat these steps for each secondary storage server.</para>
- </listitem>
- </orderedlist>
+ </programlisting>
+ </listitem>
+ <listitem><para>Repeat these steps for each secondary storage server.</para>
+ </listitem>
+ </orderedlist>
</section>