diff --git a/INSTALL.md b/INSTALL.md index 8a83fb0f720..c69018daa15 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -154,7 +154,7 @@ All the rpm packages will be created in `dist/rpmbuild/RPMS/x86_64` directory. ## Notes -If you will be using Xen as your hypervisor, please download [vhd-util](http://download.cloud.com.s3.amazonaws.com/tools/vhd-util) +If you will be using Xen as your hypervisor, please download [vhd-util](http://download.cloudstack.org/tools/vhd-util) If management server is installed on RHEL/CentOS, then copy vhd-util into: diff --git a/api/src/com/cloud/offering/ServiceOffering.java b/api/src/com/cloud/offering/ServiceOffering.java index 05ae2375c17..394605daeda 100644 --- a/api/src/com/cloud/offering/ServiceOffering.java +++ b/api/src/com/cloud/offering/ServiceOffering.java @@ -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 diff --git a/api/src/com/cloud/resource/ResourceService.java b/api/src/com/cloud/resource/ResourceService.java index 7050b97e0fe..854b53591d6 100644 --- a/api/src/com/cloud/resource/ResourceService.java +++ b/api/src/com/cloud/resource/ResourceService.java @@ -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 diff --git a/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java b/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java index 2c219357150..412af1c2736 100644 --- a/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AutoScaleVmProfileResponse.java @@ -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) diff --git a/engine/storage/integration-test/test/resources/s3_testng.xml b/engine/storage/integration-test/test/resources/s3_testng.xml index 017cc9ba2f0..c46e5a2db04 100644 --- a/engine/storage/integration-test/test/resources/s3_testng.xml +++ b/engine/storage/integration-test/test/resources/s3_testng.xml @@ -23,7 +23,7 @@ - + diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 07d6b3515fd..39dccfcaf09 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -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://download.cloudstack.org/tools/vhd-util and put it in echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/ fi diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index dc36c90bdc9..5dbddab059d 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -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://download.cloudstack.org/tools/vhd-util and put it in echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/ fi diff --git a/packaging/fedora20/cloud.spec b/packaging/fedora20/cloud.spec index 0a80991154f..546e439da2b 100644 --- a/packaging/fedora20/cloud.spec +++ b/packaging/fedora20/cloud.spec @@ -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://download.cloudstack.org/tools/vhd-util and put it in echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/ fi diff --git a/packaging/fedora21/cloud.spec b/packaging/fedora21/cloud.spec index a749d13254e..a79d172eab7 100644 --- a/packaging/fedora21/cloud.spec +++ b/packaging/fedora21/cloud.spec @@ -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://download.cloudstack.org/tools/vhd-util and put it in echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/ fi diff --git a/scripts/storage/qcow2/importmpl.sh b/scripts/storage/qcow2/importmpl.sh index 4e7cdae059a..67eefa8d061 100755 --- a/scripts/storage/qcow2/importmpl.sh +++ b/scripts/storage/qcow2/importmpl.sh @@ -105,13 +105,13 @@ fi if [[ "$uflag" == "1" && "$rflag" != "1" ]] then - rttmplt=http://download.cloud.com/templates/builtin/a88232bf-6a18-38e7-aeee-c1702725079f.qcow2.bz2 + rttmplt=http://download.cloudstack.org/templates/builtin/a88232bf-6a18-38e7-aeee-c1702725079f.qcow2.bz2 echo "download routing template from $rttmplt" fi if [[ "$uflag" == "1" && "$vflag" != "1" ]] then - vmtmplt=http://download.cloud.com/templates/builtin/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2 + vmtmplt=http://download.cloudstack.org/templates/builtin/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2 echo "download cnetos template from $vmtmplt" fi diff --git a/scripts/vm/hypervisor/kvm/setup_agent.sh b/scripts/vm/hypervisor/kvm/setup_agent.sh index 243f4a2b96c..d55c6adfde2 100755 --- a/scripts/vm/hypervisor/kvm/setup_agent.sh +++ b/scripts/vm/hypervisor/kvm/setup_agent.sh @@ -38,7 +38,7 @@ install_cloud_agent() { exit 1 fi fi - wget -N -P /etc/yum.repos.d/ http://download.cloud.com/foss/fedora/cloud.repo + wget -N -P /etc/yum.repos.d/ http://download.cloudstack.org/foss/fedora/cloud.repo if [ $? -gt 0 ] then printf "Failed to download repo" @@ -99,7 +99,7 @@ install_cloud_consoleP() { exit 1 fi fi - wget -N -P=/etc/yum.repos.d/ http://download.cloud.com/foss/fedora/cloud.repo + wget -N -P=/etc/yum.repos.d/ http://download.cloudstack.org/foss/fedora/cloud.repo if [ $? -gt 0 ] then printf "Failed to download repo" diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index 0d6f6cd7eb3..c94d92c85dc 100644 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -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; } diff --git a/setup/db/db/schema-21to22.sql b/setup/db/db/schema-21to22.sql index 0c0ad7d66ff..7ab72287484 100755 --- a/setup/db/db/schema-21to22.sql +++ b/setup/db/db/schema-21to22.sql @@ -960,15 +960,15 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest UPDATE `cloud`.`guest_os` SET name = display_name; INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) - VALUES (3, 'routing-3', 'SystemVM Template (KVM)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/systemvm.qcow2.bz2', 'ec463e677054f280f152fcc264255d2f', 0, 'SystemVM Template (KVM)', 'QCOW2', 15, 0, 1, 'KVM'); + VALUES (3, 'routing-3', 'SystemVM Template (KVM)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloudstack.org/releases/2.2.0/systemvm.qcow2.bz2', 'ec463e677054f280f152fcc264255d2f', 0, 'SystemVM Template (KVM)', 'QCOW2', 15, 0, 1, 'KVM'); INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) - VALUES (8, 'routing-8', 'SystemVM Template (vSphere)', 0, now(), 'SYSTEM', 0, 32, 1, 'http://download.cloud.com/releases/2.2.0/systemvm.ova', '3c9d4c704af44ebd1736e1bc78cec1fa', 0, 'SystemVM Template (vSphere)', 'OVA', 15, 0, 1, 'VMware'); + VALUES (8, 'routing-8', 'SystemVM Template (vSphere)', 0, now(), 'SYSTEM', 0, 32, 1, 'http://download.cloudstack.org/releases/2.2.0/systemvm.ova', '3c9d4c704af44ebd1736e1bc78cec1fa', 0, 'SystemVM Template (vSphere)', 'OVA', 15, 0, 1, 'VMware'); INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, display_text, enable_password, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable) - VALUES (4, 'centos55-x86_64', 'CentOS 5.5(64-bit) no GUI (KVM)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2', 'ed0e788280ff2912ea40f7f91ca7a249', 'CentOS 5.5(64-bit) no GUI (KVM)', 0, 'QCOW2', 112, 1, 1, 'KVM', 1); + VALUES (4, 'centos55-x86_64', 'CentOS 5.5(64-bit) no GUI (KVM)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloudstack.org/releases/2.2.0/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2', 'ed0e788280ff2912ea40f7f91ca7a249', 'CentOS 5.5(64-bit) no GUI (KVM)', 0, 'QCOW2', 112, 1, 1, 'KVM', 1); INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable) - VALUES (7, 'centos53-x64', 'CentOS 5.3(64-bit) no GUI (vSphere)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/CentOS5.3-x86_64.ova', 'f6f881b7f2292948d8494db837fe0f47', 0, 'CentOS 5.3(64-bit) no GUI (vSphere)', 'OVA', 12, 1, 1, 'VMware', 1); + VALUES (7, 'centos53-x64', 'CentOS 5.3(64-bit) no GUI (vSphere)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloudstack.org/releases/2.2.0/CentOS5.3-x86_64.ova', 'f6f881b7f2292948d8494db837fe0f47', 0, 'CentOS 5.3(64-bit) no GUI (vSphere)', 'OVA', 12, 1, 1, 'VMware', 1); UPDATE vm_instance SET guest_os_id=15 where vm_template_id=1; UPDATE vm_instance SET vm_template_id=(SELECT id FROM vm_template WHERE name='systemvm-xenserver-2.2.4' AND removed IS NULL) where vm_template_id=1; diff --git a/setup/db/db/schema-2214to30.sql b/setup/db/db/schema-2214to30.sql index 326e9a71cb6..f1d2d7dd4e3 100755 --- a/setup/db/db/schema-2214to30.sql +++ b/setup/db/db/schema-2214to30.sql @@ -626,7 +626,7 @@ UPDATE `cloud`.`event` e set e.domain_id = (select acc.domain_id from `cloud`.`a update `cloud`.`vm_template` set removed=now() where id=2; INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable) - VALUES (5, 'centos56-x86_64-xen', 'CentOS 5.6(64-bit) no GUI (XenServer)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/templates/builtin/centos56-x86_64.vhd.bz2', '905cec879afd9c9d22ecc8036131a180', 0, 'CentOS 5.6(64-bit) no GUI (XenServer)', 'VHD', 12, 1, 1, 'XenServer', 1); + VALUES (5, 'centos56-x86_64-xen', 'CentOS 5.6(64-bit) no GUI (XenServer)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloudstack.org/templates/builtin/centos56-x86_64.vhd.bz2', '905cec879afd9c9d22ecc8036131a180', 0, 'CentOS 5.6(64-bit) no GUI (XenServer)', 'VHD', 12, 1, 1, 'XenServer', 1); DELETE from `cloud`.`configuration` where name='firewall.rule.ui.enabled'; diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index ebbcfefef3a..d5173afc186 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -669,7 +669,7 @@ ALTER TABLE `cloud`.`physical_network_traffic_types` ADD COLUMN `lxc_network_lab UPDATE configuration SET value='KVM,XenServer,VMware,BareMetal,Ovm,LXC' WHERE name='hypervisor.list'; INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) - VALUES (10, UUID(), 'routing-10', 'SystemVM Template (LXC)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2', '2755de1f9ef2ce4d6f2bee2efbb4da92', 0, 'SystemVM Template (LXC)', 'QCOW2', 15, 0, 1, 'LXC'); + VALUES (10, UUID(), 'routing-10', 'SystemVM Template (LXC)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloudstack.org/templates/acton/acton-systemvm-02062012.qcow2.bz2', '2755de1f9ef2ce4d6f2bee2efbb4da92', 0, 'SystemVM Template (LXC)', 'QCOW2', 15, 0, 1, 'LXC'); ALTER TABLE `cloud`.`user_vm` MODIFY user_data TEXT(32768); diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql index 0a96ea0ad9b..80d32dab3fb 100644 --- a/setup/db/db/schema-421to430.sql +++ b/setup/db/db/schema-421to430.sql @@ -863,12 +863,12 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Advanced", 'DEFAULT', 'VMSna INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Advanced", 'DEFAULT', 'VMSnapshotManager', "vmsnapshot.max", "10", "Maximum vm snapshots for a vm", NULL, NULL,NULL,0); INSERT IGNORE INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, state) - VALUES (9, UUID(), 'routing-9', 'SystemVM Template (HyperV)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2013-12-23-hyperv.vhd.bz2', '5df45ee6ebe1b703a8805f4e1f4d0818', 0, 'SystemVM Template (HyperV)', 'VHD', 15, 0, 1, 'Hyperv', 'Active' ); + VALUES (9, UUID(), 'routing-9', 'SystemVM Template (HyperV)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloudstack.org/templates/4.3/systemvm64template-2013-12-23-hyperv.vhd.bz2', '5df45ee6ebe1b703a8805f4e1f4d0818', 0, 'SystemVM Template (HyperV)', 'VHD', 15, 0, 1, 'Hyperv', 'Active' ); -UPDATE `cloud`.`vm_template` SET `bits` = "64", `url` = "http://download.cloud.com/templates/4.3/systemvm64template-2013-12-23-hyperv.vhd.bz2", `state` = "Active", `checksum` = "5df45ee6ebe1b703a8805f4e1f4d0818" WHERE `id` = "9"; +UPDATE `cloud`.`vm_template` SET `bits` = "64", `url` = "http://download.cloudstack.org/templates/4.3/systemvm64template-2013-12-23-hyperv.vhd.bz2", `state` = "Active", `checksum` = "5df45ee6ebe1b703a8805f4e1f4d0818" WHERE `id` = "9"; INSERT IGNORE INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable, state) - VALUES (6, UUID(), 'centos64-x64', 'CentOS 6.4(64-bit) GUI (Hyperv)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/4.3/centos6_4_64bit.vhd.bz2', 'eef6b9940ea3ed01221d963d4a012d0a', 0, 'CentOS 6.4 (64-bit) GUI (Hyperv)', 'VHD', 182, 1, 1, 'Hyperv', 1, 'Active'); + VALUES (6, UUID(), 'centos64-x64', 'CentOS 6.4(64-bit) GUI (Hyperv)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloudstack.org/releases/4.3/centos6_4_64bit.vhd.bz2', 'eef6b9940ea3ed01221d963d4a012d0a', 0, 'CentOS 6.4 (64-bit) GUI (Hyperv)', 'VHD', 182, 1, 1, 'Hyperv', 1, 'Active'); UPDATE `cloud`.`configuration` SET `component` = 'VMSnapshotManager' WHERE `name` IN ("vmsnapshot.create.wait", "vmsnapshot.max"); diff --git a/setup/db/db/schema-442to450.sql b/setup/db/db/schema-442to450.sql index 774eee50621..5f9fff5ff95 100644 --- a/setup/db/db/schema-442to450.sql +++ b/setup/db/db/schema-442to450.sql @@ -981,7 +981,7 @@ ALTER TABLE `cloud`.`user_vm_details` MODIFY `value` VARCHAR(5120); UPDATE `cloud`.`host` SET resource = REPLACE(resource, 'com.cloud.hypervisor.xen.resource', 'com.cloud.hypervisor.xenserver.resource') WHERE hypervisor_type='XenServer' AND REMOVED IS NULL; INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable, state) - VALUES (11, UUID(), 'centos7-x86_64-lxc', 'CentOS 7(64-bit) no GUI (LXC)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/templates/builtin/centos-7-x86_64.tar.gz', 'c2c4fa2d0978121c7977db571f132d6e', 0, 'CentOS 7(64-bit) no GUI (LXC)', 'TAR', 246, 1, 1, 'LXC', 1, 'Active'); + VALUES (11, UUID(), 'centos7-x86_64-lxc', 'CentOS 7(64-bit) no GUI (LXC)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloudstack.org/templates/builtin/centos-7-x86_64.tar.gz', 'c2c4fa2d0978121c7977db571f132d6e', 0, 'CentOS 7(64-bit) no GUI (LXC)', 'TAR', 246, 1, 1, 'LXC', 1, 'Active'); --Support for RHEL 6.5 in relevant hypervisor versions INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name, created) VALUES (252, UUID(), 4, 'Red Hat Enterprise Linux 6.5 (32-bit)', utc_timestamp()); diff --git a/setup/db/db/schema-452to460.sql b/setup/db/db/schema-452to460.sql index 3b380f397e6..1989b6c00c2 100644 --- a/setup/db/db/schema-452to460.sql +++ b/setup/db/db/schema-452to460.sql @@ -377,7 +377,7 @@ INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(hypervisor_type, hypervisor UPDATE `cloud`.`volumes` v, `cloud`.`storage_pool` s, `cloud`.`cluster` c set v.format='RAW' where v.pool_id=s.id and s.cluster_id=c.id and c.hypervisor_type='Ovm3'; UPDATE configuration SET value='KVM,XenServer,VMware,BareMetal,Ovm,Ovm3,LXC' WHERE name='hypervisor.list'; INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id,featured, cross_zones, hypervisor_type, state) -VALUES (12, UUID(), 'routing-12', 'SystemVM Template (Ovm3)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-ovm.raw.bz2', 'c8577d27b2daafb2d9a4ed307ce2f00f', 0, 'SystemVM Template (Ovm3)', 'RAW', 183, 0, 1, 'Ovm3', 'Active' ); +VALUES (12, UUID(), 'routing-12', 'SystemVM Template (Ovm3)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloudstack.org/systemvm/4.6/systemvm64template-4.6.0-ovm.raw.bz2', 'c8577d27b2daafb2d9a4ed307ce2f00f', 0, 'SystemVM Template (Ovm3)', 'RAW', 183, 0, 1, 'Ovm3', 'Active' ); INSERT IGNORE INTO `cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, `default_value`, `description`) VALUES ('Advanced', 'DEFAULT', 'ManagementServer', 'ovm3.heartbeat.timeout' , '180', '120', 'Timeout value to send to the checkheartbeat script for guarding the self fencing functionality on ovm3'); INSERT IGNORE INTO `cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, `default_value`, `description`) VALUES ('Advanced', 'DEFAULT', 'ManagementServer', 'ovm3.heartbeat.interval' , '10', '1', 'Interval value the checkheartbeat script uses before triggering the timeout for ovm3'); diff --git a/setup/db/templates.sql b/setup/db/templates.sql index c42de21f0fc..ba514894b96 100755 --- a/setup/db/templates.sql +++ b/setup/db/templates.sql @@ -15,32 +15,35 @@ -- specific language governing permissions and limitations -- under the License. +-- LXC, "http://download.cloudstack.org/systemvm/4.6/systemvm64template-4.6.0-kvm.qcow2.bz2", "c059b0d051e0cd6fbe9d5d4fc40c7e5d"); +-- Ovm3, "http://download.cloudstack.org/systemvm/4.6/systemvm64template-4.6.0-ovm.raw.bz2", "c8577d27b2daafb2d9a4ed307ce2f00f"); + INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) - VALUES (1, UUID(), 'routing-1', 'SystemVM Template (XenServer)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2', '74b92f031cc5c2089ee89efb81344dcf', 0, 'SystemVM Template (XenServer)', 'VHD', 184, 0, 1, 'XenServer' ); + VALUES (1, UUID(), 'routing-1', 'SystemVM Template (XenServer)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloudstack.org/systemvm/4.6/systemvm64template-4.6.0-xen.vhd.bz2', '8886f554a499ec5405b6f203d9d36460', 0, 'SystemVM Template (XenServer)', 'VHD', 184, 0, 1, 'XenServer' ); + +INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) + VALUES (3, UUID(), 'routing-3', 'SystemVM Template (KVM)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloudstack.org/systemvm/4.6/systemvm64template-4.6.0-kvm.qcow2.bz2', 'c059b0d051e0cd6fbe9d5d4fc40c7e5d', 0, 'SystemVM Template (KVM)', 'QCOW2', 15, 0, 1, 'KVM' ); + +INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) + VALUES (8, UUID(), 'routing-8', 'SystemVM Template (vSphere)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloudstack.org/systemvm/4.6/systemvm64template-4.6.0-vmware.ova', '4b415224fe00b258f66cad9fce9f73fc', 0, 'SystemVM Template (vSphere)', 'OVA', 15, 0, 1, 'VMware' ); + +INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) + VALUES (9, UUID(), 'routing-9', 'SystemVM Template (HyperV)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloudstack.org/systemvm/4.6/systemvm64template-4.6.0-hyperv.vhd.zip', '53e24bddfa56ea3139ed37af4b519013', 0, 'SystemVM Template (HyperV)', 'VHD', 15, 0, 1, 'Hyperv' ); INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, removed, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable) - VALUES (2, UUID(), 'centos53-x86_64', 'CentOS 5.3(64-bit) no GUI (XenServer)', 1, now(), now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/templates/builtin/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2', 'b63d854a9560c013142567bbae8d98cf', 0, 'CentOS 5.3(64-bit) no GUI (XenServer)', 'VHD', 12, 1, 1, 'XenServer', 1); - -INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) - VALUES (3, UUID(), 'routing-3', 'SystemVM Template (KVM)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2', '85a1bed07bf43cbf022451cb2ecae4ff', 0, 'SystemVM Template (KVM)', 'QCOW2', 15, 0, 1, 'KVM' ); + VALUES (2, UUID(), 'centos53-x86_64', 'CentOS 5.3(64-bit) no GUI (XenServer)', 1, now(), now(), 'BUILTIN', 0, 64, 1, 'http://download.cloudstack.org/templates/builtin/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2', 'b63d854a9560c013142567bbae8d98cf', 0, 'CentOS 5.3(64-bit) no GUI (XenServer)', 'VHD', 12, 1, 1, 'XenServer', 1); INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, display_text, enable_password, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable) - VALUES (4, UUID(), 'centos55-x86_64', 'CentOS 5.5(64-bit) no GUI (KVM)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2', 'ed0e788280ff2912ea40f7f91ca7a249', 'CentOS 5.5(64-bit) no GUI (KVM)', 0, 'QCOW2', 112, 1, 1, 'KVM', 1); + VALUES (4, UUID(), 'centos55-x86_64', 'CentOS 5.5(64-bit) no GUI (KVM)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloudstack.org/releases/2.2.0/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2', 'ed0e788280ff2912ea40f7f91ca7a249', 'CentOS 5.5(64-bit) no GUI (KVM)', 0, 'QCOW2', 112, 1, 1, 'KVM', 1); INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable) - VALUES (5, UUID(), 'centos56-x86_64-xen', 'CentOS 5.6(64-bit) no GUI (XenServer)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/templates/builtin/centos56-x86_64.vhd.bz2', '905cec879afd9c9d22ecc8036131a180', 0, 'CentOS 5.6(64-bit) no GUI (XenServer)', 'VHD', 142, 1, 1, 'XenServer', 1); + VALUES (5, UUID(), 'centos56-x86_64-xen', 'CentOS 5.6(64-bit) no GUI (XenServer)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloudstack.org/templates/builtin/centos56-x86_64.vhd.bz2', '905cec879afd9c9d22ecc8036131a180', 0, 'CentOS 5.6(64-bit) no GUI (XenServer)', 'VHD', 142, 1, 1, 'XenServer', 1); INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable) - VALUES (7, UUID(), 'centos53-x64', 'CentOS 5.3(64-bit) no GUI (vSphere)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/CentOS5.3-x86_64.ova', 'f6f881b7f2292948d8494db837fe0f47', 0, 'CentOS 5.3(64-bit) no GUI (vSphere)', 'OVA', 12, 1, 1, 'VMware', 1); - -INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) - VALUES (8, UUID(), 'routing-8', 'SystemVM Template (vSphere)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vmware.ova', 'ef593a061f3b7594ab0bfd9b0ed0a0d4', 0, 'SystemVM Template (vSphere)', 'OVA', 15, 0, 1, 'VMware' ); - -INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) - VALUES (9, UUID(), 'routing-9', 'SystemVM Template (HyperV)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2013-12-23-hyperv.vhd.bz2', '5df45ee6ebe1b703a8805f4e1f4d0818', 0, 'SystemVM Template (HyperV)', 'VHD', 15, 0, 1, 'Hyperv' ); + VALUES (6, UUID(), 'centos64-x64', 'CentOS 6.4(64-bit) GUI (Hyperv)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloudstack.org/releases/4.3/centos6_4_64bit.vhd.bz2', 'eef6b9940ea3ed01221d963d4a012d0a', 0, 'CentOS 6.4 (64-bit) GUI (Hyperv)', 'VHD', 182, 1, 1, 'Hyperv', 1); INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable) - VALUES (6, UUID(), 'centos64-x64', 'CentOS 6.4(64-bit) GUI (Hyperv)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/4.3/centos6_4_64bit.vhd.bz2', 'eef6b9940ea3ed01221d963d4a012d0a', 0, 'CentOS 6.4 (64-bit) GUI (Hyperv)', 'VHD', 182, 1, 1, 'Hyperv', 1); + VALUES (7, UUID(), 'centos53-x64', 'CentOS 5.3(64-bit) no GUI (vSphere)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloudstack.org/releases/2.2.0/CentOS5.3-x86_64.ova', 'f6f881b7f2292948d8494db837fe0f47', 0, 'CentOS 5.3(64-bit) no GUI (vSphere)', 'OVA', 12, 1, 1, 'VMware', 1); INSERT INTO `cloud`.`guest_os_category` (id, uuid, name) VALUES (1, UUID(), 'CentOS'); INSERT INTO `cloud`.`guest_os_category` (id, uuid, name) VALUES (2, UUID(), 'Debian'); diff --git a/systemvm/scripts/run.sh b/systemvm/scripts/run.sh index 76e89a8caee..1e12f12e5f1 100755 --- a/systemvm/scripts/run.sh +++ b/systemvm/scripts/run.sh @@ -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 diff --git a/systemvm/scripts/ssvm-check.sh b/systemvm/scripts/ssvm-check.sh index 2ab51c549f9..ffd3d954305 100644 --- a/systemvm/scripts/ssvm-check.sh +++ b/systemvm/scripts/ssvm-check.sh @@ -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 diff --git a/test/integration/component/maint/test_high_availability.py b/test/integration/component/maint/test_high_availability.py index 9e8978b66d5..7d662c7fb2e 100644 --- a/test/integration/component/maint/test_high_availability.py +++ b/test/integration/component/maint/test_high_availability.py @@ -102,7 +102,7 @@ class Services: "displaytext": "Public Template", "name": "Public template", "ostype": 'CentOS 5.3 (64-bit)', - "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2", + "url": "http://download.cloudstack.org/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2", "hypervisor": 'XenServer', "format": 'VHD', "isfeatured": True, diff --git a/test/integration/component/test_base_image_updation.py b/test/integration/component/test_base_image_updation.py index c2d37c113cf..e38aa336eee 100644 --- a/test/integration/component/test_base_image_updation.py +++ b/test/integration/component/test_base_image_updation.py @@ -97,7 +97,7 @@ class Services: "displaytext": "Public Template - Xen", "name": "Public template - Xen", "ostype": "CentOS 5.3 (64-bit)", - "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2", + "url": "http://download.cloudstack.org/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2", "hypervisor": "xenserver", "format": "VHD", "isfeatured": True, @@ -108,7 +108,7 @@ class Services: "displaytext": "Public Template - KVM", "name": "Public template -KVM", "ostype": "CentOS 5.3 (64-bit)", - "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2", + "url": "http://download.cloudstack.org/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2", "hypervisor": "kvm", "format": "qcow2", "isfeatured": True, @@ -120,7 +120,7 @@ class Services: "displaytext": "Public Template - VMware", "name": "Public template -VMware", "ostype": "CentOS 5.3 (64-bit)", - "url": "http://download.cloud.com/releases/2.2.0/CentOS5.3-x86_64.ova", + "url": "http://download.cloudstack.org/releases/2.2.0/CentOS5.3-x86_64.ova", "hypervisor": "vmware", "format": "ova", "isfeatured": True, diff --git a/test/integration/component/test_browse_templates.py b/test/integration/component/test_browse_templates.py index 9366914cfd9..445fae8c1d7 100644 --- a/test/integration/component/test_browse_templates.py +++ b/test/integration/component/test_browse_templates.py @@ -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, diff --git a/test/integration/component/test_browse_volumes.py b/test/integration/component/test_browse_volumes.py index 12aa037d57a..390d0ab93f8 100644 --- a/test/integration/component/test_browse_volumes.py +++ b/test/integration/component/test_browse_volumes.py @@ -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, diff --git a/test/integration/component/test_project_configs.py b/test/integration/component/test_project_configs.py index 1a560ccd0ca..c7028eedce3 100644 --- a/test/integration/component/test_project_configs.py +++ b/test/integration/component/test_project_configs.py @@ -88,7 +88,7 @@ class Services: "displaytext": "Public Template", "name": "Public template", "ostype": 'CentOS 5.3 (64-bit)', - "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2", + "url": "http://download.cloudstack.org/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2", "hypervisor": 'XenServer', "format": 'VHD', "isfeatured": True, diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py index cb95d89d996..81aed15483c 100644 --- a/test/integration/component/test_project_usage.py +++ b/test/integration/component/test_project_usage.py @@ -93,7 +93,7 @@ class Services: "name": 'Template', "ostype": 'CentOS 5.3 (64-bit)', "templatefilter": 'self', - "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2" + "url": "http://download.cloudstack.org/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2" }, "iso": { "displaytext": "Test ISO", diff --git a/test/integration/component/test_template_from_snapshot_with_template_details b/test/integration/component/test_template_from_snapshot_with_template_details index f8269e28cfe..3b56713150e 100644 --- a/test/integration/component/test_template_from_snapshot_with_template_details +++ b/test/integration/component/test_template_from_snapshot_with_template_details @@ -87,7 +87,7 @@ class Services: "displaytext": "Public Template", "name": "Public template", "ostype": 'CentOS 5.3 (64-bit)', - "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2", + "url": "http://download.cloudstack.org/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2", "hypervisor": 'XenServer', "format": 'VHD', "isfeatured": True, diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py index 4e9a868c53f..496c1d605af 100644 --- a/test/integration/component/test_templates.py +++ b/test/integration/component/test_templates.py @@ -85,7 +85,7 @@ class Services: "displaytext": "Public Template", "name": "Public template", "ostype": 'CentOS 5.3 (64-bit)', - "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2", + "url": "http://download.cloudstack.org/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2", "hypervisor": 'XenServer', "format": 'VHD', "isfeatured": True, diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py index 3bbef399a3f..ddb0196879f 100644 --- a/test/integration/component/test_usage.py +++ b/test/integration/component/test_usage.py @@ -88,7 +88,7 @@ class Services: "name": 'Template', "ostype": 'CentOS 5.3 (64-bit)', "templatefilter": 'self', - "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2" + "url": "http://download.cloudstack.org/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2" }, "iso": { "displaytext": "Test ISO", diff --git a/test/integration/smoke/test_ssvm.py b/test/integration/smoke/test_ssvm.py index b14883ce804..48512e2b9bf 100644 --- a/test/integration/smoke/test_ssvm.py +++ b/test/integration/smoke/test_ssvm.py @@ -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, diff --git a/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh b/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh index 4a74b8b0544..665f64ca5a3 100644 --- a/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh +++ b/tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh @@ -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://download.cloudstack.org/tools/vhd-util -O /bin/vhd-util chmod a+x /bin/vhd-util } diff --git a/tools/devcloud/README.md b/tools/devcloud/README.md deleted file mode 100644 index 410c36f5ea5..00000000000 --- a/tools/devcloud/README.md +++ /dev/null @@ -1,102 +0,0 @@ -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. - -=========================================================== - -NOTE - This folder is a work in progress. The project has not determined -how to best establish a nightly DevCloud build process, or how to distribute -the image. - -=========================================================== - -# Setting up Tools and Environment - - - Install [RVM](https://rvm.io/rvm/install) - - Setup paths: - export PATH=~/.rvm/bin:$PATH - - Install Ruby 1.9.3, if it installed some other version: - rvm install 1.9.3 - -All the dependencies will be fetched automatically. - -Vagrant: https://github.com/chipchilders/vagrant.git -Veewee: https://github.com/jedi4ever/veewee.git - -devcloudbase/Ubuntu: http://releases.ubuntu.com/12.04/ubuntu-12.04.1-server-i386.iso - -To save some time if you've downloaded iso of your distro, put the isos in: -tools/devcloud/deps/boxes/basebox-build/iso/ - -Note, gem would require gcc-4.2, make sure link exists: - - sudo ln -s /usr/bin/gcc /usr/bin/gcc-4.2 - -# How to build DevCloud - -DevCloud build scripts are in src/ -Move to src/deps/ to start the build process: - - cd src/deps/ - -Clean up any old stuff: - - ./boxer.sh -c all - -Build the dependent vms: - - ./boxer.sh -b all - -Now, start DevCloud: - - # Go back to the devcloud homedir - cd ../ - # Bring up the devcloud vm - vagrant up - -If you get a vagrant error, at that point, try: - - source .rvmrc - vagrant up - -# CloudStack Build Automation in DevCloud - -If you want to compile cloudstack in the devcloud vm: - - vim puppet/modules/devcloud/manifests/params.pp - -and set - - $build_cloudstack = true - -alternately, if you do not want to build cloudstack in the devcloud vm, set: - - $build_cloudstack = false - - -It will now bring up the devcloud vm for this first time. Note that it will -attempt to download the SSVM and CPVM templates so it will take a long time to -launch initially. It will also git clone the cloudstack repository and attempt -to build an launch it. - -You can optionally speed things up by packaging a successful devcloud instance -build. This will make subsequent launches must faster since it won't have to -re-downoad the SSVM and CPVM. Once it has successfully been built, you can run: - - #exports the devcloud vagrant instance and adds it as "devcloud" to vagrant boxlist - ./boxit.sh - #modifies the Vagrant file to use this newly added instance - sed -i 's,devcloudbase-xen,devcloud,g' Vagrantfile diff --git a/tools/devcloud/devcloud-advanced.cfg b/tools/devcloud/devcloud-advanced.cfg deleted file mode 100644 index 229a325d1b5..00000000000 --- a/tools/devcloud/devcloud-advanced.cfg +++ /dev/null @@ -1,131 +0,0 @@ -# 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. -# -# This configuration is meant for running advanced networking, with management server on the laptop. -# It requires that the user run a DNS resolver within devcloud via 'apt-get install dnsmasq' - -{ - "zones": [ - { - "localstorageenabled": "true", - "name": "testzone", - "guestcidraddress": "10.1.1.0/24", - "dns1": "8.8.8.8", - "physical_networks": [ - { - "broadcastdomainrange": "Zone", - "vlan": "3900-4000", - "name": "eth0", - "traffictypes": [ - { - "xenserver": "Pool-wide network associated with eth0", - "typ": "Management" - }, - { - "xenserver": "Pool-wide network associated with eth0", - "typ": "Guest" - } - ], - "providers": [ - { - "broadcastdomainrange": "ZONE", - "name": "VirtualRouter" - }, - { - "broadcastdomainrange": "ZONE", - "name": "VpcVirtualRouter" - } - ] - }, - { - "broadcastdomainrange": "Zone", - "name": "eth1", - "traffictypes": [ - { - "xenserver": "Pool-wide network associated with eth1", - "typ": "Public" - } - ], - "providers": [ - { - "broadcastdomainrange": "ZONE", - "name": "VirtualRouter" - } - ] - } - ], - "ipranges": [ - { - "startip": "10.0.3.100", - "endip": "10.0.3.199", - "netmask": "255.255.255.0", - "vlan": "untagged", - "gateway": "10.0.3.2" - } - ], - "networktype": "Advanced", - "pods": [ - { - "endip": "192.168.56.249", - "name": "testpod", - "startip": "192.168.56.200", - "netmask": "255.255.255.0", - "clusters": [ - { - "clustername": "testcluster", - "hypervisor": "XenServer", - "hosts": [ - { - "username": "root", - "url": "http://192.168.56.10/", - "password": "password" - } - ], - "clustertype": "CloudManaged" - } - ], - "gateway": "192.168.56.1" - } - ], - "internaldns1": "192.168.56.10", - "secondaryStorages": [ - { - "url": "nfs://192.168.56.10:/opt/storage/secondary", - "provider": "NFS", - "details": [ ] - } - ] - } - ], - "dbSvr": { - "dbSvr": "127.0.0.1", - "passwd": "cloud", - "db": "cloud", - "port": 3306, - "user": "cloud" - }, - "logger": - { - "LogFolderPath": "/tmp/" - }, - "mgtSvr": [ - { - "mgtSvrIp": "192.168.56.10", - "port": 8096 - } - ] -} diff --git a/tools/devcloud/devcloud-advanced_internal-mgt.cfg b/tools/devcloud/devcloud-advanced_internal-mgt.cfg deleted file mode 100644 index 525ad0f0212..00000000000 --- a/tools/devcloud/devcloud-advanced_internal-mgt.cfg +++ /dev/null @@ -1,141 +0,0 @@ -# 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. -# -# This config is designed to run as an advanced network, with management server in devcloud -# It also requires an 'apt-get install dnsmasq' to run a resolver in devcloud for internal dns - -{ - "zones": [ - { - "localstorageenabled": "true", - "name": "testzone", - "guestcidraddress": "10.1.1.0/24", - "dns1": "8.8.8.8", - "physical_networks": [ - { - "broadcastdomainrange": "Zone", - "vlan": "3900-4000", - "name": "eth0", - "traffictypes": [ - { - "xenserver": "Pool-wide network associated with eth0", - "typ": "Management" - }, - { - "xenserver": "Pool-wide network associated with eth0", - "typ": "Guest" - } - ], - "providers": [ - { - "broadcastdomainrange": "ZONE", - "name": "VirtualRouter" - }, - { - "broadcastdomainrange": "ZONE", - "name": "VpcVirtualRouter" - } - ] - }, - { - "broadcastdomainrange": "Zone", - "name": "eth1", - "traffictypes": [ - { - "xenserver": "Pool-wide network associated with eth1", - "typ": "Public" - } - ], - "providers": [ - { - "broadcastdomainrange": "ZONE", - "name": "VirtualRouter" - } - ] - } - ], - "ipranges": [ - { - "startip": "10.0.3.100", - "endip": "10.0.3.199", - "netmask": "255.255.255.0", - "vlan": "untagged", - "gateway": "10.0.3.2" - } - ], - "networktype": "Advanced", - "pods": [ - { - "endip": "192.168.56.249", - "name": "testpod", - "startip": "192.168.56.200", - "netmask": "255.255.255.0", - "clusters": [ - { - "clustername": "testcluster", - "hypervisor": "XenServer", - "hosts": [ - { - "username": "root", - "url": "http://192.168.56.10/", - "password": "password" - } - ], - "clustertype": "CloudManaged" - } - ], - "gateway": "192.168.56.1" - } - ], - "internaldns1": "192.168.56.10", - "secondaryStorages": [ - { - "url": "nfs://192.168.56.10:/opt/storage/secondary" - } - ] - } - ], - "dbSvr": { - "dbSvr": "127.0.0.1", - "passwd": "cloud", - "db": "cloud", - "port": 3306, - "user": "cloud" - }, - "logger": [ - { - "name": "TestClient", - "file": "/var/log/testclient.log" - }, - { - "name": "TestCase", - "file": "/var/log/testcase.log" - } - ], - "mgtSvr": [ - { - "mgtSvrIp": "192.168.56.10", - "port": 8096 - } - ], - "globalConfig": [ - { - "name": "host", - "value": "192.168.56.10" - } - ] -} diff --git a/tools/devcloud/devcloud-advanced_juniper-contrail.cfg b/tools/devcloud/devcloud-advanced_juniper-contrail.cfg deleted file mode 100644 index 35b551a2aab..00000000000 --- a/tools/devcloud/devcloud-advanced_juniper-contrail.cfg +++ /dev/null @@ -1,123 +0,0 @@ -# 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. -# -# This configuration is meant for running advanced networking , with management server on the laptop, -# It requires that the user run a DNS resolver within devcloud via 'apt-get install dnsmasq' -# -# -{ - "zones": [ - { - "localstorageenabled": "true", - "name": "default", - "dns1": "8.8.8.8", - "physical_networks": [ - { - "broadcastdomainrange": "Zone", - "name": "ip-fabric", - "traffictypes": [ - { - "xen": "Pool-wide network associated with eth0", - "typ": "Management" - }, - { - "xen": "Pool-wide network associated with eth0", - "typ": "Guest" - }, - { - "xen": "Pool-wide network associated with eth1", - "typ": "Public" - } - ], - "providers": [ - { - "broadcastdomainrange": "ZONE", - "name": "JuniperContrailRouter" - } - ], - "isolationmethods": [ - "L3VPN" - ] - } - ], - "ipranges": [ - { - "startip": "10.0.3.100", - "endip": "10.0.3.199", - "netmask": "255.255.255.0", - "vlan": "untagged", - "gateway": "10.0.3.2" - } - ], - "networktype": "Advanced", - "pods": [ - { - "endip": "192.168.56.249", - "name": "a6", - "startip": "192.168.56.200", - "netmask": "255.255.255.0", - "clusters": [ - { - "clustername": "a6-xen", - "hypervisor": "XenServer", - "hosts": [ - { - "username": "root", - "url": "http://192.168.56.10/", - "password": "password" - } - ], - "clustertype": "CloudManaged" - } - ], - "gateway": "192.168.56.1" - } - ], - "internaldns1": "192.168.56.10", - "secondaryStorages": [ - { - "url": "nfs://192.168.56.10:/opt/storage/secondary", - "provider": "NFS", - "details": [ ] - } - ] - } - ], - "dbSvr": { - "dbSvr": "127.0.0.1", - "passwd": "cloud", - "db": "cloud", - "port": 3306, - "user": "cloud" - }, - "logger": [ - { - "name": "TestClient", - "file": "/var/log/testclient.log" - }, - { - "name": "TestCase", - "file": "/var/log/testcase.log" - } - ], - "mgtSvr": [ - { - "mgtSvrIp": "127.0.0.1", - "port": 8096 - } - ] -} diff --git a/tools/devcloud/devcloud-advancedsg.cfg b/tools/devcloud/devcloud-advancedsg.cfg deleted file mode 100644 index c625e79c53f..00000000000 --- a/tools/devcloud/devcloud-advancedsg.cfg +++ /dev/null @@ -1,121 +0,0 @@ -# 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. -# -# This configuration is meant for running advanced networking with security groups, with management server on the laptop. -# It requires that the user run a DNS resolver within devcloud via 'apt-get install dnsmasq' - -{ - "zones": [ - { - "localstorageenabled": "true", - "name": "testzone", - "dns1": "8.8.8.8", - "physical_networks": [ - { - "broadcastdomainrange": "Zone", - "name": "shared", - "traffictypes": [ - { - "typ": "Management" - }, - { - "typ": "Guest" - } - ], - "providers": [ - { - "broadcastdomainrange": "ZONE", - "name": "VirtualRouter" - }, - { - "broadcastdomainrange": "ZONE", - "name": "SecurityGroupProvider" - } - ], - "isolationmethods": [ - "VLAN" - ] - } - ], - "securitygroupenabled": "true", - "ipranges": [ - { - "startip": "10.0.3.100", - "endip": "10.0.3.199", - "netmask": "255.255.255.0", - "vlan": "1003", - "gateway": "10.0.3.2" - } - ], - "networktype": "Advanced", - "pods": [ - { - "endip": "192.168.56.249", - "name": "testpod", - "startip": "192.168.56.200", - "netmask": "255.255.255.0", - "clusters": [ - { - "clustername": "testcluster", - "hypervisor": "XenServer", - "hosts": [ - { - "username": "root", - "url": "http://192.168.56.10/", - "password": "password" - } - ], - "clustertype": "CloudManaged" - } - ], - "gateway": "192.168.56.1" - } - ], - "internaldns1": "192.168.56.10", - "secondaryStorages": [ - { - "url": "nfs://192.168.56.10:/opt/storage/secondary", - "provider": "NFS", - "details": [ ] - } - ] - } - ], - "dbSvr": { - "dbSvr": "localhost", - "passwd": "cloud", - "db": "cloud", - "port": 3306, - "user": "cloud" - }, - "logger": [ - { - "name": "TestClient", - "file": "/var/log/testclient.log" - }, - { - "name": "TestCase", - "file": "/var/log/testcase.log" - } - ], - "mgtSvr": [ - { - "mgtSvrIp": "127.0.0.1", - "port": 8096 - } - ] -} diff --git a/tools/devcloud/devcloud.cfg b/tools/devcloud/devcloud.cfg deleted file mode 100644 index 5232e3a50ee..00000000000 --- a/tools/devcloud/devcloud.cfg +++ /dev/null @@ -1,112 +0,0 @@ -# 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. -# - -{ - "zones": [ - { - "name": "DevCloud0", - "enabled" : "True", - "physical_networks": [ - { - "broadcastdomainrange": "Zone", - "name": "test-network", - "traffictypes": [ - { - "typ": "Guest" - }, - { - "typ": "Management" - } - ], - "providers": [ - { - "broadcastdomainrange": "ZONE", - "name": "VirtualRouter" - }, - { - "broadcastdomainrange": "Pod", - "name": "SecurityGroupProvider" - } - ] - } - ], - "dns2": "8.8.4.4", - "dns1": "8.8.8.8", - "securitygroupenabled": "true", - "localstorageenabled": "true", - "networktype": "Basic", - "pods": [ - { - "endip": "192.168.56.220", - "name": "test00", - "startip": "192.168.56.200", - "guestIpRanges": [ - { - "startip": "192.168.56.100", - "endip": "192.168.56.199", - "netmask": "255.255.255.0", - "gateway": "192.168.56.1" - } - ], - "netmask": "255.255.255.0", - "clusters": [ - { - "clustername": "test000", - "hypervisor": "XenServer", - "hosts": [ - { - "username": "root", - "url": "http://192.168.56.10/", - "password": "password" - } - ], - "clustertype": "CloudManaged" - } - ], - "gateway": "192.168.56.1" - } - ], - "internaldns1": "192.168.56.1", - "secondaryStorages": [ - { - "url": "nfs://192.168.56.10/opt/storage/secondary", - "provider": "NFS", - "details": [ ] - } - ] - } - ], - "logger": - { - "LogFolderPath": "/tmp/" - }, - "mgtSvr": [ - { - "mgtSvrIp": "127.0.0.1", - "port": 8096 - } - ], - "dbSvr": - { - "dbSvr": "127.0.0.1", - "port": 3306, - "user": "cloud", - "passwd": "cloud", - "db": "cloud" - } -} diff --git a/tools/devcloud/devcloud.sql b/tools/devcloud/devcloud.sql deleted file mode 100644 index 0f49b54e0ce..00000000000 --- a/tools/devcloud/devcloud.sql +++ /dev/null @@ -1,55 +0,0 @@ --- 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. - - -INSERT INTO `cloud`.`disk_offering` (id, name, uuid, display_text, created, use_local_storage, type, disk_size, provisioning_type) VALUES (17, 'tinyOffering', UUID(), 'tinyOffering', NOW(), 1, 'Service', 0, 'thin'); -INSERT INTO `cloud`.`service_offering` (id, cpu, speed, ram_size) VALUES (17, 1, 100, 100); -INSERT INTO `cloud`.`disk_offering` (id, name, uuid, display_text, created, type, disk_size,provisioning_type) VALUES (18, 'tinyDiskOffering', UUID(), 'tinyDiskOffering', NOW(), 'Disk', 1073741824,'thin'); -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT','router.ram.size', '100') - ON DUPLICATE KEY UPDATE value = '100'; -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT','router.cpu.mhz','100') - ON DUPLICATE KEY UPDATE value = '100'; -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT','console.ram.size','100') - ON DUPLICATE KEY UPDATE value = '100'; -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT','console.cpu.mhz', '100') - ON DUPLICATE KEY UPDATE value = '100'; -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT','ssvm.ram.size','100') - ON DUPLICATE KEY UPDATE value = '100'; -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT','ssvm.cpu.mhz','100') - ON DUPLICATE KEY UPDATE value = '100'; -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'expunge.workers', '3') - ON DUPLICATE KEY UPDATE value = '3'; -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'expunge.delay', '60') - ON DUPLICATE KEY UPDATE value = '60'; -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'expunge.interval', '60') - ON DUPLICATE KEY UPDATE value = '60'; -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'enable.ec2.api', 'true') - ON DUPLICATE KEY UPDATE value = 'true'; -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'enable.s3.api', 'true') - ON DUPLICATE KEY UPDATE value = 'true'; -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'host', '192.168.56.1') - ON DUPLICATE KEY UPDATE value = '192.168.56.1'; -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'management.network.cidr', '192.168.56.0/24') - ON DUPLICATE KEY UPDATE value = '192.168.56.0/24'; -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'secstorage.allowed.internal.sites', '192.168.56.0/8') - ON DUPLICATE KEY UPDATE value = '192.168.56.0/8'; -INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'system.vm.use.local.storage', 'true') - ON DUPLICATE KEY UPDATE value = 'true'; -UPDATE `cloud`.`configuration` SET value='10' where name = 'storage.overprovisioning.factor'; -UPDATE `cloud`.`configuration` SET value='10' where name = 'cpu.overprovisioning.factor'; -UPDATE `cloud`.`configuration` SET value='10' where name = 'mem.overprovisioning.factor'; -UPDATE `cloud`.`vm_template` SET unique_name="tiny Linux",name="tiny Linux",url="http://people.apache.org/~bhaisaab/vms/ttylinux_pv.vhd",checksum="046e134e642e6d344b34648223ba4bc1",display_text="tiny Linux" where id=5; diff --git a/tools/devcloud/devcloud_internal-mgt.cfg b/tools/devcloud/devcloud_internal-mgt.cfg deleted file mode 100644 index beae34547a8..00000000000 --- a/tools/devcloud/devcloud_internal-mgt.cfg +++ /dev/null @@ -1,121 +0,0 @@ -# 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. -# - -{ - "zones": [ - { - "name": "DevCloud0", - "physical_networks": [ - { - "broadcastdomainrange": "Zone", - "name": "test-network", - "traffictypes": [ - { - "typ": "Guest" - }, - { - "typ": "Management" - } - ], - "providers": [ - { - "broadcastdomainrange": "ZONE", - "name": "VirtualRouter" - }, - { - "broadcastdomainrange": "Pod", - "name": "SecurityGroupProvider" - } - ] - } - ], - "dns2": "8.8.4.4", - "dns1": "8.8.8.8", - "securitygroupenabled": "true", - "localstorageenabled": "true", - "networktype": "Basic", - "pods": [ - { - "endip": "192.168.56.220", - "name": "test00", - "startip": "192.168.56.200", - "guestIpRanges": [ - { - "startip": "192.168.56.100", - "endip": "192.168.56.199", - "netmask": "255.255.255.0", - "gateway": "192.168.56.1" - } - ], - "netmask": "255.255.255.0", - "clusters": [ - { - "clustername": "test000", - "hypervisor": "XenServer", - "hosts": [ - { - "username": "root", - "url": "http://192.168.56.10/", - "password": "password" - } - ], - "clustertype": "CloudManaged" - } - ], - "gateway": "192.168.56.1" - } - ], - "internaldns1": "192.168.56.1", - "secondaryStorages": [ - { - "url": "nfs://192.168.56.10:/opt/storage/secondary" - } - ] - } - ], - "logger": [ - { - "name": "TestClient", - "file": "/tmp/testclient.log" - }, - { - "name": "TestCase", - "file": "/tmp/testcase.log" - } - ], - "mgtSvr": [ - { - "mgtSvrIp": "192.168.56.10", - "port": 8096 - } - ], - "dbSvr": - { - "dbSvr": "127.0.0.1", - "port": 3306, - "user": "cloud", - "passwd": "cloud", - "db": "cloud" - } - "globalConfig": [ - { - "name": "host", - "value": "192.168.56.10" - } - ] -} diff --git a/tools/devcloud/devcloud_s3.cfg b/tools/devcloud/devcloud_s3.cfg deleted file mode 100644 index b98009167fe..00000000000 --- a/tools/devcloud/devcloud_s3.cfg +++ /dev/null @@ -1,141 +0,0 @@ -# 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. -# - -{ - "zones": [ - { - "name": "DevCloud0", - "physical_networks": [ - { - "broadcastdomainrange": "Zone", - "name": "test-network", - "traffictypes": [ - { - "typ": "Guest" - }, - { - "typ": "Management" - } - ], - "providers": [ - { - "broadcastdomainrange": "ZONE", - "name": "VirtualRouter" - }, - { - "broadcastdomainrange": "Pod", - "name": "SecurityGroupProvider" - } - ] - } - ], - "dns2": "4.4.4.4", - "dns1": "8.8.8.8", - "securitygroupenabled": "true", - "localstorageenabled": "true", - "networktype": "Basic", - "pods": [ - { - "endip": "192.168.56.220", - "name": "test00", - "startip": "192.168.56.200", - "guestIpRanges": [ - { - "startip": "192.168.56.100", - "endip": "192.168.56.199", - "netmask": "255.255.255.0", - "gateway": "192.168.56.1" - } - ], - "netmask": "255.255.255.0", - "clusters": [ - { - "clustername": "test000", - "hypervisor": "XenServer", - "hosts": [ - { - "username": "root", - "url": "http://192.168.56.10/", - "password": "password" - } - ], - "clustertype": "CloudManaged" - } - ], - "gateway": "192.168.56.1" - } - ], - "internaldns1": "192.168.56.1", - "secondaryStorages": [ - { - "provider": "S3", - "details": [ - { - "key" : "accesskey", - "value" :"OYAZXCAFUC1DAFOXNJWI" - }, - { - "key" : "secretkey", - "value" : "YHpRtzNDwl12DtrQmwRvdpnf2xK2AeVM30rXxQ==" - }, - { - "key" : "endpoint", - "value" : "10.223.89.7:8080" - }, - { - "key" : "bucket", - "value" : "cloudstack" - } - ] - } - ], - "cacheStorages": [ - { - "url": "nfs://192.168.56.10/opt/storage/secondary", - "provider": "NFS", - "details": [ - ] - } - ] - } - ], - "logger": [ - { - "name": "TestClient", - "file": "/tmp/testclient.log" - }, - { - "name": "TestCase", - "file": "/tmp/testcase.log" - } - ], - "mgtSvr": [ - { - "mgtSvrIp": "127.0.0.1", - "port": 8096 - } - ], - "dbSvr": - { - "dbSvr": "127.0.0.1", - "port": 3306, - "user": "cloud", - "passwd": "cloud", - "db": "cloud" - } -} diff --git a/tools/devcloud/pom.xml b/tools/devcloud/pom.xml deleted file mode 100644 index a8d6f3ec401..00000000000 --- a/tools/devcloud/pom.xml +++ /dev/null @@ -1,178 +0,0 @@ - - - 4.0.0 - cloud-devcloud - Apache CloudStack DevCloud - pom - - org.apache.cloudstack - cloud-tools - 4.10.0.0-SNAPSHOT - ../pom.xml - - - - mysql - mysql-connector-java - provided - - - org.apache.cloudstack - cloud-developer - ${project.version} - pom - true - runtime - - - - - install - - - - deploydb - - - deploydb - - - - - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - - - initialize - - read-project-properties - - - - ${project.parent.parent.basedir}/utils/conf/db.properties - ${project.parent.parent.basedir}/utils/conf/db.properties.override - - true - - - - - - org.codehaus.mojo - sql-maven-plugin - 1.5 - - - - mysql - mysql-connector-java - ${cs.mysql.version} - - - - org.gjt.mm.mysql.Driver - ${db.cloud.driver}://${db.cloud.host}:${db.cloud.port}/cloud - ${db.cloud.username} - ${db.cloud.password} - - ${maven.test.skip} - true - - - - create-schema - process-resources - - execute - - - - ${basedir}/devcloud.sql - - - - - - - - - - deploysvr - - - deploysvr - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - package - - exec - - - - - python - - ../marvin/marvin/deployDataCenter.py - -i - devcloud.cfg - - - - - - - - quickcloud - - - deployquick - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - integration-test - - exec - - - - - python - - ../marvin/marvin/deployDataCenter.py - -i - quickcloud.cfg - - - - - - - - diff --git a/tools/devcloud/quickcloud.cfg b/tools/devcloud/quickcloud.cfg deleted file mode 100644 index 46a770f3685..00000000000 --- a/tools/devcloud/quickcloud.cfg +++ /dev/null @@ -1,115 +0,0 @@ -# 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. -# - -{ - "zones": [ - { - "name": "QuickCloud00", - "enabled" : "True", - "details" : [ - {"key" : "enable.secstorage.vm", "value": "False"}, - {"key" : "enable.consoleproxy.vm", "value": "False"} - ], - "physical_networks": [ - { - "broadcastdomainrange": "Zone", - "name": "test-network", - "traffictypes": [ - { - "typ": "Guest" - }, - { - "typ": "Management" - } - ], - "providers": [ - { - "broadcastdomainrange": "ZONE", - "name": "VirtualRouter" - }, - { - "broadcastdomainrange": "Pod", - "name": "SecurityGroupProvider" - } - ] - } - ], - "dns2": "8.8.4.4", - "dns1": "8.8.8.8", - "securitygroupenabled": "true", - "localstorageenabled": "true", - "networktype": "Basic", - "networkofferingname": "QuickCloudNoServices", - "pods": [ - { - "endip": "192.168.56.220", - "name": "test00", - "startip": "192.168.56.200", - "guestIpRanges": [ - { - "startip": "192.168.56.100", - "endip": "192.168.56.199", - "netmask": "255.255.255.0", - "gateway": "192.168.56.1" - } - ], - "netmask": "255.255.255.0", - "clusters": [ - { - "clustername": "test000", - "hypervisor": "XenServer", - "hosts": [ - { - "username": "root", - "url": "http://192.168.56.10/", - "password": "password" - } - ], - "clustertype": "CloudManaged" - } - ], - "gateway": "192.168.56.1" - } - ], - "internaldns1": "192.168.56.1", - "secondaryStorages": [ - { - "url": "nfs://192.168.56.10:/opt/storage/secondary" - } - ] - } - ], - "logger": - { - "LogFolderPath": "/tmp/" - }, - "mgtSvr": [ - { - "mgtSvrIp": "127.0.0.1", - "port": 8096 - } - ], - "dbSvr": - { - "dbSvr": "127.0.0.1", - "port": 3306, - "user": "cloud", - "passwd": "cloud", - "db": "cloud" - } -} diff --git a/tools/devcloud/src/.rvmrc b/tools/devcloud/src/.rvmrc deleted file mode 100644 index 7e51d62af9f..00000000000 --- a/tools/devcloud/src/.rvmrc +++ /dev/null @@ -1,24 +0,0 @@ -# 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. - -rvm use ruby-1.9.3@vagrant-xen-cloudstack --create -export VAGRANT_HOME=$HOME/.vagrant.d-xen-cloudstack -bundle check > /dev/null 2>&1 -RETVAL=$? -if [ $RETVAL -ne 0 ]; then - bundle install -fi diff --git a/tools/devcloud/src/Gemfile b/tools/devcloud/src/Gemfile deleted file mode 100644 index 2790c4a52a0..00000000000 --- a/tools/devcloud/src/Gemfile +++ /dev/null @@ -1,19 +0,0 @@ -# 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. - -source 'https://rubygems.org' -gem 'vagrant', :git => 'https://github.com/chipchilders/vagrant' diff --git a/tools/devcloud/src/Vagrantfile b/tools/devcloud/src/Vagrantfile deleted file mode 100644 index 46bae93bb5c..00000000000 --- a/tools/devcloud/src/Vagrantfile +++ /dev/null @@ -1,57 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# 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. - -Vagrant::Config.run do |config| - config.vm.network :hostonly, "192.168.56.10", :auto_config => false - #config.vm.box = "devcloud" - config.vm.box = "devcloudbase-xen" - #config.vm.box_url = "http://basho-cloudstack.s3.amazonaws.com/devcloud.box" - - config.vm.guest = :xen - config.ssh.username = "devcloud" - config.vm.host_name = "devcloud.local" - # Uncomment this line to enable the console for debugging the - # build process. - # config.vm.boot_mode = :gui - - # Setup port forwarding - config.vm.forward_port 22, 7222 - config.vm.forward_port 3306, 3306 - config.vm.forward_port 8080, 8080 - config.vm.forward_port 8443, 8443 - config.vm.forward_port 5901, 5901 - config.vm.forward_port 8787, 8787 - config.vm.forward_port 8250, 8250 - config.vm.forward_port 8096, 8096 - # Ensure the VM has the right virtual resources - #config.vm. - config.vm.customize ["modifyvm", :id, "--memory", 2048] - config.vm.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"] - config.vm.provision :shell, :path => "waitforxe.sh" - config.vm.provision :puppet do |puppet| - puppet.with_ssh = true - puppet.manifests_path = File.join 'puppet', 'manifests' - puppet.module_path = File.join 'puppet', 'modules', 'devcloud' - puppet.manifest_file = 'vagrant-devcloud.pp' - puppet.options = ['--pluginsync', '--trace', '--debug', '--verbose'] - end - - -end diff --git a/tools/devcloud/src/boxit.sh b/tools/devcloud/src/boxit.sh deleted file mode 100755 index dae53cee6bc..00000000000 --- a/tools/devcloud/src/boxit.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/bash -ex -# 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. - -vagrant halt -vagrant package default --output devcloud.box -vagrant box add devcloud devcloud.box -f diff --git a/tools/devcloud/src/deps/boxer.sh b/tools/devcloud/src/deps/boxer.sh deleted file mode 100755 index 72d9cd1e6f3..00000000000 --- a/tools/devcloud/src/deps/boxer.sh +++ /dev/null @@ -1,184 +0,0 @@ -#! /bin/bash -# 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. - -# Load RVM into a shell session *as a function* -if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then -# First try to load from a user install - source "$HOME/.rvm/scripts/rvm" -elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then -# Then try to load from a root install - source "/usr/local/rvm/scripts/rvm" -else - printf "ERROR: An RVM installation was not found.\n" -fi - -BASEDIR=$PWD/boxes -DEVCLOUD_BASEBUILD_DIR=$BASEDIR/basebox-build -echo $DEVCLOUD_BASEBUILD_DIR -DEVCLOUD_XEN_BASEBUILD_DIR=$BASEDIR/xenbox-build -DEVCLOUD_BASE_NAME='devcloudbase' -DEVCLOUD_XEN_BASE_NAME='devcloudbase-xen' -OS='ubuntu-12.04.1-server-i386' - - -basebox() { - set +x - rvm rvmrc trust $DEVCLOUD_BASEBUILD_DIR/ - case "$1" in - build) - cd $DEVCLOUD_BASEBUILD_DIR/ - set -ex - vagrant basebox define $DEVCLOUD_BASE_NAME $OS - cp definition.rb postinstall.sh preseed.cfg definitions/$DEVCLOUD_BASE_NAME/ - vagrant basebox build $DEVCLOUD_BASE_NAME -f -a -n -r - vagrant basebox export $DEVCLOUD_BASE_NAME -f - set +ex - cd $DEVCLOUD_XEN_BASEBUILD_DIR - set -ex - vagrant box add $DEVCLOUD_BASE_NAME $DEVCLOUD_BASEBUILD_DIR/${DEVCLOUD_BASE_NAME}.box -f - ;; - clean) - cd $DEVCLOUD_BASEBUILD_DIR/ - set -x - rm -f iso/*.iso - vagrant -f basebox destroy $DEVCLOUD_BASE_NAME #-f - vagrant basebox undefine $DEVCLOUD_BASE_NAME - #hackery to inherit the proper rvmrc for the hacked vagrant - set +x - cd $BAS$DEVCLOUD_XEN_BASEBUILD_DIR - set -x - vagrant -f box remove $DEVCLOUD_BASE_NAME virtualbox - set +x - cd $DEVCLOUD_BASEBUILD_DIR - set -x - rm -f ${DEVCLOUD_BASE_NAME}.box - set +x - cd $BASEDIR - #rvm --force gemset delete vagrant-release-cloudstack - ;; - esac -} - -xenbox() { - - set +x - rvm rvmrc trust $DEVCLOUD_XEN_BASEBUILD_DIR/ - case "$1" in - build) - cd $DEVCLOUD_XEN_BASEBUILD_DIR - - #adding it here because it needs to be added into the $VAGRANT_HOME of - #the hacked vagrant - set -ex - vagrant up - vagrant halt - vagrant package default --output ${DEVCLOUD_XEN_BASE_NAME}.box - vagrant box add $DEVCLOUD_XEN_BASE_NAME ${DEVCLOUD_XEN_BASE_NAME}.box -f - ;; - clean) - cd $DEVCLOUD_XEN_BASEBUILD_DIR - set -x - vagrant -f box remove $DEVCLOUD_XEN_BASE_NAME virtualbox - vagrant destroy -f - rm -f ${DEVCLOUD_XEN_BASE_NAME}.box - set +x - #rvm --force gemset delete vagrant-xen-cloudstack - set -x - ;; - esac -} -usage() { - -cat <&2 - echo "$usage" >&2 - exit 1 - ;; - esac -done -shift $((OPTIND - 1)) - -posargs=$@ - -#removes duplicate positionals - -posargs=$(echo "$posargs" | tr ' ' '\n' | nl | sort -u -k2 | sort -n | cut -f2-) - - - -for arg in $posargs; do - - case "$arg" in - basebox) - true - ;; - xenbox) - true - ;; - all) - true - ;; - *) - usage - exit 1 - ;; - esac - -done - -cd $BASEDIR - -for arg in $posargs; do - case "$1" in - "all") - case "$action" in - clean) - xenbox $action - basebox $action - ;; - build) - basebox $action - xenbox $action - ;; - esac - ;; - $arg) - $arg $action - ;; - esac -done diff --git a/tools/devcloud/src/deps/boxes/basebox-build/.rvmrc b/tools/devcloud/src/deps/boxes/basebox-build/.rvmrc deleted file mode 100644 index 3c8c66c97f9..00000000000 --- a/tools/devcloud/src/deps/boxes/basebox-build/.rvmrc +++ /dev/null @@ -1,24 +0,0 @@ -# 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. - -rvm use ruby-1.9.3@vagrant-release-cloudstack --create -export VAGRANT_HOME=$HOME/.vagrant.d-release-cloudstack -bundle check > /dev/null 2>&1 -RETVAL=$? -if [ $RETVAL -ne 0 ]; then - bundle install -fi diff --git a/tools/devcloud/src/deps/boxes/basebox-build/Gemfile b/tools/devcloud/src/deps/boxes/basebox-build/Gemfile deleted file mode 100644 index dae53be6dd0..00000000000 --- a/tools/devcloud/src/deps/boxes/basebox-build/Gemfile +++ /dev/null @@ -1,20 +0,0 @@ -# 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. - -source 'https://rubygems.org' -gem 'veewee', :git => 'https://github.com/jedi4ever/veewee.git' -gem 'em-winrm' diff --git a/tools/devcloud/src/deps/boxes/basebox-build/Vagrantfile b/tools/devcloud/src/deps/boxes/basebox-build/Vagrantfile deleted file mode 100644 index 245692337bc..00000000000 --- a/tools/devcloud/src/deps/boxes/basebox-build/Vagrantfile +++ /dev/null @@ -1,17 +0,0 @@ -# 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. - diff --git a/tools/devcloud/src/deps/boxes/basebox-build/definition.rb b/tools/devcloud/src/deps/boxes/basebox-build/definition.rb deleted file mode 100644 index f7e3c114993..00000000000 --- a/tools/devcloud/src/deps/boxes/basebox-build/definition.rb +++ /dev/null @@ -1,42 +0,0 @@ -Veewee::Session.declare({ - :cpu_count => '1', - :memory_size=> '2048', - :disk_size => '20000', - :disk_format => 'VMDK', - :hostiocache => 'off', - :os_type_id => 'Ubuntu', - :iso_file => "ubuntu-12.04.1-server-i386.iso", - :iso_src => "http://releases.ubuntu.com/12.04/ubuntu-12.04.1-server-i386.iso", - :iso_md5 => '32184a83c8b5e6031e1264e5c499bc03', - :iso_download_timeout => "1000", - :boot_wait => "4", - :virtualbox => { - :vm_options => [ - "ioapic" => "on", - "hwvirtex" => "on", - "nestedpaging" => "on" - ] - }, - :boot_cmd_sequence => [ - '', - '/install/vmlinuz noapic preseed/url=http://%IP%:%PORT%/preseed.cfg ', - 'debian-installer=en_US auto locale=en_US kbd-chooser/method=us ', - 'hostname=%NAME% ', - 'fb=false debconf/frontend=noninteractive ', - 'keyboard-configuration/layout=USA keyboard-configuration/variant=USA console-setup/ask_detect=false ', - 'initrd=/install/initrd.gz -- ' -], - :kickstart_port => "7122", - :kickstart_timeout => "10000", - :kickstart_file => "preseed.cfg", - :ssh_login_timeout => "10000", - :ssh_user => "devcloud", - :ssh_password => "devcloud", - :ssh_key => "", - :ssh_host_port => "2222", - :ssh_guest_port => "22", - :sudo_cmd => "echo '%p'|sudo -S sh '%f'", - :shutdown_cmd => "shutdown -P now", - :postinstall_files => [ "postinstall.sh"], - :postinstall_timeout => "10000" -}) diff --git a/tools/devcloud/src/deps/boxes/basebox-build/postinstall.sh b/tools/devcloud/src/deps/boxes/basebox-build/postinstall.sh deleted file mode 100644 index f2b15602e8c..00000000000 --- a/tools/devcloud/src/deps/boxes/basebox-build/postinstall.sh +++ /dev/null @@ -1,42 +0,0 @@ -# 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. - -apt-get -y update -apt-get -y upgrade -apt-get -y install vim -apt-get -y install ruby -apt-get -y install rubygems -apt-get -y install puppet -apt-get clean - -# Setup sudo to allow no-password sudo for "admin" -groupadd -r admin -usermod -a -G admin devcloud -echo "root:password" | chpasswd -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers -sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:/bin/chmod, /bin/cp, /bin/mkdir, /bin/mount, /bin/umount/g' /etc/sudoers - -mkdir /home/devcloud/.ssh -chmod 700 /home/devcloud/.ssh -cd /home/devcloud/.ssh -wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys -chmod 600 /home/devcloud/.ssh/authorized_keys -chown -R devcloud /home/devcloud/.ssh - -# Zero out the free space to save space in the final image: -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg b/tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg deleted file mode 100644 index dd6a24a3b65..00000000000 --- a/tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg +++ /dev/null @@ -1,105 +0,0 @@ -## Options to set on the command line -d-i debian-installer/locale string en_US.utf8 -d-i console-setup/ask_detect boolean false -d-i console-setup/layout string USA - -#d-i netcfg/get_hostname string dummy -d-i netcfg/get_hostname string devcloud -d-i netcfg/get_domain string cloudstack.org - -# Continue without a default route -# Not working , specify a dummy in the DHCP -#d-i netcfg/no_default_route boolean - -d-i time/zone string UTC -d-i clock-setup/utc-auto boolean true -d-i clock-setup/utc boolean true - -d-i kbd-chooser/method select American English - -d-i netcfg/wireless_wep string - -d-i base-installer/kernel/override-image string linux-server -#d-i base-installer/kernel/override-image string linux-image-2.6.32-21-generic - -# Choices: Dialog, Readline, Gnome, Kde, Editor, Noninteractive -d-i debconf debconf/frontend select Noninteractive - -d-i pkgsel/install-language-support boolean false -tasksel tasksel/first multiselect standard, ubuntu-server - -#d-i partman-auto/method string regular -d-i partman-auto/method string lvm -d-i partman-auto-lvm/no_boot boolean true -d-i partman-auto/disk string /dev/sda -d-i partman-auto-lvm/new_vg_name string devcloud -d-i partman-auto/purge_lvm_from_device boolean true -d-i partman-basicfilesystems/no_swap boolean false - -d-i partman-lvm/confirm boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman-auto/choose_recipe select devcloud - -d-i partman/confirm_write_new_label boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman-auto/expert_recipe string \ -devcloud :: \ -4000 4500 4500 ext4 method{ lvm } \ -$lvmok{ } mountpoint{ / } lv_name{ root } \ -format{ } use_filesystem{ } filesystem{ ext4 } \ -.\ -15000 15000 15000 ext4 method{ lvm } \ -$lvmok{ } mountpoint{ /opt } lv_name{ data } \ -format{ } use_filesystem{ } filesystem{ ext4 } \ -. - -#http://ubuntu-virginia.ubuntuforums.org/showthread.php?p=9626883 -#Message: "write the changes to disk and configure lvm preseed" -#http://serverfault.com/questions/189328/ubuntu-kickstart-installation-using-lvm-waits-for-input -#preseed partman-lvm/confirm_nooverwrite boolean true - -# Write the changes to disks and configure LVM? -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-partitioning/confirm_write_new_label boolean true -d-i partman/choose_partition select Finish -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm boolean true -d-i partman-auto-lvm/guided_size string max - -## Default user, we can get away with a recipe to change this -d-i passwd/user-fullname string devcloud -d-i passwd/username string devcloud -d-i passwd/user-password password devcloud -d-i passwd/user-password-again password devcloud -d-i user-setup/encrypt-home boolean false -d-i user-setup/allow-password-weak boolean true - -## minimum is puppet and ssh and ntp -# Individual additional packages to install -d-i pkgsel/include string openssh-server ntp - -# Whether to upgrade packages after debootstrap. -# Allowed values: none, safe-upgrade, full-upgrade -d-i pkgsel/upgrade select full-upgrade - -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i finish-install/reboot_in_progress note - -#For the update -d-i pkgsel/update-policy select none - -# debconf-get-selections --install -#Use mirror -#d-i apt-setup/use_mirror boolean true -#d-i mirror/country string manual -#choose-mirror-bin mirror/protocol string http -#choose-mirror-bin mirror/http/hostname string 192.168.4.150 -#choose-mirror-bin mirror/http/directory string /ubuntu -#choose-mirror-bin mirror/suite select maverick -#d-i debian-installer/allow_unauthenticated string true - -choose-mirror-bin mirror/http/proxy string diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/.rvmrc b/tools/devcloud/src/deps/boxes/xenbox-build/.rvmrc deleted file mode 100644 index 7e51d62af9f..00000000000 --- a/tools/devcloud/src/deps/boxes/xenbox-build/.rvmrc +++ /dev/null @@ -1,24 +0,0 @@ -# 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. - -rvm use ruby-1.9.3@vagrant-xen-cloudstack --create -export VAGRANT_HOME=$HOME/.vagrant.d-xen-cloudstack -bundle check > /dev/null 2>&1 -RETVAL=$? -if [ $RETVAL -ne 0 ]; then - bundle install -fi diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/Gemfile b/tools/devcloud/src/deps/boxes/xenbox-build/Gemfile deleted file mode 100644 index 2790c4a52a0..00000000000 --- a/tools/devcloud/src/deps/boxes/xenbox-build/Gemfile +++ /dev/null @@ -1,19 +0,0 @@ -# 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. - -source 'https://rubygems.org' -gem 'vagrant', :git => 'https://github.com/chipchilders/vagrant' diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/Vagrantfile b/tools/devcloud/src/deps/boxes/xenbox-build/Vagrantfile deleted file mode 100644 index 58e9e64a1d0..00000000000 --- a/tools/devcloud/src/deps/boxes/xenbox-build/Vagrantfile +++ /dev/null @@ -1,52 +0,0 @@ - # -*- mode: ruby -*- -# vi: set ft=ruby : - -# 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. - -Vagrant::Config.run do |config| - config.vm.box = "devcloudbase" - # TODO: Get a URL to host the base image - # config.vm.box_url = "http://domain.com/path/to/above.box" - config.vm.guest = :xen - config.ssh.username = "devcloud" - config.vm.host_name = "devcloud.local" - - # Uncomment this line to enable the console for debugging the - # build process. - #config.vm.boot_mode = :gui - - # Setup port forwarding - # config.vm.forward_port 22, 2222 - # config.vm.forward_port 8080, 8080 - # config.vm.forward_port 8443, 8443 - # config.vm.forward_port 5901, 5901 - # config.vm.forward_port 8787, 8787 - # config.vm.forward_port 8250, 8250 - - # Ensure the VM has the right virtual resources - #config.vm. - - config.vm.provision :puppet do |puppet| - puppet.with_ssh = true - puppet.manifests_path = File.join 'puppet', 'manifests' - puppet.module_path = File.join 'puppet', 'modules', 'devcloudinitial' - puppet.manifest_file = 'vagrant-devcloudinitial.pp' - puppet.options = ['--trace', '--debug', '--verbose'] - end - -end diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/manifests/site.pp b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/manifests/site.pp deleted file mode 100644 index 13a83393a91..00000000000 --- a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/manifests/site.pp +++ /dev/null @@ -1,16 +0,0 @@ -# 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. diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/manifests/vagrant-devcloudinitial.pp b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/manifests/vagrant-devcloudinitial.pp deleted file mode 100644 index 0d48071536a..00000000000 --- a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/manifests/vagrant-devcloudinitial.pp +++ /dev/null @@ -1,18 +0,0 @@ -# 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 permission s and limitations -# under the License. - -node default { include devcloudinitial } diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/Modulefile b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/Modulefile deleted file mode 100644 index b1ca9adb59f..00000000000 --- a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/Modulefile +++ /dev/null @@ -1,8 +0,0 @@ -name 'puppet-devcloudinitial' -version '0.0.1' -source '' -author 'Apache Software Foundation' -license 'Licensed under the Apache License, Version 2.0. http://www.apache.org/licenses/LICENSE-2.0' -summary 'CloudStack DevCloud initial configuration module' -description 'Installation and configuration of all prequisites for building a DevCloud image.' -project_page 'http://cloudstack.org' diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/grub b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/grub deleted file mode 100644 index d5de16c536b..00000000000 --- a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/grub +++ /dev/null @@ -1,52 +0,0 @@ -# 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. - - -# If you change this file, run 'update-grub' afterwards to update -# /boot/grub/grub.cfg. -# For full documentation of the options in this file, see: -# info -f grub -n 'Simple configuration' - -GRUB_DEFAULT=2 -#GRUB_HIDDEN_TIMEOUT=0 -GRUB_HIDDEN_TIMEOUT_QUIET=true -GRUB_TIMEOUT=2 -GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` -GRUB_CMDLINE_LINUX_DEFAULT="" -GRUB_CMDLINE_LINUX="" - -# Uncomment to enable BadRAM filtering, modify to suit your needs -# This works with Linux (no patch required) and with any kernel that obtains -# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...) -#GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef" - -# Uncomment to disable graphical terminal (grub-pc only) -#GRUB_TERMINAL=console - -# The resolution used on graphical terminal -# note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `vbeinfo' -#GRUB_GFXMODE=640x480 - -# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux -#GRUB_DISABLE_LINUX_UUID=true - -# Uncomment to disable generation of recovery mode menu entries -#GRUB_DISABLE_RECOVERY="true" - -# Uncomment to get a beep at grub start -#GRUB_INIT_TUNE="480 440 1" diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/interfaces b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/interfaces deleted file mode 100644 index 0c197209d10..00000000000 --- a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/interfaces +++ /dev/null @@ -1,45 +0,0 @@ -# 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. -auto lo -iface lo inet loopback - -auto eth0 -iface eth0 inet manual - -allow-hotplug eth1 -iface eth1 inet manual - -auto xenbr0 -iface xenbr0 inet dhcp - bridge_ports eth0 - dns_nameservers 8.8.8.8 8.8.4.4 - post-up route add default gw 10.0.2.2 - -auto xenbr1 -iface xenbr1 inet static - bridge_ports eth1 - address 192.168.56.10 - netmask 255.255.255.0 - network 192.168.56.0 - broadcast 192.168.56.255 - gateway 192.168.56.1 - dns_nameservers 8.8.8.8 8.8.4.4 - post-up route del default gw 192.168.56.1; route add default gw 192.168.56.1 metric 100; - - -pre-up iptables-save < /etc/iptables.save -pre-up /etc/init.d/ebtables load diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/iptables.save b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/iptables.save deleted file mode 100644 index 07647f83bad..00000000000 --- a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/iptables.save +++ /dev/null @@ -1,30 +0,0 @@ -# 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. - -*mangle -:PREROUTING ACCEPT [397:23804] -:INPUT ACCEPT [397:23804] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [238:22820] -:POSTROUTING ACCEPT [238:22820] --A POSTROUTING -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill -COMMIT -*filter -:INPUT ACCEPT [453:27164] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [273:26476] -COMMIT diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xen-defaults b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xen-defaults deleted file mode 100644 index 908396812fb..00000000000 --- a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xen-defaults +++ /dev/null @@ -1,18 +0,0 @@ -# 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. - -TOOLSTACK=xapi diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xend b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xend deleted file mode 100644 index 4a532992f94..00000000000 --- a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xend +++ /dev/null @@ -1,188 +0,0 @@ -#!/bin/sh -# 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. - -### BEGIN INIT INFO -# Provides: xend -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: XEN control daemon -# Description: XEN control daemon -### END INIT INFO - -PATH=/usr/lib/xen-common/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="Xen daemons" - -VERSION=$(xen-version) -ROOT=/usr/lib/xen-$VERSION - -XEND="$ROOT"/bin/xend -XENCONSOLED="$ROOT"/bin/xenconsoled -XENCONSOLED_PIDFILE="/var/run/xenconsoled.pid" -XENSTORED="$ROOT"/bin/xenstored -XENSTORED_DIR="/var/run/xenstored" -XENSTORED_PIDFILE="/var/run/xenstore.pid" - -[ "$VERSION" ] || exit 0 -[ -x "$XEND" ] || exit 0 - -[ -r /etc/default/xend ] && . /etc/default/xend - -. /lib/init/vars.sh -. /lib/lsb/init-functions - -modules_setup() -{ - modprobe xenfs 2>/dev/null - modprobe xen-evtchn 2>/dev/null - modprobe xen_blkback 2>/dev/null - modprobe xen_netback 2>/dev/null - modprobe xen_gntdev 2>/dev/null -} - -xenfs_setup() -{ - [ -e "/proc/xen/capabilities" ] && return 0 - log_progress_msg "xenfs" - [ -d "/proc/xen" ] || return 1 - mount -t xenfs xenfs /proc/xen || return 1 - return 0 -} - -capability_check() -{ - [ -e "/proc/xen/capabilities" ] || return 1 - grep -q "control_d" /proc/xen/capabilities || return 1 - return 0 -} - -xend_start() -{ - log_progress_msg "xend" - $XEND status && return 1 - $XEND start || return 2 - - i=0 - while [ $i -lt 10 ]; do - $XEND status && return 0 || true - i=$(($i + 1)) - sleep 1 - done - return 2 -} - -xend_stop() -{ - log_progress_msg "xend" - $XEND status || return 0 - $XEND stop || return 1 -} - -xenconsoled_start() -{ - log_progress_msg "xenconsoled" - start-stop-daemon --start --quiet --pidfile "$XENCONSOLED_PIDFILE" --exec "$XENCONSOLED" --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile "$XENCONSOLED_PIDFILE" --exec "$XENCONSOLED" -- \ - $XENCONSOLED_ARGS --pid-file="$XENCONSOLED_PIDFILE" \ - || return 2 -} - -xenstored_start() -{ - log_progress_msg "xenstored" - start-stop-daemon --start --quiet --pidfile "$XENSTORED_PIDFILE" --exec "$XENSTORED" --test > /dev/null \ - || return 1 - [ -d "$XENSTORED_DIR" ] || mkdir -p "$XENSTORED_DIR" - export XENSTORED_ROOTDIR="$XENSTORED_DIR" - start-stop-daemon --start --quiet --pidfile "$XENSTORED_PIDFILE" --exec "$XENSTORED" -- \ - $XENSTORED_ARGS --pid-file="$XENSTORED_PIDFILE" \ - || return 2 -} - -case "$1" in - start) - log_daemon_msg "Starting $DESC" - modules_setup - xenfs_setup - case "$?" in - 0) ;; - *) log_end_msg 1; exit ;; - esac - capability_check - case "$?" in - 0) ;; - *) log_end_msg 255; exit ;; - esac - xenstored_start - case "$?" in - 0|1) ;; - *) log_end_msg 1; exit ;; - esac - xenconsoled_start - case "$?" in - 0|1) ;; - *) log_end_msg 1; exit ;; - esac - #xend_start - case "$?" in - 0|1) ;; - *) log_end_msg 1; exit ;; - esac - log_end_msg 0 - ;; - stop) - capability_check - case "$?" in - 0) ;; - *) exit ;; - esac - log_daemon_msg "Stopping $DESC" - #xend_stop - case "$?" in - 0|1) log_end_msg 0 ;; - *) log_end_msg 1 ;; - esac - ;; - restart|force-reload) - capability_check - case "$?" in - 0) ;; - *) exit ;; - esac - log_daemon_msg "Restarting $DESC" - #xend_stop - case "$?" in - 0|1) - #xend_start - case "$?" in - 0) log_end_msg 0 ;; - *) log_end_msg 1 ;; - esac - ;; - *) log_end_msg 1 ;; - esac - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 - exit 3 - ;; -esac - -exit 0 diff --git a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp b/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp deleted file mode 100644 index e1f4c5ac271..00000000000 --- a/tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp +++ /dev/null @@ -1,119 +0,0 @@ -# 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. - - -class devcloudinitial { - - if $::architecture == 'x86_64'{ - $debarch='amd64' - } - else { - $debarch='i386' - } - - exec { "apt-update": - command => "/usr/bin/apt-get update" - } - - Exec["apt-update"] -> Package <| |> - - package { - "linux-headers-${::kernelrelease}": - ensure => latest; - "xen-hypervisor-4.1-${debarch}": - ensure => latest, - require => Package["linux-headers-${::kernelrelease}"]; - 'xcp-xapi': - ensure => latest, - require => Package["xen-hypervisor-4.1-${debarch}"]; - 'iptables': - ensure => latest; - 'ebtables': - ensure => latest; - } - - file { - '/etc/iptables.save': - ensure => 'file', - require => Package['iptables'], - source => 'puppet:///modules/devcloudinitial/iptables.save', - group => '0', - mode => '0644', - owner => '0'; - '/etc/xcp/network.conf': - ensure => 'file', - require => Package['xcp-xapi'], - content => "bridge", - group => '0', - mode => '0644', - owner => '0'; - '/etc/init.d/xend': - ensure => 'file', - require => Package['xcp-xapi'], - source => 'puppet:///modules/devcloudinitial/xend', - group => '0', - owner => '0', - mode => '0755'; - '/etc/default/grub': - ensure => 'file', - require => Package["xen-hypervisor-4.1-${debarch}"], - source => 'puppet:///modules/devcloudinitial/grub', - group => '0', - mode => '0644', - owner => '0'; - '/usr/share/qemu': - ensure => 'directory', - require => Package["xen-hypervisor-4.1-${debarch}"], - group => '0', - mode => '0755', - owner => '0'; - '/usr/share/qemu/keymaps': - ensure => 'link', - require => File['/usr/share/qemu'], - group => '0', - mode => '0777', - owner => '0', - target => '/usr/share/qemu-linaro/keymaps'; - '/etc/network/interfaces': - ensure => 'file', - source => 'puppet:///modules/devcloudinitial/interfaces', - group => '0', - mode => '0644', - owner => '0'; - '/etc/default/xen': - ensure => 'file', - require => Package["xen-hypervisor-4.1-${debarch}"], - source => 'puppet:///modules/devcloudinitial/xen-defaults', - group => '0', - mode => '0644', - owner => '0'; - } - - service { - 'xendomains': - ensure => 'stopped', - require => Package['xcp-xapi'], - enable => false; - } - - exec { '/usr/sbin/update-grub': - subscribe => File['/etc/default/grub'], - refreshonly => true, - cwd => '/', - } - -} diff --git a/tools/devcloud/src/puppet/manifests/vagrant-devcloud.pp b/tools/devcloud/src/puppet/manifests/vagrant-devcloud.pp deleted file mode 100644 index 47b07dc6dd1..00000000000 --- a/tools/devcloud/src/puppet/manifests/vagrant-devcloud.pp +++ /dev/null @@ -1,18 +0,0 @@ -# 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. - -include devcloud diff --git a/tools/devcloud/src/puppet/modules/devcloud/Modulefile b/tools/devcloud/src/puppet/modules/devcloud/Modulefile deleted file mode 100644 index ace7d485481..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/Modulefile +++ /dev/null @@ -1,8 +0,0 @@ -name 'puppet-devcloud' -version '0.0.1' -source '' -author 'Apache Software Foundation' -license 'Licensed under the Apache License, Version 2.0. http://www.apache.org/licenses/LICENSE-2.0' -summary 'CloudStack DevCloud configuration module' -description 'Devcloud setup module.' -project_page 'http://cloudstack.org' diff --git a/tools/devcloud/src/puppet/modules/devcloud/files/compare.sh b/tools/devcloud/src/puppet/modules/devcloud/files/compare.sh deleted file mode 100644 index e0ee95ca077..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/files/compare.sh +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/bash -eux -# 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. - -FILE=$1 -WORKING_DIR=$2 -cd $WORKING_DIR -test `grep $FILE ${WORKING_DIR}/md5sum.txt | awk '{print $1}'` == `md5sum $FILE |awk '{print $1}'` diff --git a/tools/devcloud/src/puppet/modules/devcloud/files/configebtables.sh b/tools/devcloud/src/puppet/modules/devcloud/files/configebtables.sh deleted file mode 100644 index 83293336640..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/files/configebtables.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# 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. -mac=`/sbin/ifconfig xenbr0 |/bin/grep HWaddr |/usr/bin/awk '{print $5}'` -/sbin/ebtables -I FORWARD -d ! $mac -i eth0 -p IPV4 --ip-prot udp --ip-dport 67:68 -j DROP -exit 0 diff --git a/tools/devcloud/src/puppet/modules/devcloud/files/configlocalstorage.sh b/tools/devcloud/src/puppet/modules/devcloud/files/configlocalstorage.sh deleted file mode 100644 index 3ed1a39dcd7..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/files/configlocalstorage.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# 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. -/usr/bin/xe sr-list | /bin/grep local-storage -rc=$? -if [[ $rc != 0 ]] ; then - hostuuid=`xe host-list |grep uuid|awk '{print $5}'`; - xe sr-create host-uuid=$hostuuid name-label=local-storage shared=false type=file device-config:location=/opt/storage/primary -fi -exit 0 diff --git a/tools/devcloud/src/puppet/modules/devcloud/files/configvnc.sh b/tools/devcloud/src/puppet/modules/devcloud/files/configvnc.sh deleted file mode 100644 index b739dc6acb0..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/files/configvnc.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# 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. - -grep 0.0.0.0 /usr/lib/xcp/lib/vncterm-wrapper -rc=$? -if [[ $rc != 0 ]] ; then - sed -i 's/VNCTERM_LISTEN=.\+/VNCTERM_LISTEN="-v 0.0.0.0:1"/' /usr/lib/xcp/lib/vncterm-wrapper -fi -exit 0 diff --git a/tools/devcloud/src/puppet/modules/devcloud/files/exports b/tools/devcloud/src/puppet/modules/devcloud/files/exports deleted file mode 100644 index 1f9165011ac..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/files/exports +++ /dev/null @@ -1,19 +0,0 @@ -# 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. - -/opt/storage/primary *(rw,no_subtree_check,no_root_squash,fsid=0) -/opt/storage/secondary *(rw,no_subtree_check,no_root_squash,fsid=0) diff --git a/tools/devcloud/src/puppet/modules/devcloud/files/installmaven.sh b/tools/devcloud/src/puppet/modules/devcloud/files/installmaven.sh deleted file mode 100644 index 8cd3df01c89..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/files/installmaven.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# 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. - -cd /opt/cloudstack -/usr/bin/wget http://apache.mirrors.pair.com/maven/maven-3/3.0.4/binaries/apache-maven-3.0.4-bin.tar.gz -/bin/tar xvfz apache-maven-3.0.4-bin.tar.gz diff --git a/tools/devcloud/src/puppet/modules/devcloud/files/startdevcloud.sh b/tools/devcloud/src/puppet/modules/devcloud/files/startdevcloud.sh deleted file mode 100644 index 27a7a044851..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/files/startdevcloud.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# 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. - -export CATALINA_HOME=/opt/cloudstack/apache-tomcat-6.0.32 -cd /opt/cloudstack/incubator-cloudstack/ -nohup ant run > /dev/null 2>&1 & -exit 0 diff --git a/tools/devcloud/src/puppet/modules/devcloud/files/updatecode.sh b/tools/devcloud/src/puppet/modules/devcloud/files/updatecode.sh deleted file mode 100644 index 55259208c40..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/files/updatecode.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# 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. - -cd /opt/cloudstack -git clone https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git -rc=$? -if [[ $rc != 0 ]] ; then - cd /opt/cloudstack/incubator-cloudstack - git pull origin master -fi -exit 0 diff --git a/tools/devcloud/src/puppet/modules/devcloud/lib/facter/xeninfo.rb b/tools/devcloud/src/puppet/modules/devcloud/lib/facter/xeninfo.rb deleted file mode 100644 index a0b8748577a..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/lib/facter/xeninfo.rb +++ /dev/null @@ -1,22 +0,0 @@ -# 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 permission s and limitations -# under the License. - -Facter.add(:xen_hostuuid) do - setcode do - uuid=Facter::Util::Resolution.exec('xe host-list |grep uuid|awk \'{print $5}\'') - end -end diff --git a/tools/devcloud/src/puppet/modules/devcloud/manifests/functions/httpdownload.pp b/tools/devcloud/src/puppet/modules/devcloud/manifests/functions/httpdownload.pp deleted file mode 100644 index 2a88771beee..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/manifests/functions/httpdownload.pp +++ /dev/null @@ -1,37 +0,0 @@ -# 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 permission s and limitations -# under the License. - -define devcloud::functions::httpdownload () { - $file="${name['basedir']}/${name['basefile']}" - - exec { - "getfileifnotexist${name}": - command => "/usr/bin/wget ${name['url']}/${file} -O ${name['local_dir']}/${file}", - timeout => 0, - unless => "test -f ${name['local_dir']}/${file}", - require => [ File["${name['local_dir']}/${name['base_dir']}/"], - Exec["get_md5sums"] ]; - - - "getfileifnotmatch${name}": - command => "/usr/bin/wget ${name['url']}/${file} -O ${name['local_dir']}/${file}", - timeout => 0, - unless => "/usr/local/bin/compare.sh ${file} ${name['working_dir']} ", - require => [ Exec["getfileifnotexist${name}"], File["/usr/local/bin/compare.sh"] ] - } - -} diff --git a/tools/devcloud/src/puppet/modules/devcloud/manifests/init.pp b/tools/devcloud/src/puppet/modules/devcloud/manifests/init.pp deleted file mode 100644 index 260e2542e01..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/manifests/init.pp +++ /dev/null @@ -1,255 +0,0 @@ -# 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 permission s and limitations -# under the License. - - -class devcloud ( - - $cs_dir = $devcloud::params::cs_dir , - $devcloud_path = $devcloud::params::devcloud_path, - $gitrepo = $devcloud::params::gitrepo, - $storage_dir = $devcloud::params::storage_dir, - $tomcat_version = $devcloud::params::tomcat_version, - $tomcat_url = $devcloud::params::tomcat_url, - $tomcat_home = $devcloud::params::tomcat_home, - $maven_version = $devcloud::params::maven_version, - $maven_url = $devcloud::params::maven_url, - $maven_home = $devcloud::params::maven_home, - $downloads = $devcloud::params::downloads, - $md5sum_local = $devcloud::params::md5sum_local, - $md5sum_remote = $devcloud::params::md5sum_remote, - $hostuuid = $::xen_hostuuid, - $bridge_device_mac = $::macaddress_xenbr0, - $build_cloudstack = $devcloud::params::build_cloudstack - -) inherits devcloud::params { - - Exec { path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ] } - - Exec["apt-update"] -> Package <| |> - - service { - 'ebtables': - ensure => 'running', - enable => true; - - 'nfs-kernel-server': - ensure => 'running', - require => Package['nfs-server'], - enable => true, - subscribe => File['/etc/exports']; - } - - package - { [ 'ant', - 'git', - 'python-mysql.connector', - 'mkisofs', - 'mysql-server', - 'nfs-server', - 'openjdk-6-jdk', - 'unzip' ]: - ensure => latest, - } - - exec { - - 'apt-update': - command => '/usr/bin/apt-get update'; - - 'get_md5sums': - command => "/usr/bin/wget -N ${md5sum_remote} -O ${md5sum_local}", - require => File["${storage_dir}/secondary/template/tmpl/1/"], - timeout => '0'; - - 'getecho': - command => "/usr/bin/wget ${devcloud_path}/echo -O /usr/lib/xcp/plugins/echo", - creates => '/usr/lib/xcp/plugins/echo'; - - 'setxcpperms': - command => '/bin/chmod -R 755 /usr/lib/xcp', - require => Exec['getecho']; - - 'get_code': - command => "git clone ${gitrepo}", - cwd => $cs_dir, - require => File[$cs_dir], - timeout => '7200', - creates => "${cs_dir}/incubator-cloudstack"; - - 'update_code': - command => 'git pull origin master', - cwd => "${cs_dir}/incubator-cloudstack", - timeout => '7200', - require => [ Exec['get_code']]; - - 'configlocal': - command => "xe sr-create host-uuid=${hostuuid} name-label=local-storage shared=false type=file device-config:location=${storage_dir}/primary", - cwd => '/', - unless => '/usr/bin/xe sr-list | /bin/egrep \'local-storage|Cloud Stack Local EXT Storage Pool\'', - require => [ - File["${storage_dir}/primary"], - ]; - - 'configvnc': - command => 'sed -i \'s/VNCTERM_LISTEN=.\+/VNCTERM_LISTEN="-v 0.0.0.0:1"/\' /usr/lib/xcp/lib/vncterm-wrapper', - onlyif => '/bin/grep "0.0.0.0:1" /usr/lib/xcp/lib/vncterm-wrapper'; - - 'downloadtomcat': - command => "/usr/bin/wget ${tomcat_url} -P ${cs_dir}/", - creates => "${cs_dir}/apache-tomcat-${tomcat_version}.zip", - require => File[$cs_dir], - timeout => '0'; - - 'unziptomcat': - require => [ - Package['unzip'], - Exec['downloadtomcat'] - ], - creates => $tomcat_home, - command => "/usr/bin/unzip apache-tomcat-${tomcat_version}.zip", - cwd => $cs_dir, - timeout => '0'; - - 'downloadmaven': - command => "/usr/bin/wget ${maven_url} -P ${cs_dir}/", - creates => "${cs_dir}/apache-maven-${maven_version}-bin.tar.gz", - require => Exec['unziptomcat'], - timeout => '0'; - - 'install_maven': - require => Exec['downloadmaven'], - creates => $maven_home, - command => "/bin/tar xzvf ${cs_dir}/apache-maven-${maven_version}-bin.tar.gz", - cwd => $cs_dir, - timeout => '0'; - - 'tomcatperms': - command => "chmod +x ${tomcat_home}/bin/*.sh", - require => Exec['unziptomcat']; - - 'catalina_home': - require => Exec['unziptomcat'], - unless => '/bin/grep CATALINA_HOME /root/.bashrc', - command => "/bin/echo \"export CATALINA_HOME=${tomcat_home}\" >> /root/.bashrc", - cwd => '/'; - - 'configebtables': - require => Service['ebtables'], - command => "/sbin/ebtables -I FORWARD -d ! ${bridge_device_mac} -i eth1 -p IPV4 --ip-prot udp --ip-dport 67:68 -j DROP", - unless => "/sbin/ebtables -L | grep \"-I FORWARD -d ! ${bridge_device_mac} -i eth1 -p IPV4 --ip-prot udp --ip-dport 67:68 -j DROP\"", - refreshonly => true, - cwd => '/', - path => '/sbin/:/usr/bin/:/bin' -} - - if $build_cloudstack { - - exec { - 'build_cloudstack': - require => [ - Package['ant','mkisofs'], - Exec['install_maven'], - File[ - "${cs_dir}/incubator-cloudstack/dist", - "${cs_dir}/incubator-cloudstack/target", - "${cs_dir}/buildcloudstack.sh"] - ], - command => "${cs_dir}/buildcloudstack.sh", - cwd => $cs_dir, - timeout => '0'; - } - } - - - file { - - [ $cs_dir, - $storage_dir, - "${storage_dir}/primary", - "${storage_dir}/secondary", - "${storage_dir}/secondary/template", - "${storage_dir}/secondary/template/tmpl", - "${storage_dir}/secondary/template/tmpl/1", - "${storage_dir}/secondary/template/tmpl/1/1", - "${storage_dir}/secondary/template/tmpl/1/5" ]: - ensure => 'directory', - group => '0', - mode => '0755', - owner => '0'; - - [ "${cs_dir}/incubator-cloudstack/dist", - "${cs_dir}/incubator-cloudstack/target" ] : - ensure => 'directory', - group => '0', - mode => '0755', - owner => '0', - require => [ Exec['update_code']]; - - "${cs_dir}/buildcloudstack.sh": - ensure => 'file', - mode => '0755', - owner => '0', - group => '0', - content => template('devcloud/buildcloudstack.sh.erb'); - - "${cs_dir}/startcloudstack.sh": - ensure => 'file', - mode => '0755', - owner => '0', - group => '0', - content => template('devcloud/startcloudstack.sh.erb'); - - '/root/.ssh' : - ensure => 'directory', - group => 'root', - mode => '0700', - owner => 'root'; - - "${cs_dir}/startdevcloud.sh": - ensure => 'file', - source => 'puppet:///modules/devcloud/startdevcloud.sh', - mode => '0755', - owner => '0', - group => '0'; - - '/usr/local/bin/compare.sh': - ensure => 'file', - source => 'puppet:///modules/devcloud/compare.sh', - mode => '0755', - owner => 'root', - group => 'root'; - - '/etc/exports': - ensure => 'file', - require => Package['nfs-server'], - source => 'puppet:///modules/devcloud/exports', - mode => '0644', - owner => '0', - group => '0'; - - } - - - devcloud::functions::httpdownload{ - $downloads: - require => - [ File["${storage_dir}/secondary/template/tmpl/1/1"], - File["${storage_dir}/secondary/template/tmpl/1/5"], - Exec['get_md5sums'] ] - } - -} diff --git a/tools/devcloud/src/puppet/modules/devcloud/manifests/params.pp b/tools/devcloud/src/puppet/modules/devcloud/manifests/params.pp deleted file mode 100644 index ff625c176f3..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/manifests/params.pp +++ /dev/null @@ -1,78 +0,0 @@ -# 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 permission s and limitations -# under the License. - -# == Class: devcloud::params -# -# This class implements the module params pattern, but it's loaded using hiera -# as opposed to the 'default' usage of coding the parameter values in your -# manifest. -# -# == Usage -# -# Don't use this class directly; it's being used where it is needed -# -class devcloud::params { - - $cs_dir = '/opt/cloudstack' - $storage_dir = '/opt/storage' - $tomcat_version = '6.0.32' - $tomcat_url = "http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat_version}/bin/apache-tomcat-${tomcat_version}.zip" - $tomcat_home = "${cs_dir}/apache-tomcat-${tomcat_version}" - $maven_version = '3.0.4' - $maven_url = "http://apache.mirrors.pair.com/maven/maven-3/${maven_version}/binaries/apache-maven-${maven_version}-bin.tar.gz" - $maven_home = "${cs_dir}/apache-maven-${maven_version}" - $devcloud_path = 'http://download.cloud.com/templates/devcloud' - $template_path = "${devcloud_path}/defaulttemplates" - $md5sum_remote = "${template_path}/md5sum.txt" - $md5sum_local = "${storage_dir}/secondary/template/tmpl/1/md5sum.txt" - $template_dir = "${storage_dir}/secondary/template/tmpl/1" - $gitrepo = 'https://github.com/apache/incubator-cloudstack.git' - $build_cloudstack = false - - - $downloads = [ - - { - 'basefile' => 'template.properties', - 'basedir' => '1', - 'url' => $template_path, - 'local_dir' => $template_dir, - 'working_dir' => $template_dir - }, - { - 'basefile' => 'template.properties', - 'basedir' => '5', - 'url' => $template_path, - 'local_dir' => $template_dir, - 'working_dir' => $template_dir - }, - { - 'basefile' => 'dc68eb4c-228c-4a78-84fa-b80ae178fbfd.vhd', - 'basedir' => '1', - 'url' => $template_path, - 'local_dir' => $template_dir, - 'working_dir' => $template_dir - }, - { - 'basefile' => 'ce5b212e-215a-3461-94fb-814a635b2215.vhd', - 'basedir' => '5', - 'url' => $template_path, - 'local_dir' => $template_dir, - 'working_dir' => $template_dir - } - ] -} diff --git a/tools/devcloud/src/puppet/modules/devcloud/templates/buildcloudstack.sh.erb b/tools/devcloud/src/puppet/modules/devcloud/templates/buildcloudstack.sh.erb deleted file mode 100644 index acf9b0b3b95..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/templates/buildcloudstack.sh.erb +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -# 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. - -export CATALINA_HOME=<%= @tomcat_home %> -export M2_HOME=<%= @maven_home %> -export M2=$M2_HOME/bin -MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=800m -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n" -PATH=$M2:$PATH -cd <%= @cs_dir %>/incubator-cloudstack/ -<%= @maven_home %>/bin/mvn clean install -P developer,systemvm -<%= @maven_home %>/bin/mvn -pl developer,tools/devcloud -Ddeploydb -P developer -<%= @maven_home %>/bin/mvn -P developer -pl tools/devcloud -Ddeploysvr diff --git a/tools/devcloud/src/puppet/modules/devcloud/templates/startcloudstack.sh.erb b/tools/devcloud/src/puppet/modules/devcloud/templates/startcloudstack.sh.erb deleted file mode 100644 index 4a07711591b..00000000000 --- a/tools/devcloud/src/puppet/modules/devcloud/templates/startcloudstack.sh.erb +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# 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. - -export CATALINA_HOME=<%= @tomcat_home %> -export M2_HOME=<%= @maven_home %> -export M2=$M2_HOME/bin -MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=800m -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n" -PATH=$M2:$PATH -cd <%= @cs_dir %>/incubator-cloudstack/ -<%= @maven_home %>/bin/mvn -pl client jetty:run & diff --git a/tools/devcloud/src/waitforxe.sh b/tools/devcloud/src/waitforxe.sh deleted file mode 100755 index 637b9fc92c9..00000000000 --- a/tools/devcloud/src/waitforxe.sh +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/bash -# 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. - -date -interval=20 -timeout=300 -command="xe host-list" - -count=0 -maxcount=$(($timeout/$interval)) - -until [ $count -gt $maxcount ]; do - if $command > /dev/null 2>&1; then - echo "\"$command\" executed successfully." - date - exit 0 - fi - let count=count+1 - echo "Waiting for \"$command\" to run successfully." - sleep $interval -done - -echo "\"$command\" failed to complete." -date diff --git a/tools/devcloud4/advanced/README.md b/tools/devcloud4/advanced/README.md index 6171839e68a..4c3b0013e46 100644 --- a/tools/devcloud4/advanced/README.md +++ b/tools/devcloud4/advanced/README.md @@ -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://download.cloudstack.org/tools/vhd-util -P scripts/vm/hypervisor/xenserver/ chmod +x scripts/vm/hypervisor/xenserver/vhd-util ``` diff --git a/tools/devcloud4/basic/README.md b/tools/devcloud4/basic/README.md index 31cb62dbabc..ea502b3fc4d 100644 --- a/tools/devcloud4/basic/README.md +++ b/tools/devcloud4/basic/README.md @@ -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://download.cloudstack.org/tools/vhd-util -P scripts/vm/hypervisor/xenserver/ chmod +x scripts/vm/hypervisor/xenserver/vhd-util ``` diff --git a/tools/docker/Dockerfile.centos6 b/tools/docker/Dockerfile.centos6 index d68c8b856d2..e3e0e21571c 100644 --- a/tools/docker/Dockerfile.centos6 +++ b/tools/docker/Dockerfile.centos6 @@ -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://download.cloudstack.org/tools/vhd-util COPY init.sh_centos6 /root/init.sh COPY systemtpl.sh /root/systemtpl.sh diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index 215cdaecc3f..9249c055383 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -1708,7 +1708,7 @@ test_data = { "upload_volume": { "diskname": "UploadVol", "format": "VHD", - "url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2", + "url": "http://download.cloudstack.org/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2", "checksum": "", }, "bootableIso": diff --git a/tools/marvin/marvin/misc/build/redeploy.sh b/tools/marvin/marvin/misc/build/redeploy.sh index a9c13ccdfd1..29ddb7bda0b 100755 --- a/tools/marvin/marvin/misc/build/redeploy.sh +++ b/tools/marvin/marvin/misc/build/redeploy.sh @@ -44,7 +44,7 @@ echo "Redeploy Version: $VERSION" #some defaults spath='nfs2.lab.vmops.com:/export/home/bvt/secondary' hypervisor='xenserver' -sysvmurl='http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2' +sysvmurl='http://download.cloudstack.org/templates/acton/acton-systemvm-02062012.vhd.bz2' systemvm_seeder='/usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt' while getopts 'u:s:h:' OPTION diff --git a/tools/pom.xml b/tools/pom.xml index 21382597f0a..26ad8f1e1ef 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -36,7 +36,6 @@ apidoc marvin - devcloud devcloud4 devcloud-kvm diff --git a/ui/scripts/cloud.core.callbacks.js b/ui/scripts/cloud.core.callbacks.js index 9aad73a75b7..aad5deb1157 100644 --- a/ui/scripts/cloud.core.callbacks.js +++ b/ui/scripts/cloud.core.callbacks.js @@ -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. */ /* diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java index fbba33ee89a..290e1a0bdb6 100644 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java @@ -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) diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostDatastoreSystemMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostDatastoreSystemMO.java index 9af845b143f..731cfeaeaa6 100644 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostDatastoreSystemMO.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostDatastoreSystemMO.java @@ -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);