mirror of https://github.com/apache/cloudstack.git
replace cloud.com with CloudStack in text
This commit is contained in:
frank
parent
9696e917ab
commit
404e69490a
|
|
@ -6,7 +6,6 @@
|
|||
<ul>
|
||||
<li><a href="http://www.cloudstack.org">Community</a> - forums, code, bugbase, blog, events, links to outside resources, IRC, and more</li>
|
||||
<li><a href="http://cloud.mindtouch.us">Documentation and Knowledge Base</a> - installation steps, guides, references, troubleshooting tips</li>
|
||||
<li><a href="http://cloud.com">Cloud.com</a>
|
||||
</ul>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ import com.cloud.template.VirtualMachineTemplate;
|
|||
import com.cloud.user.Account;
|
||||
import com.cloud.user.UserContext;
|
||||
|
||||
@Implementation(responseObject=TemplateResponse.class, description="Registers an existing ISO into the Cloud.com Cloud.")
|
||||
@Implementation(responseObject=TemplateResponse.class, description="Registers an existing ISO into the CloudStack Cloud.")
|
||||
public class RegisterIsoCmd extends BaseCmd {
|
||||
public static final Logger s_logger = Logger.getLogger(RegisterIsoCmd.class.getName());
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ import com.cloud.exception.ResourceAllocationException;
|
|||
import com.cloud.template.VirtualMachineTemplate;
|
||||
import com.cloud.user.UserContext;
|
||||
|
||||
@Implementation(description="Registers an existing template into the Cloud.com cloud. ", responseObject=TemplateResponse.class)
|
||||
@Implementation(description="Registers an existing template into the CloudStack cloud. ", responseObject=TemplateResponse.class)
|
||||
public class RegisterTemplateCmd extends BaseCmd {
|
||||
public static final Logger s_logger = Logger.getLogger(RegisterTemplateCmd.class.getName());
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Copyright 2008 Cloud.Com Inc. All Rights Reserved -->
|
||||
|
||||
<project name="Cloud.com Cloud Stack Build Dispatch" default="help" basedir=".">
|
||||
<project name="Cloud Stack Build Dispatch" default="help" basedir=".">
|
||||
<description>
|
||||
This is the overall dispatch file. It includes other build
|
||||
files but doesnot provide targets of its own. Do not modify
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
developer.xml.
|
||||
</description>
|
||||
|
||||
<dirname property="base.dir" file="${ant.file.Cloud.com Cloud Stack Build Dispatch}"/>
|
||||
<dirname property="base.dir" file="${ant.file.Cloud Stack Build Dispatch}"/>
|
||||
|
||||
<condition property="build-cloud.properties.file" value="${base.dir}/build/override/build-cloud.properties" else="${base.dir}/build/build-cloud.properties">
|
||||
<available file="${base.dir}/build/override/build-cloud.properties" />
|
||||
|
|
|
|||
|
|
@ -525,7 +525,7 @@
|
|||
</target>
|
||||
|
||||
<target name="help">
|
||||
<echo level="info" message="Ant Build File for Cloud.com Cloud Stack" />
|
||||
<echo level="info" message="Ant Build File for CloudStack" />
|
||||
<echo level="info" message="Type 'ant -projecthelp' to get a list of targets and their descriptions." />
|
||||
</target>
|
||||
<target name="usage" depends="help" />
|
||||
|
|
|
|||
|
|
@ -9,6 +9,6 @@ svn.revision=2
|
|||
|
||||
# copyright year
|
||||
company.copyright.year=2008-2011
|
||||
company.url=http://www.cloud.com
|
||||
company.url=http://cloudstack.org
|
||||
company.license.name=GPL
|
||||
company.name=Cloud.com Inc.
|
||||
company.name=CloudStack
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!-- Copyright 2008 Cloud.com, Inc. All Rights Reserved -->
|
||||
|
||||
<project name="Cloud.com Developer Targets" basedir=".">
|
||||
<project name="CloudStack Developer Targets" basedir=".">
|
||||
<description>
|
||||
This is a developer.xml with tools to start and stop tomcat and
|
||||
generally developer targets that has nothing to do with compiling.
|
||||
</description>
|
||||
|
||||
<dirname property="base.dir" file="${ant.file.Cloud.com Developer Targets}/.."/>
|
||||
<dirname property="base.dir" file="${ant.file.CloudStack Developer Targets}/.."/>
|
||||
<property name="build.dir" location="${base.dir}/build"/>
|
||||
|
||||
<property name="tomcat.home" location="${env.CATALINA_HOME}"/>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!-- Copyright 2008 Cloud.com, Inc. All Rights Reserved -->
|
||||
|
||||
<project name="Cloud Stack Package" basedir=".">
|
||||
<description>
|
||||
This is a package.xml with tools to package the cloud stack distribution
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
cluster.node.IP=127.0.0.1
|
||||
cluster.servlet.port=9090
|
||||
|
||||
# Cloud.com database settings
|
||||
# CloudStack database settings
|
||||
db.cloud.username=@DBUSER@
|
||||
db.cloud.password=@DBPW@
|
||||
db.cloud.host=@DBHOST@
|
||||
db.cloud.port=3306
|
||||
db.cloud.name=cloud
|
||||
|
||||
# Cloud.com database tuning parameters
|
||||
# CloudStack database tuning parameters
|
||||
db.cloud.maxActive=250
|
||||
db.cloud.maxIdle=30
|
||||
db.cloud.maxWait=10000
|
||||
|
|
@ -26,7 +26,7 @@ db.cloud.logAbandoned=true
|
|||
db.cloud.poolPreparedStatements=false
|
||||
db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true
|
||||
|
||||
# Cloud.com database SSL settings
|
||||
# CloudStack database SSL settings
|
||||
db.cloud.useSSL=false
|
||||
db.cloud.keyStore=
|
||||
db.cloud.keyStorePassword=
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#
|
||||
|
||||
|
||||
'''Implements the Cloud.com API'''
|
||||
'''Implements the CloudStack API'''
|
||||
|
||||
|
||||
from cloudtool.utils import describe
|
||||
|
|
|
|||
|
|
@ -6,43 +6,43 @@ cloud (2.2.2) unstable; urgency=low
|
|||
|
||||
cloud (2.1.97) unstable; urgency=low
|
||||
|
||||
* Bumping version number for next Cloud.com release
|
||||
* Bumping version number for next CloudStack release
|
||||
|
||||
-- Rudd-O <manuel@cloud.com> Sat, 31 Jul 2010 19:09:54 -0700
|
||||
|
||||
cloud (2.0.97) unstable; urgency=low
|
||||
|
||||
* Bumping version number for next Cloud.com release
|
||||
* Bumping version number for next CloudStack release
|
||||
|
||||
-- Rudd-O <manuel@cloud.com> Mon, 12 Jul 2010 14:01:41 -0700
|
||||
|
||||
cloud (2.0.2) unstable; urgency=low
|
||||
|
||||
* Bumping version number for next Cloud.com release
|
||||
* Bumping version number for next CloudStack release
|
||||
|
||||
-- Rudd-O <manuel@cloud.com> Fri, 2 Jul 2010 19:55:41 -0700
|
||||
|
||||
cloud (2.0.0) unstable; urgency=low
|
||||
|
||||
* Bumping version number for next Cloud.com release
|
||||
* Bumping version number for next CloudStack release
|
||||
|
||||
-- Rudd-O <manuel@cloud.com> Tue, 15 Jun 2010 12:10:05 -0700
|
||||
|
||||
cloud (1.9.14) unstable; urgency=low
|
||||
|
||||
* Bumping version number for next Cloud.com release
|
||||
* Bumping version number for next CloudStack release
|
||||
|
||||
-- Rudd-O <manuel@cloud.com> Tue, 11 May 2010 14:46:14 -0700
|
||||
|
||||
cloud (1.9.12) unstable; urgency=low
|
||||
|
||||
* Bumping version number for Cloud.com RC4 release
|
||||
* Bumping version number for CloudStack RC4 release
|
||||
|
||||
-- Rudd-O <manuel@cloud.com> Mon, 3 May 2010 14:46:14 -0700
|
||||
|
||||
cloud (1.9.11) unstable; urgency=low
|
||||
|
||||
* Bumping version number for Cloud.com release
|
||||
* Bumping version number for CloudStack release
|
||||
|
||||
-- Rudd-O <manuel@cloud.com> Fri, 30 Apr 2010 15:08:38 -0700
|
||||
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ Conflicts: vmops-deps
|
|||
Replaces: vmops-deps
|
||||
Architecture: any
|
||||
Depends: openjdk-6-jre, cloud-agent-deps
|
||||
Description: Cloud.com library dependencies
|
||||
Description: CloudStack library dependencies
|
||||
This package contains a number of third-party dependencies
|
||||
not shipped by distributions, required to run the Cloud.com
|
||||
not shipped by distributions, required to run the CloudStack
|
||||
Cloud Stack.
|
||||
|
||||
Package: cloud-agent-deps
|
||||
|
|
@ -23,9 +23,9 @@ Conflicts: cloud-agent-deps
|
|||
Replaces: cloud-agent-deps
|
||||
Architecture: any
|
||||
Depends: openjdk-6-jre
|
||||
Description: Cloud.com agent library dependencies
|
||||
Description: CloudStack agent library dependencies
|
||||
This package contains a number of third-party dependencies
|
||||
not shipped by distributions, required to run the Cloud.com
|
||||
not shipped by distributions, required to run the CloudStack
|
||||
Cloud Stack.
|
||||
|
||||
|
||||
|
|
@ -35,9 +35,9 @@ Conflicts: vmops-utils
|
|||
Replaces: vmops-utils
|
||||
Architecture: any
|
||||
Depends: openjdk-6-jre, python
|
||||
Description: Cloud.com utility library
|
||||
The Cloud.com utility libraries provide a set of Java classes used
|
||||
in the Cloud.com Cloud Stack.
|
||||
Description: CloudStack utility library
|
||||
The CloudStack utility libraries provide a set of Java classes used
|
||||
in the CloudStack Cloud Stack.
|
||||
|
||||
Package: cloud-client-ui
|
||||
Provides: vmops-client-ui
|
||||
|
|
@ -45,11 +45,11 @@ Conflicts: vmops-client-ui
|
|||
Replaces: vmops-client-ui
|
||||
Architecture: any
|
||||
Depends: openjdk-6-jre, cloud-client (= ${source:Version})
|
||||
Description: Cloud.com management server UI
|
||||
The Cloud.com management server is the central point of coordination,
|
||||
management, and intelligence in the Cloud.com Cloud Stack. This package
|
||||
Description: CloudStack management server UI
|
||||
The CloudStack management server is the central point of coordination,
|
||||
management, and intelligence in the CloudStack Cloud Stack. This package
|
||||
is a requirement of the cloud-client package, which installs the
|
||||
Cloud.com management server.
|
||||
CloudStack management server.
|
||||
|
||||
Package: cloud-server
|
||||
Provides: vmops-server
|
||||
|
|
@ -57,9 +57,9 @@ Conflicts: vmops-server
|
|||
Replaces: vmops-server
|
||||
Architecture: any
|
||||
Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (= ${source:Version}), cloud-deps (= ${source:Version}), libservlet2.5-java
|
||||
Description: Cloud.com server library
|
||||
The Cloud.com server libraries provide a set of Java classes used
|
||||
in the Cloud.com Cloud Stack.
|
||||
Description: CloudStack server library
|
||||
The CloudStack server libraries provide a set of Java classes used
|
||||
in the CloudStack Cloud Stack.
|
||||
|
||||
Package: cloud-agent-scripts
|
||||
Provides: vmops-agent-scripts, vmops-console, cloud-console, vmops-console-proxy
|
||||
|
|
@ -67,10 +67,10 @@ Conflicts: vmops-agent-scripts, vmops-console, cloud-console, vmops-console-prox
|
|||
Replaces: vmops-agent-scripts, vmops-console, cloud-console, vmops-console-proxy
|
||||
Architecture: any
|
||||
Depends: openjdk-6-jre, python, bash, bzip2, gzip, unzip, nfs-common, openssh-client
|
||||
Description: Cloud.com agent scripts
|
||||
The Cloud.com agent is in charge of managing shared computing resources in
|
||||
a Cloud.com Cloud Stack-powered cloud. Install this package if this computer
|
||||
will participate in your cloud -- this is a requirement for the Cloud.com
|
||||
Description: CloudStack agent scripts
|
||||
The CloudStack agent is in charge of managing shared computing resources in
|
||||
a CloudStack Cloud Stack-powered cloud. Install this package if this computer
|
||||
will participate in your cloud -- this is a requirement for the CloudStack
|
||||
agent.
|
||||
|
||||
Package: cloud-daemonize
|
||||
|
|
@ -78,9 +78,9 @@ Provides: vmops-daemonize
|
|||
Conflicts: vmops-daemonize
|
||||
Replaces: vmops-daemonize
|
||||
Architecture: any
|
||||
Description: Cloud.com daemonization utility
|
||||
Description: CloudStack daemonization utility
|
||||
This package contains a program that daemonizes the specified
|
||||
process. The Cloud.com Cloud Stack uses this to start the agent
|
||||
process. The CloudStack Cloud Stack uses this to start the agent
|
||||
as a service.
|
||||
|
||||
Package: cloud-core
|
||||
|
|
@ -89,9 +89,9 @@ Conflicts: vmops-core
|
|||
Replaces: vmops-core
|
||||
Architecture: any
|
||||
Depends: openjdk-6-jre, cloud-utils (= ${source:Version})
|
||||
Description: Cloud.com core library
|
||||
The Cloud.com core libraries provide a set of Java classes used
|
||||
in the Cloud.com Cloud Stack.
|
||||
Description: CloudStack core library
|
||||
The CloudStack core libraries provide a set of Java classes used
|
||||
in the CloudStack Cloud Stack.
|
||||
|
||||
Package: cloud-test
|
||||
Provides: vmops-test
|
||||
|
|
@ -99,9 +99,9 @@ Conflicts: vmops-test
|
|||
Replaces: vmops-test
|
||||
Architecture: any
|
||||
Depends: openjdk-6-jre, wget, cloud-utils (= ${source:Version}), cloud-deps (= ${source:Version})
|
||||
Description: Cloud.com test suite
|
||||
The Cloud.com test package contains a suite of automated tests
|
||||
that the very much appreciated QA team at Cloud.com constantly
|
||||
Description: CloudStack test suite
|
||||
The CloudStack test package contains a suite of automated tests
|
||||
that the very much appreciated QA team at CloudStack constantly
|
||||
uses to help increase the quality of the Cloud Stack.
|
||||
|
||||
Package: cloud-client
|
||||
|
|
@ -110,9 +110,9 @@ Conflicts: vmops-client
|
|||
Replaces: vmops-client
|
||||
Architecture: any
|
||||
Depends: openjdk-6-jre, cloud-deps (= ${source:Version}), cloud-utils (= ${source:Version}), cloud-server (= ${source:Version}), cloud-client-ui (= ${source:Version}), cloud-setup (= ${source:Version}), cloud-agent-scripts (= ${source:Version}), cloud-python (= ${source:Version}), tomcat6, libws-commons-util-java, libcommons-dbcp-java, libcommons-collections-java, libcommons-httpclient-java, sysvinit-utils, chkconfig, sudo, jsvc, python-mysqldb, python-paramiko, augeas-tools, genisoimage, cloud-system-iso
|
||||
Description: Cloud.com client
|
||||
The Cloud.com management server is the central point of coordination,
|
||||
management, and intelligence in the Cloud.com Cloud Stack. This package
|
||||
Description: CloudStack client
|
||||
The CloudStack management server is the central point of coordination,
|
||||
management, and intelligence in the CloudStack Cloud Stack. This package
|
||||
is required for the management server to work.
|
||||
|
||||
Package: cloud-setup
|
||||
|
|
@ -121,21 +121,21 @@ Conflicts: vmops-setup
|
|||
Replaces: vmops-setup
|
||||
Architecture: any
|
||||
Depends: openjdk-6-jre, python, cloud-utils (= ${source:Version}), cloud-deps (= ${source:Version}), cloud-server (= ${source:Version}), cloud-python (= ${source:Version}), python-mysqldb
|
||||
Description: Cloud.com client
|
||||
The Cloud.com setup tools let you set up your Management Server and Usage Server.
|
||||
Description: CloudStack client
|
||||
The CloudStack setup tools let you set up your Management Server and Usage Server.
|
||||
|
||||
Package: cloud-python
|
||||
Architecture: any
|
||||
Depends: python
|
||||
Description: Cloud.com Python library
|
||||
The Cloud.com Python library contains a few Python modules that the
|
||||
Description: CloudStack Python library
|
||||
The CloudStack Python library contains a few Python modules that the
|
||||
CloudStack uses.
|
||||
|
||||
Package: cloud-agent-libs
|
||||
Architecture: any
|
||||
Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (= ${source:Version}), cloud-agent-deps (= ${source:Version}), libcommons-httpclient-java, libcommons-collections-java, libcommons-dbcp-java, libcommons-pool-java, libcommons-logging-java
|
||||
Description: Cloud.com agent libraries
|
||||
The Cloud.com agent libraries are used by the Cloud Agent and the Cloud
|
||||
Description: CloudStack agent libraries
|
||||
The CloudStack agent libraries are used by the Cloud Agent and the Cloud
|
||||
Console Proxy.
|
||||
|
||||
Package: cloud-agent
|
||||
|
|
@ -144,24 +144,24 @@ Conflicts: vmops-agent
|
|||
Replaces: vmops-agent
|
||||
Architecture: any
|
||||
Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (= ${source:Version}), cloud-agent-deps (= ${source:Version}), python, cloud-python (= ${source:Version}), cloud-agent-libs (= ${source:Version}), cloud-agent-scripts (= ${source:Version}), libcommons-httpclient-java, libcommons-collections-java, libcommons-dbcp-java, libcommons-pool-java, libcommons-logging-java, libvirt0, cloud-daemonize, sysvinit-utils, chkconfig, qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, jnetpcap, ebtables, vlan, libcglib-java, libcommons-httpclient-java, libservlet2.5-java, liblog4j1.2-java, libjna-java, wget
|
||||
Description: Cloud.com agent
|
||||
The Cloud.com agent is in charge of managing shared computing resources in
|
||||
a Cloud.com Cloud Stack-powered cloud. Install this package if this computer
|
||||
Description: CloudStack agent
|
||||
The CloudStack agent is in charge of managing shared computing resources in
|
||||
a CloudStack Cloud Stack-powered cloud. Install this package if this computer
|
||||
will participate in your cloud.
|
||||
|
||||
Package: cloud-system-iso
|
||||
Architecture: any
|
||||
Description: Cloud.com system iso
|
||||
The Cloud.com agent is in charge of managing shared computing resources in
|
||||
a Cloud.com Cloud Stack-powered cloud. Install this package if this computer
|
||||
Description: CloudStack system iso
|
||||
The CloudStack agent is in charge of managing shared computing resources in
|
||||
a CloudStack Cloud Stack-powered cloud. Install this package if this computer
|
||||
will participate in your cloud.
|
||||
|
||||
Package: cloud-console-proxy
|
||||
Architecture: any
|
||||
Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (= ${source:Version}), cloud-deps (= ${source:Version}), cloud-agent-libs (= ${source:Version}), python, cloud-python (= ${source:Version}), libcommons-httpclient-java, libcommons-collections-java, libcommons-dbcp-java, libcommons-pool-java, libcommons-logging-java, cloud-daemonize, sysvinit-utils, chkconfig, augeas-tools, uuid-runtime, grep, iproute
|
||||
Description: Cloud.com console proxy
|
||||
The Cloud.com console proxy is the service in charge of granting console
|
||||
access into virtual machines managed by the Cloud.com CloudStack.
|
||||
Description: CloudStack console proxy
|
||||
The CloudStack console proxy is the service in charge of granting console
|
||||
access into virtual machines managed by the CloudStack CloudStack.
|
||||
|
||||
Package: cloud-usage
|
||||
Provides: vmops-usage
|
||||
|
|
@ -169,6 +169,6 @@ Conflicts: vmops-usage
|
|||
Replaces: vmops-usage
|
||||
Architecture: any
|
||||
Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (= ${source:Version}), cloud-deps (= ${source:Version}), cloud-server (= ${source:Version}), cloud-daemonize (= ${source:Version}), cloud-setup (= ${source:Version}), cloud-client (= ${source:Version})
|
||||
Description: Cloud.com usage monitor
|
||||
The Cloud.com usage monitor provides usage accounting across the entire cloud for
|
||||
Description: CloudStack usage monitor
|
||||
The CloudStack usage monitor provides usage accounting across the entire cloud for
|
||||
cloud operators to charge based on usage parameters.
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ a:hover.toplink {background:url(images/top_icon_hover.png) no-repeat top left;}
|
|||
</div>
|
||||
<div class="header_right">
|
||||
<div class="externallinks_box">
|
||||
<a href="#">Cloud.com</a> | <a href="#">Community</a>
|
||||
<a href="#">CloudStack</a> | <a href="#">Community</a>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ a:hover.toplink {background:url(images/top_icon_hover.png) no-repeat top left;}
|
|||
</div>
|
||||
<div class="header_right">
|
||||
<div class="externallinks_box">
|
||||
<a href="#">Cloud.com</a> | <a href="#">Community</a>
|
||||
<a href="#">CloudStack</a> | <a href="#">Community</a>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
"""Cloud.com Python utility library"""
|
||||
"""CloudStack Python utility library"""
|
||||
|
||||
import sys, os, subprocess, errno, re, time, glob
|
||||
import urllib2
|
||||
|
|
@ -1072,7 +1072,6 @@ def setup_consoleproxy_config(configfile, host, zone, pod):
|
|||
# =========================== DATABASE MIGRATION SUPPORT CODE ===================
|
||||
|
||||
# Migrator, Migratee and Evolvers -- this is the generic infrastructure.
|
||||
# To actually implement Cloud.com-specific code, search "Cloud.com-specific evolvers and context"
|
||||
|
||||
|
||||
class MigratorException(Exception): pass
|
||||
|
|
|
|||
|
|
@ -604,7 +604,7 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
|
|||
@Override
|
||||
public void run() {
|
||||
// TODO scan vSphere for newly added hosts.
|
||||
// we are going to both support adding host from Cloud.com UI and
|
||||
// we are going to both support adding host from CloudStack UI and
|
||||
// adding host via vSphere server
|
||||
//
|
||||
// will implement host scanning later
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ public class DatabaseIntegrityChecker implements SystemIntegrityChecker {
|
|||
|
||||
boolean noDuplicate = true;
|
||||
StringBuffer helpInfo = new StringBuffer();
|
||||
String note = "DATABASE INTEGRITY ERROR\nManagement server detected there are some hosts connect to the same loacal storage, please contact Cloud.com support team for solution. Below are detialed info, please attach all of them to Cloud.com support. Thank you\n";
|
||||
String note = "DATABASE INTEGRITY ERROR\nManagement server detected there are some hosts connect to the same loacal storage, please contact CloudStack support team for solution. Below are detialed info, please attach all of them to CloudStack support. Thank you\n";
|
||||
helpInfo.append(note);
|
||||
while (rs.next()) {
|
||||
long poolId = rs.getLong(1);
|
||||
|
|
@ -216,7 +216,7 @@ public class DatabaseIntegrityChecker implements SystemIntegrityChecker {
|
|||
}
|
||||
|
||||
if (!checkMissedPremiumUpgradeFor228()) {
|
||||
s_logger.error("Your current database version is 2.2.8, management server detected some missed premium upgrade, please contact Cloud.com support and attach log file. Thank you!");
|
||||
s_logger.error("Your current database version is 2.2.8, management server detected some missed premium upgrade, please contact CloudStack support and attach log file. Thank you!");
|
||||
throw new CloudRuntimeException("Detected missed premium upgrade");
|
||||
}
|
||||
} finally {
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ version="1.0">
|
|||
<li> <a href="#"> Contacts</a> </li>
|
||||
|
||||
</ul>
|
||||
<p>Copyright 2010 Cloud.com, Inc. All rights reserved </p>
|
||||
<p>Copyright 2010 CloudStack, Inc. All rights reserved </p>
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
|
|
|
|||
|
|
@ -334,7 +334,7 @@ for example:
|
|||
def checkDbserverHostname():
|
||||
self.info("Checking mysql server hostname ...", None)
|
||||
if resolves_to_ipv6(self, self.port):
|
||||
err = "%s resolves to an IPv6 address. The Cloud.com CloudStack does not support IPv6 yet.\nPlease fix this issue in either /etc/hosts or your DNS configuration.\n"%self.host
|
||||
err = "%s resolves to an IPv6 address. The CloudStack does not support IPv6 yet.\nPlease fix this issue in either /etc/hosts or your DNS configuration.\n"%self.host
|
||||
self.errorAndExit(err)
|
||||
self.info(None, True)
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ How to run the migration tool:
|
|||
* Run "python upgrade.py publicips". This will immediately allocate the public IPs of all users in the 1.0.x system, so that existing 2.1.x users can't allocate them.
|
||||
|
||||
8. Run "python upgrade.py" on the 2.1.x management server. Status information will be printed out to the console.
|
||||
* If there is an error, please contact Cloud.com Support and send us the migration log. By default, this file is called "migrationLog" and is in the same directory as upgrade.py.
|
||||
* If there is an error, please contact CloudStack Support and send us the migration log. By default, this file is called "migrationLog" and is in the same directory as upgrade.py.
|
||||
* After the cause for an error has been resolved, you can run upgrade.py again from the beginning; it will skip over any work that has already been done.
|
||||
* If you would like to re-enable a user on 1.0.x system, simply stop all of the user's VMs that have been migrated on the 2.1.x system, and start the user's VMs on the 1.0.x system.
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
<!--
|
||||
Custom Style Sheet
|
||||
- Default Cloud.com styling of the site. This file contains the easiest portion of the site
|
||||
- Default CloudStack styling of the site. This file contains the easiest portion of the site
|
||||
that can be styled to your companie's need such as logo, top navigation, and dialogs.
|
||||
-->
|
||||
<link rel= "stylesheet" href="css/cloud_custom.css" type="text/css" />
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
cluster.node.IP=127.0.0.1
|
||||
cluster.servlet.port=9090
|
||||
|
||||
# Cloud.com database settings
|
||||
# CloudStack database settings
|
||||
db.cloud.username=cloud
|
||||
db.cloud.password=cloud
|
||||
db.cloud.host=localhost
|
||||
db.cloud.port=3306
|
||||
db.cloud.name=cloud
|
||||
|
||||
# Cloud.com database tuning parameters
|
||||
# CloudStack database tuning parameters
|
||||
db.cloud.maxActive=250
|
||||
db.cloud.maxIdle=30
|
||||
db.cloud.maxWait=10000
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
/*
|
||||
* This file was modified by Cloud.com to omit encoding for non-ascii characters - this functionality is needed by multi-language support
|
||||
* Line 86 was modified; lines 114-117 were added
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright 2011 Cloud.com.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
|
@ -84,7 +78,7 @@ public class URLEncoder {
|
|||
|
||||
for (int i = 0; i < path.length(); i++) {
|
||||
int c = (int) path.charAt(i);
|
||||
//NOTICE - !isPureAscii(path.charAt(i)) check was added by Cloud.com
|
||||
//NOTICE - !isPureAscii(path.charAt(i)) check was added by CloudStack
|
||||
if (safeCharacters.get(c) || !isPureAscii(path.charAt(i))) {
|
||||
rewrittenPath.append((char) c);
|
||||
} else {
|
||||
|
|
@ -113,7 +107,7 @@ public class URLEncoder {
|
|||
}
|
||||
|
||||
|
||||
//NOTICE - this part was added by Cloud.com
|
||||
//NOTICE - this part was added by CloudStack
|
||||
public static boolean isPureAscii(Character v) {
|
||||
return asciiEncoder.canEncode(v);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,3 @@
|
|||
/**
|
||||
* Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
|
||||
*
|
||||
* This software is licensed under the GNU General Public License v3 or later.
|
||||
*
|
||||
* It is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or any later version.
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
package javax.persistence;
|
||||
|
||||
import static java.lang.annotation.ElementType.FIELD;
|
||||
|
|
|
|||
|
|
@ -1,20 +1,3 @@
|
|||
/**
|
||||
* Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
|
||||
*
|
||||
* This software is licensed under the GNU General Public License v3 or later.
|
||||
*
|
||||
* It is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or any later version.
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
package javax.persistence;
|
||||
|
||||
import static java.lang.annotation.ElementType.FIELD;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import com.vmware.vim25.ObjectContent;
|
|||
import com.vmware.vim25.VirtualMachineConfigSpec;
|
||||
|
||||
/**
|
||||
* Interface to consolidate ESX(i) hosts and HA/FT clusters into a common interface used by Cloud.com Hypervisor resources
|
||||
* Interface to consolidate ESX(i) hosts and HA/FT clusters into a common interface used by CloudStack Hypervisor resources
|
||||
*/
|
||||
public interface VmwareHypervisorHost {
|
||||
VmwareContext getContext();
|
||||
|
|
|
|||
Loading…
Reference in New Issue