You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by tu...@apache.org on 2014/03/30 20:04:20 UTC
[5/7] git commit: updated refs/heads/docker to 2ab7524
fix building
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/234831a9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/234831a9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/234831a9
Branch: refs/heads/docker
Commit: 234831a996aa501f8f8643926224318c6875e2d7
Parents: cd8a452
Author: tuna <ng...@gmail.com>
Authored: Sat Mar 29 01:40:37 2014 +0700
Committer: tuna <ng...@gmail.com>
Committed: Sat Mar 29 15:26:54 2014 +0700
----------------------------------------------------------------------
engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java | 2 +-
plugins/pom.xml | 1 +
server/src/com/cloud/hypervisor/DockerGuru.java | 4 ++--
.../hypervisor/kvm/discoverer/DockerServerDiscoverer.java | 2 +-
.../cloud/network/router/VirtualNetworkApplianceManager.java | 2 +-
setup/db/db/schema-410to420.sql | 6 ++----
6 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/234831a9/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
index 7da2863..bdf2d9e 100755
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
@@ -213,7 +213,7 @@ public class Upgrade421to430 implements DbUpgrade {
case LXC: hypervisorsListInUse.add(Hypervisor.HypervisorType.LXC);
break;
case Docker: hypervisorsListInUse.add(Hypervisor.HypervisorType.Docker);
- break;
+ break;
}
}
} catch (SQLException e) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/234831a9/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 4f7805a..86308bc 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -46,6 +46,7 @@
<module>network-elements/ovs</module>
<module>network-elements/juniper-contrail</module>
<module>network-elements/palo-alto</module>
+ <module>network-elements/netscaler</module>
<module>network-elements/nicira-nvp</module>
<module>network-elements/bigswitch-vns</module>
<module>network-elements/midonet</module>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/234831a9/server/src/com/cloud/hypervisor/DockerGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/DockerGuru.java b/server/src/com/cloud/hypervisor/DockerGuru.java
index bba6927..c8d2d6e 100644
--- a/server/src/com/cloud/hypervisor/DockerGuru.java
+++ b/server/src/com/cloud/hypervisor/DockerGuru.java
@@ -18,7 +18,7 @@ public class DockerGuru extends HypervisorGuruBase implements HypervisorGuru {
public HypervisorType getHypervisorType() {
return HypervisorType.Docker;
}
-
+
protected DockerGuru() {
super();
}
@@ -33,7 +33,7 @@ public class DockerGuru extends HypervisorGuruBase implements HypervisorGuru {
return to;
}
-
+
@Override
public boolean trackVmHostChange() {
return false;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/234831a9/server/src/com/cloud/hypervisor/kvm/discoverer/DockerServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/DockerServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/DockerServerDiscoverer.java
index 558aa25..d7ce7c2 100644
--- a/server/src/com/cloud/hypervisor/kvm/discoverer/DockerServerDiscoverer.java
+++ b/server/src/com/cloud/hypervisor/kvm/discoverer/DockerServerDiscoverer.java
@@ -9,7 +9,7 @@ import com.cloud.resource.Discoverer;
@Local(value = Discoverer.class)
public class DockerServerDiscoverer extends LibvirtServerDiscoverer {
- private static final Logger s_logger = Logger.getLogger(DockerServerDiscoverer.class);
+ private static final Logger s_logger = Logger.getLogger(DockerServerDiscoverer.class);
@Override
public Hypervisor.HypervisorType getHypervisorType() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/234831a9/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
index c2f43b8..afbde31 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
@@ -50,7 +50,7 @@ public interface VirtualNetworkApplianceManager extends Manager, VirtualNetworkA
static final String RouterTemplateVmwareCK = "router.template.vmware";
static final String RouterTemplateHyperVCK = "router.template.hyperv";
static final String RouterTemplateLxcCK = "router.template.lxc";
- static final String RouterTemplateDockerCK = "router.template.docker";
+ static final String RouterTemplateDockerCK = "router.template.docker";
static final String SetServiceMonitorCK = "network.router.EnableServiceMonitoring";
static final ConfigKey<String> RouterTemplateXen = new ConfigKey<String>(String.class, RouterTemplateXenCK, "Advanced", "SystemVM Template (XenServer)",
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/234831a9/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 9af1162..4928b28 100755
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -661,7 +661,7 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Project Defaults', 'DEFAULT'
ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id';
ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `uuid` varchar(40) UNIQUE;
--- START: support for LXC and Docker
+-- START: support for LXC
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled) VALUES (UUID(), 'LXC', 'default', 50, 1);
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled) VALUES (UUID(), 'Docker', 'default', 50, 1);
@@ -673,12 +673,10 @@ UPDATE configuration SET value='KVM,XenServer,VMware,BareMetal,Ovm,LXC,Docker' W
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');
-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 (Docker)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2', '2755de1f9ef2ce4d6f2bee2efbb4da92', 0, 'SystemVM Template (Docker)', 'QCOW2', 15, 0, 1, 'Docker');
ALTER TABLE `cloud`.`user_vm` MODIFY user_data TEXT(32768);
--- END: support for LXC and Docker
+-- END: support for LXC
CREATE TABLE `cloud`.`vm_snapshots` (
`id` bigint(20) unsigned NOT NULL auto_increment COMMENT 'Primary Key',