etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9408 for the move away from download.cloud.com 

- commented some occurences of cloud.com as being harmless
  * examples
  * identifiers (internal)
 - changed the URL for vhd-util download
 - changed comments from 'cloud.com' to 'Apache CloudStack'
This commit is contained in:
Daan Hoogland 2016-06-07 12:20:36 +02:00 committed by Rohit Yadav
parent fb1afb1a70
commit f07d729086
19 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/com/cloud/offering/ServiceOffering.java
View File

@ -31,6 +31,7 @@ public interface ServiceOffering extends DiskOffering, InfrastructureEntity, Int
public static final String routerDefaultOffUniqueName = "Cloud.Com-SoftwareRouter";
public static final String elbVmDefaultOffUniqueName = "Cloud.Com-ElasticLBVm";
public static final String internalLbVmDefaultOffUniqueName = "Cloud.Com-InternalLBVm";
// leaving cloud.com references as these are identifyers and no real world adresses (check against DB)
public enum StorageType {
local, shared

2
api/src/com/cloud/resource/ResourceService.java
View File

@ -53,7 +53,7 @@ public interface ResourceService {
Host reconnectHost(ReconnectHostCmd cmd);
/**
* We will automatically create a cloud.com cluster to attach to the external cluster and return a hyper host to perform
* We will automatically create an Apache CloudStack cluster to attach to the external cluster and return a hyper host to perform
* host related operation within the cluster
*
* @param cmd

1
api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java
View File

@ -75,6 +75,7 @@ public class AutoScaleVmProfileResponse extends BaseResponse implements Controll
@Parameter(name = ApiConstants.CS_URL,
type = CommandType.STRING,
description = "the API URL including port of the CloudStack Management Server example: http://server.cloud.com:8080/client/api?")
// leaving cloud.com reference above as it serves only as an example
private String csUrl;
@SerializedName(ApiConstants.ACCOUNT)

2
packaging/centos63/cloud.spec
View File

@ -445,7 +445,7 @@ grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.pr
grep -s -q "db.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in
echo Please download vhd-util from http://cloudstack.apt-get.eu/tools/vhd-util and put it in
echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
fi

2
packaging/centos7/cloud.spec
View File

@ -402,7 +402,7 @@ grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.pr
grep -s -q "db.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in
echo Please download vhd-util from http://cloudstack.apt-get.eu/tools/vhd-util and put it in
echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
fi

2
packaging/fedora20/cloud.spec
View File

@ -408,7 +408,7 @@ if [ "$1" == "1" ] ; then
fi
if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in
echo Please download vhd-util from http://cloudstack.apt-get.eu/tools/vhd-util and put it in
echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
fi

6
server/src/com/cloud/server/ConfigurationServerImpl.java
View File

@ -564,7 +564,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
// Simple check to see if we got IP Address...
boolean isIPAddress = Pattern.matches("[0-9]$", group[group.length - 1]);
if (isIPAddress) {
ou = "cloud.com";
ou = "cloud.com"; // leaving this example reference to cloud.com as it has no real world relevance
} else {
ou = group[group.length - 1];
for (int i = group.length - 2; i >= 0 && i >= group.length - 3; i--)
@ -572,7 +572,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
}
} catch (UnknownHostException ex) {
s_logger.info("Fail to get user's domain name. Would use cloud.com. ", ex);
ou = "cloud.com";
ou = "cloud.com"; // leaving this example reference to cloud.com as it has no real world relevance
}
String o = ou;
@ -1055,6 +1055,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
DiskOfferingVO newDiskOffering = new DiskOfferingVO(domainId, name, description, provisioningType, diskSize, tags, isCustomized, null, null, null);
newDiskOffering.setUniqueName("Cloud.Com-" + name);
// leaving the above reference to cloud.com in as it is an identifyer and has no real world relevance
newDiskOffering.setSystemUse(isSystemUse);
newDiskOffering = _diskOfferingDao.persistDeafultDiskOffering(newDiskOffering);
return newDiskOffering;
@ -1066,6 +1067,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
ServiceOfferingVO offering =
new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, offerHA, displayText, provisioningType, localStorageRequired, false, tags, false, null, false);
offering.setUniqueName("Cloud.Com-" + name);
// leaving the above reference to cloud.com in as it is an identifyer and has no real world relevance
offering = _serviceOfferingDao.persistSystemServiceOffering(offering);
return offering;
}

2
systemvm/scripts/run.sh
View File

@ -54,7 +54,7 @@ do
grep 'stop' /usr/local/cloud/systemvm/user_request &>/dev/null
if [ $? -eq 0 ]; then
timestamp=$(date)
echo "$timestamp User stops cloud.com service" >> /var/log/cloud.log
echo "$timestamp User stops Apache CloudStack service" >> /var/log/cloud.log
exit 0
fi
sleep 5

6
systemvm/scripts/ssvm-check.sh
View File

@ -56,16 +56,16 @@ fi
# check dns resolve
echo ================================================
nslookup download.cloud.com 1> /tmp/dns 2>&1
nslookup cloudstack.apache.org 1> /tmp/dns 2>&1
grep 'no servers could' /tmp/dns 1> /dev/null 2>&1
if [ $? -eq 0 ]
then
echo "ERROR: DNS not resolving download.cloud.com"
echo "ERROR: DNS not resolving cloudstack.apache.org"
echo resolv.conf follows
cat /etc/resolv.conf
exit 2
else
echo "Good: DNS resolves download.cloud.com"
echo "Good: DNS resolves cloudstack.apache.org"
fi

2
test/integration/component/test_browse_templates.py
View File

@ -874,7 +874,7 @@ class TestBrowseUploadVolume(cloudstackTestCase):
self.skipTest("Marvin configuration has no host credentials to check router services")
res = str(result)
self.debug("Cloud Process status: %s" % res)
# cloud.com service (type=secstorage) is running: process id: 2346
# Apache CloudStack service (type=secstorage) is running: process id: 2346
self.assertEqual(
res.count("is running"),
1,

2
test/integration/component/test_browse_volumes.py
View File

@ -1306,7 +1306,7 @@ class TestBrowseUploadVolume(cloudstackTestCase):
self.skipTest("Marvin configuration has no host credentials to check router services")
res = str(result)
self.debug("Cloud Process status: %s" % res)
# cloud.com service (type=secstorage) is running: process id: 2346
# Apache CloudStack service (type=secstorage) is running: process id: 2346
self.assertEqual(
res.count("is running"),
1,

2
test/integration/smoke/test_ssvm.py
View File

@ -480,7 +480,7 @@ class TestSSVMs(cloudstackTestCase):
credentials to check router services")
res = str(result)
self.debug("Cloud Process status: %s" % res)
# cloud.com service (type=secstorage) is running: process id: 2346
# Apache CloudStack service (type=secstorage) is running: process id: 2346
self.assertEqual(
res.count("is running"),
1,

2
tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
View File

@ -22,7 +22,7 @@ set -x
function install_vhd_util() {
[[ -f /bin/vhd-util ]] && return
wget --no-check-certificate http://download.cloud.com.s3.amazonaws.com/tools/vhd-util -O /bin/vhd-util
wget --no-check-certificate http://cloudstack.apt-get.eu/tools/vhd-util -O /bin/vhd-util
chmod a+x /bin/vhd-util
}

2
tools/devcloud4/advanced/README.md
View File

@ -54,7 +54,7 @@ vagrant up
```bash
cd /path/to/cloudstack/repo
wget http://download.cloud.com.s3.amazonaws.com/tools/vhd-util -P scripts/vm/hypervisor/xenserver/
wget http://cloudstack.apt-get.eu/tools/vhd-util -P scripts/vm/hypervisor/xenserver/
chmod +x scripts/vm/hypervisor/xenserver/vhd-util
```

2
tools/devcloud4/basic/README.md
View File

@ -44,7 +44,7 @@ vagrant up
```bash
cd /path/to/cloudstack/repo
wget http://download.cloud.com.s3.amazonaws.com/tools/vhd-util -P scripts/vm/hypervisor/xenserver/
wget http://cloudstack.apt-get.eu/tools/vhd-util -P scripts/vm/hypervisor/xenserver/
chmod +x scripts/vm/hypervisor/xenserver/vhd-util
```

2
tools/docker/Dockerfile.centos6
View File

@ -34,7 +34,7 @@ RUN cd /etc/cloudstack/management; \
ln -s server-nonssl.xml server.xml; \
ln -s log4j-cloud.xml log4j.xml; \
wget -O /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util \
http://download.cloud.com.s3.amazonaws.com/tools/vhd-util
http://cloudstack.apt-get.eu/tools/vhd-util
COPY init.sh_centos6 /root/init.sh
COPY systemtpl.sh /root/systemtpl.sh

2
ui/scripts/cloud.core.callbacks.js
View File

@ -24,7 +24,7 @@ $.urlParam = function(name) {
/*
This file is meant to help with implementing single signon integration. If you are using the
cloud.com default UI, there is no need to touch this file.
default Apache CloudStack UI, there is no need to touch this file.
*/
/*

2
vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
View File

@ -282,7 +282,7 @@ public class DatastoreMO extends BaseMO {
if (parentFileName.startsWith("/")) {
// when parent file is not at the same directory as it is, assume it is at parent directory
// this is only valid in cloud.com primary storage deployment
// this is only valid in Apache CloudStack primary storage deployment
DatastoreFile dsFile = new DatastoreFile(currentVmdkFullPath);
String dir = dsFile.getDir();
if (dir != null && dir.lastIndexOf('/') > 0)

2
vmware-base/src/com/cloud/hypervisor/vmware/mo/HostDatastoreSystemMO.java
View File

@ -49,7 +49,7 @@ public class HostDatastoreSystemMO extends BaseMO {
}
public ManagedObjectReference findDatastore(String name) throws Exception {
// added cloud.com specific name convention, we will use custom field "cloud.uuid" as datastore name as well
// added Apache CloudStack specific name convention, we will use custom field "cloud.uuid" as datastore name as well
CustomFieldsManagerMO cfmMo = new CustomFieldsManagerMO(_context, _context.getServiceContent().getCustomFieldsManager());
int key = cfmMo.getCustomFieldKey("Datastore", CustomFieldConstants.CLOUD_UUID);
assert (key != 0);