merge from master
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5fee8911 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5fee8911 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5fee8911 Branch: refs/heads/javelin Commit: 5fee89116231a73efb8cb462a745f491e4f70995 Parents: 387c6fc 5a0f600 Author: Kelven Yang <[email protected]> Authored: Thu Oct 11 17:42:25 2012 -0700 Committer: Kelven Yang <[email protected]> Committed: Thu Oct 11 17:42:25 2012 -0700 ---------------------------------------------------------------------- .gitignore | 9 +- INSTALL.md | 143 + INSTALL.txt | 70 - LICENSE | 163 +- README.md | 2 +- .../src/com/cloud/agent/manager/MockVmManager.java | 21 +- .../com/cloud/agent/manager/MockVmManagerImpl.java | 67 +- .../cloud/agent/manager/SimulatorManagerImpl.java | 46 +- .../cloud/simulator/SimulatorRuntimeException.java | 19 +- agent/pom.xml | 5 +- api/pom.xml | 5 +- .../cloud/agent/api/SetupGuestNetworkCommand.java | 4 + api/src/com/cloud/api/commands/AddVpnUserCmd.java | 2 +- .../api/commands/CreatePortForwardingRuleCmd.java | 51 +- .../com/cloud/api/commands/RemoveVpnUserCmd.java | 2 +- .../api/commands/UpdatePhysicalNetworkCmd.java | 12 +- .../cloud/network/vpn/RemoteAccessVpnService.java | 2 +- api/src/com/cloud/projects/ProjectService.java | 2 + api/src/com/cloud/resource/ResourceState.java | 1 + api/src/com/cloud/user/UserAccount.java | 2 + awsapi/LICENSE.txt | 203 -- awsapi/NOTICE.txt | 26 - awsapi/conf/cloud-bridge.properties | 50 +- awsapi/docs/AmazonEC2/EC2-API-tool-setup.txt | 68 - .../docs/AmazonEC2/EC2-implementation-guide.html | 164 -- .../docs/AmazonEC2/EC2-local-deploy-using-ant.html | 92 - awsapi/docs/AmazonEC2/EC2-users-guide.html | 275 -- awsapi/docs/AmazonEC2/wsdl2java-command-line.txt | 21 - awsapi/docs/AmazonS3/S3-users-guide.html | 120 - awsapi/docs/AmazonS3/notes.txt | 29 - awsapi/docs/AmazonS3/wsdl2java-command-line.txt | 66 - awsapi/pom.xml | 157 +- awsapi/resource/AmazonEC2/crypto.properties | 48 +- awsapi/resource/Axis2/axis2.xml | 1122 ++++---- awsapi/scripts/run.bat | 36 +- .../dao/CloudStackConfigurationDaoImpl.java | 7 +- .../com/cloud/bridge/service/EC2MainServlet.java | 2 +- awsapi/test/html/certSubmit.html | 74 +- awsapi/test/html/testRestURL.txt | 88 +- awsapi/web/web.xml | 290 +- build/build-aws-api.xml | 6 +- .../WEB-INF/classes/resources/messages.properties | 4 +- client/pom.xml | 97 +- cloud-cli/cloudapis/cloud.py | 6 +- cloud.spec | 52 +- console-proxy/certs/realhostip.csr | 30 +- console-proxy/js/ajaxviewer.js | 550 +++-- console-proxy/pom.xml | 48 +- .../cloud/consoleproxy/ConsoleProxyGCThread.java | 1 + console-proxy/ui/viewer-bad-sid.ftl | 58 +- console-proxy/ui/viewer-connect-failed.ftl | 58 +- console-proxy/ui/viewer.ftl | 118 +- core/pom.xml | 19 +- .../vmware/mo/TestVmwareContextFactory.java | 43 - .../cloud/hypervisor/vmware/mo/TestVmwareMO.java | 40 - .../hypervisor/vmware/util/TestVmwareUtil.java | 107 - core/test/com/cloud/vmware/TestVMWare.java | 1140 -------- debian/changelog | 24 + debian/control | 12 +- debian/rules | 10 +- deps/XenServerJava/pom.xml | 5 +- deps/pom.xml | 20 +- developer/pom.xml | 238 ++ docs/.tx/config | 2139 +++++++++++++++ docs/README.txt | 61 +- docs/en-US/API_Developers_Guide.ent | 21 + docs/en-US/API_Developers_Guide.xml | 51 + docs/en-US/Admin_Guide.ent | 22 + docs/en-US/Admin_Guide.xml | 51 + docs/en-US/Book_Info_Admin.xml | 46 + docs/en-US/Book_Info_Build_All.xml | 44 + docs/en-US/CloudStack_Nicira_NVP_Guide.ent | 22 + docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 54 + docs/en-US/Installation_Guide.ent | 22 + docs/en-US/Installation_Guide.xml | 55 + docs/en-US/Revision_History_Install_Guide.xml | 55 + docs/en-US/accounts.xml | 9 + docs/en-US/acquire-new-ip-for-vpc.xml | 73 + docs/en-US/add-additional-guest-network.xml | 70 +- docs/en-US/add-clusters-kvm-xenserver.xml | 53 + docs/en-US/add-clusters-ovm.xml | 43 + docs/en-US/add-clusters-vsphere.xml | 121 + docs/en-US/add-gateway-vpc.xml | 104 + docs/en-US/add-ingress-egress-rules.xml | 181 +- docs/en-US/add-iso.xml | 214 +- docs/en-US/add-load-balancer-rule.xml | 98 +- docs/en-US/add-loadbalancer-rule-vpc.xml | 123 + docs/en-US/add-members-to-projects.xml | 2 + docs/en-US/add-more-clusters.xml | 29 + docs/en-US/add-portforward-rule-vpc.xml | 103 + docs/en-US/add-primary-storage.xml | 108 + docs/en-US/add-secondary-storage.xml | 48 + docs/en-US/add-security-group.xml | 44 +- docs/en-US/add-tier.xml | 89 + docs/en-US/add-vm-to-tier.xml | 45 + docs/en-US/add-vpc.xml | 75 + docs/en-US/added-API-commands.xml | 487 +++-- docs/en-US/advanced-zone-configuration.xml | 587 +++-- ...dvanced-zone-physical-network-configuration.xml | 16 +- docs/en-US/api-overview.xml | 38 + .../automatic-snapshot-creation-retention.xml | 31 +- docs/en-US/aws-ec2-configuration.xml | 64 + docs/en-US/aws-ec2-introduction.xml | 47 + docs/en-US/aws-ec2-requirements.xml | 30 + docs/en-US/aws-ec2-supported-commands.xml | 407 +++ docs/en-US/aws-ec2-user-setup.xml | 91 + docs/en-US/aws-interface-guide.xml | 32 + docs/en-US/castor-with-cs.xml | 87 + docs/en-US/change-to-behavior-of-list-commands.xml | 184 +- docs/en-US/changed-apicommands-4.0.xml | 268 ++ docs/en-US/choosing-a-deployment-architecture.xml | 29 + docs/en-US/citrix-xenserver-installation.xml | 48 +- docs/en-US/cloud-infrastructure-concepts.xml | 11 + docs/en-US/cloud-infrastructure-overview.xml | 75 +- docs/en-US/cloudstack-admin.xml | 30 - docs/en-US/cloudstack.xml | 63 +- docs/en-US/cloudstack_admin.xml | 52 - docs/en-US/cloudstack_developers.ent | 22 - docs/en-US/cloudstack_developers.xml | 31 - docs/en-US/cloudstack_features.xml | 66 - docs/en-US/cloudstack_installation.xml | 30 - docs/en-US/cloudstack_system_requirements.xml | 68 - docs/en-US/cloudstack_trial_installation.xml | 30 - docs/en-US/cloudstack_whatis.xml | 39 - docs/en-US/configure-acl.xml | 139 + .../configure-guest-traffic-in-advanced-zone.xml | 93 +- docs/en-US/configure-package-repository.xml | 46 + ...onfigure-public-traffic-in-an-advanced-zone.xml | 11 +- docs/en-US/configure-vpc.xml | 36 + docs/en-US/configuring-projects.xml | 17 +- docs/en-US/create-vpn-connection-vpc.xml | 103 + docs/en-US/create-vpn-customer-gateway.xml | 191 ++ docs/en-US/create-vpn-gateway-for-vpc.xml | 80 + docs/en-US/create-vr-network-offering.xml | 108 + docs/en-US/delete-reset-vpn.xml | 89 + docs/en-US/enable-disable-static-nat-vpc.xml | 97 + docs/en-US/global-config.xml | 54 + docs/en-US/host-add-vsphere.xml | 28 + docs/en-US/host-add-xenserver-kvm-ovm.xml | 88 + docs/en-US/host-add.xml | 8 + docs/en-US/hypervisor-host-install-flow.xml | 34 - docs/en-US/hypervisor-installation.xml | 29 + docs/en-US/hypervisor-kvm-install-flow.xml | 34 + docs/en-US/images/large-scale-redundant-setup.png | Bin 0 -> 109117 bytes docs/en-US/images/multi-node-management-server.png | Bin 0 -> 26912 bytes docs/en-US/images/multi-site-deployment.png | Bin 0 -> 68190 bytes docs/en-US/images/nic-bonding-and-multipath-io.png | Bin 0 -> 42030 bytes docs/en-US/images/remove-vpc.png | Bin 0 -> 815 bytes docs/en-US/images/remove-vpn.png | Bin 0 -> 735 bytes docs/en-US/images/reset-vpn.png | Bin 0 -> 860 bytes docs/en-US/images/separate-storage-network.png | Bin 0 -> 44556 bytes docs/en-US/images/small-scale-deployment.png | Bin 0 -> 50772 bytes docs/en-US/installation-steps-overview.xml | 35 +- docs/en-US/installation.xml | 3 +- docs/en-US/installation_overview.xml | 33 - docs/en-US/inter-vlan-routing.xml | 107 + docs/en-US/large_scale_redundant_setup.xml | 42 + .../management-server-install-db-external.xml | 99 +- docs/en-US/management-server-install-db-local.xml | 82 +- docs/en-US/management-server-install-db.xml | 34 + docs/en-US/management-server-install-flow.xml | 3 +- .../en-US/management-server-install-multi-node.xml | 2 +- .../en-US/management-server-install-prepare-os.xml | 2 +- docs/en-US/multi_node_management_server.xml | 36 + docs/en-US/multi_site_deployment.xml | 50 + docs/en-US/networks.xml | 48 + docs/en-US/plugin-niciranvp-about.xml | 28 + docs/en-US/plugin-niciranvp-devicemanagement.xml | 47 + docs/en-US/plugin-niciranvp-features.xml | 29 + docs/en-US/plugin-niciranvp-guide.xml | 31 + docs/en-US/plugin-niciranvp-introduction.xml | 26 + docs/en-US/plugin-niciranvp-preparations.xml | 36 + docs/en-US/plugin-niciranvp-provider.xml | 42 + docs/en-US/plugin-niciranvp-revisions.xml | 45 + docs/en-US/plugin-niciranvp-tables.xml | 51 + docs/en-US/plugin-niciranvp-troubleshooting.xml | 28 + docs/en-US/plugin-niciranvp-usage.xml | 29 + docs/en-US/plugin-niciranvp-uuidreferences.xml | 30 + docs/en-US/prepare_os.xml | 106 - docs/en-US/primary-storage-add.xml | 50 + docs/en-US/projects-overview.xml | 31 + docs/en-US/projects.xml | 6 + docs/en-US/provisioning-steps.xml | 7 +- docs/en-US/provisioning-steps.xml.orig | 42 + docs/en-US/provisioning.xml | 29 - docs/en-US/re-install-hosts.xml | 26 + docs/en-US/release-ip-for-vpc.xml | 80 + docs/en-US/release-notes-3.0.4.ent | 22 - docs/en-US/release-notes.ent | 22 + docs/en-US/remove-tier.xml | 55 + docs/en-US/remove-vpc.xml | 68 + docs/en-US/secondary-storage-add.xml | 55 +- docs/en-US/security-groups.xml | 5 + docs/en-US/separate_storage_network.xml | 24 + docs/en-US/set-global-project-resource-limits.xml | 82 + docs/en-US/set-per-project-resource-limits.xml | 55 + docs/en-US/set-projects-creator-permissions.xml | 91 +- docs/en-US/set-resource-limits-for-projects.xml | 42 +- docs/en-US/small_scale_deployment.xml | 37 + docs/en-US/storage-overview.xml | 27 + docs/en-US/suspend-project.xml | 42 +- docs/en-US/system-service-offerings.xml | 32 +- docs/en-US/trial-installation.xml | 28 - docs/en-US/using-sshkeys.xml | 116 +- docs/en-US/virtual-machines.xml | 34 + docs/publican-adminguide.cfg | 30 + docs/publican-all.cfg | 3 +- docs/publican-cloudstack/en-US/images/dot.png | Bin 341 -> 173 bytes docs/publican-devguide.cfg | 2 +- docs/publican-install.cfg | 29 - docs/publican-installation.cfg | 3 +- docs/publican-plugin-niciranvp.cfg | 28 + docs/publican-release-notes-4_0.cfg | 27 - docs/publican-release-notes.cfg | 27 + docs/publican-trial-install.cfg | 29 - patches/pom.xml | 5 +- patches/systemvm/debian/config/bin/vhd-util | Bin 294148 -> 0 bytes .../debian/config/etc/httpd/conf/httpd.conf | 990 ------- .../debian/config/etc/init.d/cloud-early-config | 42 +- .../debian/config/etc/init.d/cloud-passwd-srvr | 4 +- .../config/etc/iptables/iptables-consoleproxy | 1 - .../debian/config/etc/iptables/iptables-secstorage | 2 - patches/systemvm/debian/config/etc/logrotate.conf | 12 - .../debian/config/opt/cloud/bin/passwd_server | 20 +- .../debian/config/opt/cloud/bin/passwd_server_ip | 32 + .../debian/config/opt/cloud/bin/patchsystemvm.sh | 35 +- .../debian/config/opt/cloud/bin/serve_password.sh | 11 +- .../debian/config/opt/cloud/bin/vpc_guestnw.sh | 52 +- .../debian/config/opt/cloud/bin/vpc_passwd_server | 32 + .../root/redundant_router/arping_gateways.sh.templ | 17 + .../config/root/redundant_router/backup.sh.templ | 16 + .../root/redundant_router/check_heartbeat.sh.templ | 17 + .../root/redundant_router/checkrouter.sh.templ | 17 + .../config/root/redundant_router/disable_pubip.sh | 1 + .../root/redundant_router/enable_pubip.sh.templ | 27 +- .../config/root/redundant_router/fault.sh.templ | 16 + .../root/redundant_router/heartbeat.sh.templ | 16 + .../root/redundant_router/keepalived.conf.templ | 39 +- .../config/root/redundant_router/master.sh.templ | 16 + patches/systemvm/debian/vpn/etc/ipsec.conf | 43 +- patches/systemvm/debian/vpn/etc/ipsec.conf.orig | 48 - patches/systemvm/debian/vpn/etc/ipsec.secrets | 10 - patches/systemvm/debian/vpn/etc/ipsec.secrets.orig | 11 - .../debian/vpn/etc/xl2tpd/xl2tpd.conf.orig | 76 - .../systemvm/debian/xe/xe-linux-distribution.init | 106 - patches/systemvm/debian/xe/xen-vcpu-hotplug.rules | 1 - .../user-concentrated-pod/pom.xml | 5 +- .../deployment-planners/user-dispersing/pom.xml | 5 +- plugins/file-systems/netapp/pom.xml | 5 +- plugins/host-allocators/random/pom.xml | 5 +- plugins/hypervisors/kvm/agent-descriptor.xml | 68 + plugins/hypervisors/kvm/pom.xml | 57 +- .../hypervisor/kvm/resource/BridgeVifDriver.java | 41 +- .../kvm/resource/LibvirtComputingResource.java | 77 +- .../kvm/storage/KVMStoragePoolManager.java | 2 +- .../kvm/storage/LibvirtStorageAdaptor.java | 121 +- .../hypervisor/kvm/storage/StorageAdaptor.java | 2 +- plugins/hypervisors/ovm/pom.xml | 12 +- plugins/hypervisors/vmware/pom.xml | 23 +- .../vmware/manager/VmwareManagerImpl.java | 32 +- .../hypervisor/vmware/resource/VmwareResource.java | 9 +- .../VmwareSecondaryStorageContextFactory.java | 10 +- plugins/hypervisors/xen/pom.xml | 16 +- .../xen/resource/CitrixResourceBase.java | 2 +- .../hypervisor/xen/resource/XcpOssResource.java | 6 +- .../network-elements/elastic-loadbalancer/pom.xml | 5 +- plugins/network-elements/f5/pom.xml | 5 +- plugins/network-elements/juniper-srx/pom.xml | 5 +- plugins/network-elements/netscaler/pom.xml | 5 +- plugins/network-elements/nicira-nvp/pom.xml | 5 +- plugins/network-elements/ovs/pom.xml | 5 +- plugins/pom.xml | 6 +- plugins/storage-allocators/random/pom.xml | 5 +- plugins/user-authenticators/ldap/pom.xml | 5 +- plugins/user-authenticators/md5/pom.xml | 5 +- plugins/user-authenticators/plain-text/pom.xml | 5 +- pom.xml | 129 +- scripts/vm/hypervisor/xenserver/vhd-util | Bin 318977 -> 0 bytes scripts/vm/hypervisor/xenserver/vmops | 21 + scripts/vm/network/vnet/modifyvlan.sh | 31 +- scripts/vm/systemvm/injectkeys.sh | 3 +- server/pom.xml | 31 +- server/src/com/cloud/api/ApiDBUtils.java | 4 + server/src/com/cloud/api/ApiResponseHelper.java | 8 +- server/src/com/cloud/configuration/Config.java | 2 +- .../consoleproxy/ConsoleProxyManagerImpl.java | 36 +- .../com/cloud/migration/Db21to22MigrationUtil.java | 3 - .../src/com/cloud/network/NetworkManagerImpl.java | 30 +- .../com/cloud/network/rules/RulesManagerImpl.java | 18 + .../network/vpn/RemoteAccessVpnManagerImpl.java | 4 +- .../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 8 +- .../src/com/cloud/projects/ProjectManagerImpl.java | 5 + server/src/com/cloud/projects/dao/ProjectDao.java | 2 + .../src/com/cloud/projects/dao/ProjectDaoImpl.java | 8 + .../src/com/cloud/storage/StorageManagerImpl.java | 7 +- .../cloud/storage/listener/StoragePoolMonitor.java | 6 +- .../storage/snapshot/SnapshotManagerImpl.java | 63 +- .../storage/snapshot/SnapshotSchedulerImpl.java | 9 +- .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 3 + .../src/com/cloud/upgrade/dao/Upgrade40to41.java | 83 + server/src/com/cloud/user/AccountManagerImpl.java | 17 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 9 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 5 +- .../src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 2 +- .../com/cloud/projects/MockProjectManagerImpl.java | 6 + setup/apidoc/generateadmincommands.xsl | 4 +- setup/apidoc/generatedomainadmincommands.xsl | 4 +- setup/apidoc/generatetoc_header.xsl | 2 +- setup/apidoc/generateusercommands.xsl | 4 +- setup/bindir/cloud-setup-databases.in | 26 +- setup/bindir/cloud-setup-encryption.in | 4 +- setup/db/create-index-fk.sql | 2 + setup/db/db/schema-2214to30.sql | 16 + setup/db/db/schema-301to302.sql | 2 + setup/db/db/schema-302to40.sql | 2 + setup/db/db/schema-30to301.sql | 2 + test/pom.xml | 5 +- test/scripts/wget.exe | Bin 162816 -> 0 bytes test/setup-test-data.sh | 2 +- tools/build/build_asf.sh | 28 +- tools/build/build_docs.sh | 55 + tools/build/installer/debinstall_full.sh | 163 ++ tools/build/installer/rpminstall_full.sh | 178 ++ tools/devcloud/devcloud.cfg | 51 +- .../puppet-devcloud/files/builddevcloud.sh | 6 + .../puppet-devcloud/files/installmaven.sh | 22 + .../devcloudbox/puppet-devcloud/manifests/init.pp | 17 + tools/gcc/README | 261 -- tools/gcc/compiler.jar | Bin 4212432 -> 0 bytes tools/gcc/gcc.sh | 40 - tools/guest_password/cloud-set-guest-password | 116 + tools/whisker/descriptor.xml | 396 ++-- ui/css/cloudstack3.css | 19 +- ui/dictionary.jsp | 2 + ui/index.jsp | 3 + ui/scripts/accounts.js | 170 +- ui/scripts/domains.js | 207 +- ui/scripts/events.js | 109 +- ui/scripts/instanceWizard.js | 6 +- ui/scripts/instances.js | 163 +- ui/scripts/network.js | 365 ++- ui/scripts/projects.js | 103 +- ui/scripts/sharedFunctions.js | 44 + ui/scripts/storage.js | 194 ++- ui/scripts/system.js | 132 +- ui/scripts/templates.js | 139 +- ui/scripts/ui-custom/instanceWizard.js | 64 +- ui/scripts/ui/dialog.js | 107 +- ui/scripts/ui/widgets/detailView.js | 2 +- ui/scripts/ui/widgets/listView.js | 109 +- ui/scripts/ui/widgets/tagger.js | 16 +- ui/scripts/zoneWizard.js | 8 +- .../centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 31 +- .../fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 31 +- .../rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 31 +- usage/pom.xml | 6 +- utils/LICENSE | 202 -- utils/pom.xml | 29 +- vmware-base/pom.xml | 5 +- .../vmware/mo/TestVmwareContextFactory.java | 43 + .../cloud/hypervisor/vmware/mo/TestVmwareMO.java | 40 + .../hypervisor/vmware/util/TestVmwareUtil.java | 107 + vmware-base/test/com/cloud/vmware/TestVMWare.java | 1140 ++++++++ wscript | 10 +- 364 files changed, 16089 insertions(+), 8943 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5fee8911/console-proxy/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5fee8911/docs/en-US/accounts.xml ---------------------------------------------------------------------- diff --cc docs/en-US/accounts.xml index aa62f68,f8683e8..08404c8 --- a/docs/en-US/accounts.xml +++ b/docs/en-US/accounts.xml @@@ -5,25 -5,26 +5,34 @@@ ]> <!-- 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. + 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. --> ++<<<<<<< HEAD +<chapter id="accounts"> + <title>Accounts</title> + <xi:include href="accounts-users-domains.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="LDAPserver-for-user-authentication.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> +</chapter> ++======= + <section id="accounts"> + <title>Accounts</title> + <xi:include href="accounts-users-domains.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="LDAPserver-for-user-authentication.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + + </section> ++>>>>>>> master http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5fee8911/docs/en-US/advanced-zone-physical-network-configuration.xml ---------------------------------------------------------------------- diff --cc docs/en-US/advanced-zone-physical-network-configuration.xml index 0d917da,2c3d9b3..8a68c2d --- a/docs/en-US/advanced-zone-physical-network-configuration.xml +++ b/docs/en-US/advanced-zone-physical-network-configuration.xml @@@ -11,9 -10,7 +10,13 @@@ 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 ++<<<<<<< HEAD + http://www.apache.org/licenses/LICENSE-2.0 + ++======= ++ http://www.apache.org/licenses/LICENSE-2.0 ++>>>>>>> master 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 @@@ -22,8 -19,11 +25,19 @@@ under the License. --> <section id="advanced-zone-physical-network-configuration"> ++<<<<<<< HEAD + <title>Advanced Zone Physical Network Configuration</title> + <para>Within a zone that uses advanced networking, you need to tell the Management Server how the physical network is set up to carry different kinds of traffic in isolation.</para> + <xi:include href="configure-guest-traffic-in-advanced-zone.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="configure-public-traffic-in-an-advanced-zone.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> +</section> ++======= + <title>Advanced Zone Physical Network Configuration</title> + <para>Within a zone that uses advanced networking, you need to tell the Management Server how the + physical network is set up to carry different kinds of traffic in isolation.</para> + <xi:include href="configure-guest-traffic-in-advanced-zone.xml" + xmlns:xi="http://www.w3.org/2001/XInclude"/> + <xi:include href="configure-public-traffic-in-an-advanced-zone.xml" + xmlns:xi="http://www.w3.org/2001/XInclude"/> -</section> ++</section> ++>>>>>>> master http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5fee8911/docs/en-US/cloud-infrastructure-concepts.xml ---------------------------------------------------------------------- diff --cc docs/en-US/cloud-infrastructure-concepts.xml index 8860d3a,7fc9efa..df59fed --- a/docs/en-US/cloud-infrastructure-concepts.xml +++ b/docs/en-US/cloud-infrastructure-concepts.xml @@@ -24,11 -24,11 +24,22 @@@ <chapter id="cloud-infrastructure-concepts"> <title>Cloud Infrastructure Concepts</title> ++<<<<<<< HEAD + <xi:include href="about-zones.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="about-pods.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="about-clusters.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="about-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="about-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="about-secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="about-physical-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> +</chapter> ++======= + <xi:include href="about-zones.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="about-pods.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="about-clusters.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="about-hosts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="about-primary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="about-secondary-storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="about-physical-networks.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> -</chapter> ++</chapter> ++>>>>>>> master http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5fee8911/docs/en-US/host-add.xml ---------------------------------------------------------------------- diff --cc docs/en-US/host-add.xml index b112d07,37cf28d..cf67dd3 --- a/docs/en-US/host-add.xml +++ b/docs/en-US/host-add.xml @@@ -27,7 -27,7 +27,11 @@@ <orderedlist> <listitem><para>Before adding a host to the &PRODUCT; configuration, you must first install your chosen hypervisor on the host. &PRODUCT; can manage hosts running VMs under a variety of hypervisors.</para> <para>The &PRODUCT; Installation Guide provides instructions on how to install each supported hypervisor ++<<<<<<< HEAD + and configure it for use with &PRODUCT;. See the Installation Guide for information about which version of your chosen hypervisor is supported, as well as crucial additional steps to configure the hosts for use with &PRODUCT;.</para> ++======= + and configure it for use with &PRODUCT;. See the appropriate section in the Installation Guide for information about which version of your chosen hypervisor is supported, as well as crucial additional steps to configure the hypervisor hosts for use with &PRODUCT;.</para> ++>>>>>>> master <warning><para>Be sure you have performed the additional &PRODUCT;-specific configuration steps described in the hypervisor installation section for your particular hypervisor.</para></warning> </listitem> <listitem><para>Now add the hypervisor host to &PRODUCT;. The technique to use varies depending on the hypervisor.</para> @@@ -39,4 -39,4 +43,8 @@@ </orderedlist> <xi:include href="host-add-xenserver-kvm-ovm.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="host-add-vsphere.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> -</section> ++<<<<<<< HEAD +</section> ++======= ++</section> ++>>>>>>> master http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5fee8911/docs/en-US/primary-storage-add.xml ---------------------------------------------------------------------- diff --cc docs/en-US/primary-storage-add.xml index 401588c,5581e9e..bebbc5c --- a/docs/en-US/primary-storage-add.xml +++ b/docs/en-US/primary-storage-add.xml @@@ -23,32 -23,52 +23,82 @@@ --> <section id="primary-storage-add"> ++<<<<<<< HEAD + <title>Adding Primary Storage</title> + <note><para>Ensure that nothing stored on the server. Adding the server to &PRODUCT; will destroy any existing data.</para></note> + <para>When you create a new zone, the first primary storage is added as part of that procedure. You can add primary storage servers at any time, such as when adding a new cluster or adding more servers to an existing cluster.</para> + <orderedlist> + <listitem><para>Log in to the &PRODUCT; UI.</para></listitem> ++======= + <title>Add Primary Storage</title> + <section id="sys-require-primary-storage"> + <title>System Requirements for Primary Storage</title> + <para>Hardware requirements:</para> + <itemizedlist> + <listitem><para>Any standards-compliant iSCSI or NFS server that is supported by the underlying hypervisor.</para></listitem> + <listitem><para>The storage server should be a machine with a large number of disks. The disks should ideally be managed by a hardware RAID controller.</para></listitem> + <listitem><para>Minimum required capacity depends on your needs.</para></listitem> + </itemizedlist> + <para>When setting up primary storage, follow these restrictions:</para> + <itemizedlist> + <listitem><para>Primary storage cannot be added until a host has been added to the cluster.</para></listitem> + <listitem><para>If you do not provision shared primary storage, you must set the global configuration parameter system.vm.local.storage.required to true, or else you will not be able to start VMs.</para></listitem> + </itemizedlist> + </section> + <section id="adding-primary-storage"> + <title>Adding Primary Stroage</title> + <para>When you create a new zone, the first primary storage is added as part of that procedure. You can add primary storage servers at any time, such as when adding a new cluster or adding more servers to an existing cluster.</para> + <warning><para>Be sure there is nothing stored on the server. Adding the server to &PRODUCT; will destroy any existing data.</para></warning> + <orderedlist> + <listitem><para>Log in to the &PRODUCT; UI (see <xref linkend="log-in" />).</para></listitem> ++>>>>>>> master <listitem><para>In the left navigation, choose Infrastructure. In Zones, click View More, then click the zone in which you want to add the primary storage.</para></listitem> <listitem><para>Click the Compute tab.</para></listitem> <listitem><para>In the Primary Storage node of the diagram, click View All.</para></listitem> <listitem><para>Click Add Primary Storage.</para></listitem> ++<<<<<<< HEAD + <listitem><para>Provide the following information in the dialog. The information required varies depending on your choice in Protocol.</para> + <itemizedlist> + <listitem><para>Pod. The pod for the storage device.</para></listitem> + <listitem><para>Cluster. The cluster for the storage device.</para></listitem> + <listitem><para>Name. The name of the storage device</para></listitem> + <listitem><para>Protocol. For XenServer, choose either NFS, iSCSI, or PreSetup. For KVM, choose NFS or SharedMountPoint. For vSphere choose either VMFS (iSCSI or FiberChannel) or NFS</para></listitem> + <listitem><para>Server (for NFS, iSCSI, or PreSetup). The IP address or DNS name of the storage device</para></listitem> + <listitem><para>Server (for VMFS). The IP address or DNS name of the vCenter server.</para></listitem> + <listitem><para>Path (for NFS). In NFS this is the exported path from the server.</para></listitem> + <listitem><para>Path (for VMFS). In vSphere this is a combination of the datacenter name and the datastore name. The format is "/" datacenter name "/" datastore name. For example, "/cloud.dc.VM/cluster1datastore".</para></listitem> + <listitem><para>Path (for SharedMountPoint). With KVM this is the path on each host that is where this primary storage is mounted. For example, "/mnt/primary".</para></listitem> + <listitem><para>SR Name-Label (for PreSetup). Enter the name-label of the SR that has been set up outside &PRODUCT;.</para></listitem> + <listitem><para>Target IQN (for iSCSI). In iSCSI this is the IQN of the target. For example, iqn.1986-03.com.sun:02:01ec9bb549-1271378984</para></listitem> + <listitem><para>Lun # (for iSCSI). In iSCSI this is the LUN number. For example, 3.</para></listitem> + <listitem><para>Tags (optional). The comma-separated list of tags for this storage device. It should be an equivalent set or superset of the tags on your disk offerings</para></listitem> + </itemizedlist> + <para>The tag sets on primary storage across clusters in a Zone must be identical. For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.</para></listitem> + <listitem><para>Click OK.</para></listitem> + </orderedlist> ++======= + <listitem> + <para>Provide the following information in the dialog. The information required varies depending on your choice in Protocol.</para> + <itemizedlist> + <listitem><para><emphasis role="bold">Pod.</emphasis> The pod for the storage device.</para></listitem> + <listitem><para><emphasis role="bold">Cluster.</emphasis> The cluster for the storage device.</para></listitem> + <listitem><para><emphasis role="bold">Name.</emphasis> The name of the storage device.</para></listitem> + <listitem><para><emphasis role="bold">Protocol.</emphasis> For XenServer, choose either NFS, iSCSI, or PreSetup. For KVM, choose NFS or SharedMountPoint. For vSphere choose either VMFS (iSCSI or FiberChannel) or NFS.</para></listitem> + <listitem><para><emphasis role="bold">Server (for NFS, iSCSI, or PreSetup).</emphasis> The IP address or DNS name of the storage device.</para></listitem> + <listitem><para><emphasis role="bold">Server (for VMFS).</emphasis> The IP address or DNS name of the vCenter server.</para></listitem> + <listitem><para><emphasis role="bold">Path (for NFS).</emphasis> In NFS this is the exported path from the server.</para></listitem> + <listitem><para><emphasis role="bold">Path (for VMFS).</emphasis> In vSphere this is a combination of the datacenter name and the datastore name. The format is "/" datacenter name "/" datastore name. For example, "/cloud.dc.VM/cluster1datastore".</para></listitem> + <listitem><para><emphasis role="bold">Path (for SharedMountPoint).</emphasis> With KVM this is the path on each host that is where this primary storage is mounted. For example, "/mnt/primary".</para></listitem> + <listitem><para><emphasis role="bold">SR Name-Label (for PreSetup).</emphasis> Enter the name-label of the SR that has been set up outside &PRODUCT;.</para></listitem> + <listitem><para><emphasis role="bold">Target IQN (for iSCSI).</emphasis> In iSCSI this is the IQN of the target. For example, iqn.1986-03.com.sun:02:01ec9bb549-1271378984.</para></listitem> + <listitem><para><emphasis role="bold">Lun # (for iSCSI).</emphasis> In iSCSI this is the LUN number. For example, 3.</para></listitem> + <listitem><para><emphasis role="bold">Tags (optional).</emphasis> The comma-separated list of tags for this storage device. It should be an equivalent set or superset of the tags on your disk offerings..</para></listitem> + </itemizedlist> + <para>The tag sets on primary storage across clusters in a Zone must be identical. For example, if cluster A provides primary storage that has tags T1 and T2, all other clusters in the Zone must also provide primary storage that has tags T1 and T2.</para> + </listitem> + <listitem><para>Click OK.</para></listitem> + </orderedlist> + + </section> ++>>>>>>> master </section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5fee8911/docs/en-US/projects.xml ---------------------------------------------------------------------- diff --cc docs/en-US/projects.xml index f26248f,39ce96b..862223d --- a/docs/en-US/projects.xml +++ b/docs/en-US/projects.xml @@@ -25,14 -25,9 +25,20 @@@ <chapter id="projects"> <title>Using Projects to Organize Users and Resources</title> <xi:include href="projects-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> ++<<<<<<< HEAD + <xi:include href="set-up-invitations.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="configuring-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="set-resource-limits-for-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="set-projects-creator-permissions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="create-new-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="add-members-to-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="send-projects-membership-invitation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="add-projects-members-from-ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> ++======= ++ <xi:include href="configuring-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> ++ <xi:include href="create-new-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> ++ <xi:include href="add-members-to-projects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> ++>>>>>>> master <xi:include href="accept-membership-invite.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="suspend-project.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="use-project-view.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5fee8911/docs/en-US/provisioning-steps.xml ---------------------------------------------------------------------- diff --cc docs/en-US/provisioning-steps.xml index 27fc162,9871743..dc6cbad --- a/docs/en-US/provisioning-steps.xml +++ b/docs/en-US/provisioning-steps.xml @@@ -5,22 -5,23 +5,26 @@@ ]> <!-- 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. + 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. --> ++<<<<<<< HEAD ++======= + ++>>>>>>> master <chapter id="provisioning-steps"> <title>Steps to Provisioning Your Cloud Infrastructure</title> <para>This section tells how to add zones, pods, clusters, hosts, storage, and networks to your cloud. If you are unfamiliar with these entities, please begin by looking through <xref linkend="cloud-infrastructure-concepts" />.</para> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5fee8911/docs/en-US/security-groups.xml ---------------------------------------------------------------------- diff --cc docs/en-US/security-groups.xml index 0745815,55f2a72..07b9f79 --- a/docs/en-US/security-groups.xml +++ b/docs/en-US/security-groups.xml @@@ -23,9 -23,8 +23,14 @@@ --> <section id="security-groups"> ++<<<<<<< HEAD + <title>Using Security Groups to Control Traffic to VMs</title> + <xi:include href="about-security-groups.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> ++======= + <title>Security Groups</title> + <xi:include href="add-security-group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> ++>>>>>>> master <xi:include href="enable-security-groups.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <xi:include href="add-security-group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> <xi:include href="add-ingress-egress-rules.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> </section> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5fee8911/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java ----------------------------------------------------------------------
