cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: refs/heads/4.1 - CLOUDSTACK-1773:Temporarily disabling baremetal functionality in CS 4.1
Date Mon, 25 Mar 2013 18:35:46 GMT
Updated Branches:
  refs/heads/4.1 8d3a7f29b -> c25d60f17


CLOUDSTACK-1773:Temporarily disabling baremetal functionality in CS 4.1

Signed-off-by: Min Chen <min.chen@citrix.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c25d60f1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c25d60f1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c25d60f1

Branch: refs/heads/4.1
Commit: c25d60f1757738b0114dc1de6d557a73034db5ef
Parents: 8d3a7f2
Author: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
Authored: Mon Mar 25 11:34:53 2013 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Mon Mar 25 11:34:53 2013 -0700

----------------------------------------------------------------------
 client/pom.xml                                  |    3 +++
 client/tomcatconf/componentContext.xml.in       |   13 ++++++++++++-
 client/tomcatconf/nonossComponentContext.xml.in |   15 ++++++++++++++-
 plugins/pom.xml                                 |    4 ++--
 server/src/com/cloud/configuration/Config.java  |   15 +++++++++------
 setup/db/db/schema-40to410.sql                  |    2 ++
 6 files changed, 42 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c25d60f1/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 38ba405..33a2274 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -85,11 +85,14 @@
       <artifactId>cloud-plugin-hypervisor-xen</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <!-- CLOUDSTACK-1773: Disabling BareMetal temporarily -->
+    <!--
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-plugin-hypervisor-baremetal</artifactId>
       <version>${project.version}</version>
     </dependency>
+    -->
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-plugin-hypervisor-ucs</artifactId>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c25d60f1/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index ff7376e..f67dbb7 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -53,6 +53,7 @@
   <bean id="ipv6AddressManagerImpl" class="com.cloud.network.Ipv6AddressManagerImpl" />
 
   <bean id="apiRateLimitServiceImpl" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl"/>
+  <!--
   <bean id="BaremetalManager" class="com.cloud.baremetal.manager.BaremetalManagerImpl"/>
   <bean id="BaremetalDhcpManager" class="com.cloud.baremetal.networkservice.BaremetalDhcpManagerImpl"/>
   <bean id="BaremetalKickStartPxeService" class="com.cloud.baremetal.networkservice.BaremetalKickStartServiceImpl"/>
@@ -61,7 +62,7 @@
   <bean id="UcsManager" class="com.cloud.ucs.manager.UcsManagerImpl" />
   <bean id="UcsBladeDao" class="com.cloud.ucs.database.UcsBladeDaoImpl" />
   <bean id="UcsManagerDao" class="com.cloud.ucs.database.UcsManagerDaoImpl" />
-
+  -->
    
   <!--
       Network Elements
@@ -69,6 +70,7 @@
   <bean id="Ovs" class="com.cloud.network.element.OvsElement">
     <property name="name" value="Ovs"/>
   </bean>
+  <!--
   <bean id="BareMetalDhcp" class="com.cloud.baremetal.networkservice.BaremetalDhcpElement">
       <property name="name" value="BareMetalDhcp"/>
   </bean>
@@ -78,6 +80,7 @@
   <bean id="BareMetalUserdata" class="com.cloud.baremetal.networkservice.BaremetalUserdataElement">
       <property name="name" value="BareMetalUserdata"/>
   </bean>
+  -->
   <bean id="SecurityGroupProvider" class="com.cloud.network.element.SecurityGroupElement">
     <property name="name" value="SecurityGroupProvider"/>
   </bean>
@@ -134,9 +137,11 @@
     <property name="name" value="HypervisorAdapter"/>
   </bean>
 
+  <!--
   <bean id="BareMetalTemplateAdapter" class="com.cloud.baremetal.manager.BareMetalTemplateAdapter"
>
     <property name="name" value="BareMetalTemplateAdapter"/>
   </bean>
+  -->
 
   <!--
     Authenticators
@@ -193,9 +198,11 @@
     <property name="name" value="KVM Agent"/>
   </bean>
 
+  <!--
   <bean id="BareMetalDiscoverer" class="com.cloud.baremetal.manager.BareMetalDiscoverer">
     <property name="name" value="Bare Metal Agent"/>
   </bean>
+  -->
 
   <!--
   <bean id="SimulatorDiscoverer" class="com.cloud.resource.SimulatorDiscoverer">
@@ -224,6 +231,7 @@
     <property name="name" value="UserConcentratedPod"/>
   </bean>
 
+  <!--
   <bean id="BareMetalPlanner" class="com.cloud.baremetal.manager.BareMetalPlanner">
     <property name="name" value="BareMetal Fit"/>
   </bean>
@@ -231,6 +239,7 @@
   <bean id="BaremetalPlannerSelector" class="com.cloud.baremetal.manager.BaremetalPlannerSelector">
     <property name="name" value="BaremetalPlannerSelector"/>
   </bean>
+  -->
 
   <bean id="HypervisorPlannerSelector" class="com.cloud.deploy.HypervisorVmPlannerSelector">
     <property name="name" value="HypervisorPlannerSelector"/>
@@ -296,9 +305,11 @@
     <property name="name" value="OvmGuru"/>
   </bean>
 
+  <!--
   <bean id="BaremetalGuru" class="com.cloud.baremetal.manager.BareMetalGuru">
     <property name="name" value="BaremetalGuru"/>
   </bean>
+  -->
   <!--
   <bean id="SimulatorGuru" class="com.cloud.simulator.SimulatorGuru">
     <property name="name" value="SimulatorGuru"/>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c25d60f1/client/tomcatconf/nonossComponentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in
index 35e1b28..531b3b9 100644
--- a/client/tomcatconf/nonossComponentContext.xml.in
+++ b/client/tomcatconf/nonossComponentContext.xml.in
@@ -59,17 +59,21 @@
   <!-- bean id="bareMetalVmManagerImpl" class="com.cloud.baremetal.BareMetalVmManagerImpl"
/ -->
   <bean id="VmwareManager" class="com.cloud.hypervisor.vmware.manager.VmwareManagerImpl"/>
   <bean id="NetappManager" class="com.cloud.netapp.NetappManagerImpl"/>
+  <!--
   <bean id="BaremetalManager" class="com.cloud.baremetal.manager.BaremetalManagerImpl"/>
   <bean id="BaremetalDhcpManager" class="com.cloud.baremetal.networkservice.BaremetalDhcpManagerImpl"/>
   <bean id="BaremetalKickStartPxeService" class="com.cloud.baremetal.networkservice.BaremetalKickStartServiceImpl"/>
   <bean id="BaremetalPingPxeService" class="com.cloud.baremetal.networkservice.BareMetalPingServiceImpl"
/>
   <bean id="BaremetalPxeManager" class="com.cloud.baremetal.networkservice.BaremetalPxeManagerImpl"
/> 
+  -->
   <!--
       Network Elements
   -->
   <bean id="Ovs" class="com.cloud.network.element.OvsElement">
     <property name="name" value="Ovs"/>
   </bean>
+
+  <!--
   <bean id="BareMetalDhcp" class="com.cloud.baremetal.networkservice.BaremetalDhcpElement">
     <property name="name" value="BareMetalDhcp"/>
   </bean>
@@ -79,6 +83,8 @@
   <bean id="BareMetalUserdata" class="com.cloud.baremetal.networkservice.BaremetalUserdataElement">
       <property name="name" value="BareMetalUserdata"/>
   </bean>
+  -->
+
   <bean id="SecurityGroupProvider" class="com.cloud.network.element.SecurityGroupElement">
     <property name="name" value="SecurityGroupProvider"/>
   </bean>
@@ -136,9 +142,11 @@
     <property name="name" value="Basic"/>
   </bean>
 
+  <!--
   <bean id="BareMetalTemplateAdapter" class="com.cloud.baremetal.manager.BareMetalTemplateAdapter"
>
     <property name="name" value="BareMetalTemplateAdapter"/>
   </bean>
+  -->
 
   <!--
     Authenticators
@@ -205,10 +213,11 @@
     <property name="name" value="KVM Agent"/>
   </bean>
 
+  <!--
   <bean id="BareMetalDiscoverer" class="com.cloud.baremetal.manager.BareMetalDiscoverer">
     <property name="name" value="Bare Metal Agent"/>
   </bean>
-
+  -->
 
   <bean id="HypervServerDiscoverer" class="com.cloud.hypervisor.hyperv.HypervServerDiscoverer">
     <property name="name" value="SCVMMServer"/>
@@ -237,9 +246,11 @@
     <property name="name" value="UserConcentratedPod"/>
   </bean>
 
+  <!--
   <bean id="BareMetalPlanner" class="com.cloud.baremetal.manager.BareMetalPlanner">
     <property name="name" value="BareMetal Fit"/>
   </bean>
+  -->
 
   <!--
     Network Gurus
@@ -294,6 +305,7 @@
     <property name="name" value="VMwareGuru"/>
   </bean>
 
+  <!--
   <bean id="BaremetalGuru" class="com.cloud.baremetal.manager.BareMetalGuru">
     <property name="name" value="BaremetalGuru"/>
   </bean>
@@ -301,6 +313,7 @@
   <bean id="BaremetalPlannerSelector" class="com.cloud.baremetal.manager.BaremetalPlannerSelector">
     <property name="name" value="BaremetalPlannerSelector"/>
   </bean>
+  -->
 
   <bean id="HypervisorPlannerSelector" class="com.cloud.deploy.HypervisorVmPlannerSelector">
     <property name="name" value="HypervisorPlannerSelector"/>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c25d60f1/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 02459b4..60432a6 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -43,8 +43,8 @@
     <module>hypervisors/kvm</module>
     <module>event-bus/rabbitmq</module>
     <module>hypervisors/simulator</module>
-    <module>hypervisors/baremetal</module>
-    <module>hypervisors/ucs</module>
+    <!-- <module>hypervisors/baremetal</module>
+    <module>hypervisors/ucs</module> -->
     <module>network-elements/elastic-loadbalancer</module>
     <module>network-elements/ovs</module>
     <module>network-elements/nicira-nvp</module>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c25d60f1/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index 17fe62b..0815a77 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -188,7 +188,9 @@ public enum Config {
 	CPUOverprovisioningFactor("Advanced", ManagementServer.class, String.class, "cpu.overprovisioning.factor",
"1", "Used for CPU overprovisioning calculation; available CPU will be (actualCpuCapacity
* cpu.overprovisioning.factor)", null),
 	MemOverprovisioningFactor("Advanced", ManagementServer.class, String.class, "mem.overprovisioning.factor",
"1", "Used for memory overprovisioning calculation", null),
 	LinkLocalIpNums("Advanced", ManagementServer.class, Integer.class, "linkLocalIp.nums", "10",
"The number of link local ip that needed by domR(in power of 2)", null),
-	HypervisorList("Advanced", ManagementServer.class, String.class, "hypervisor.list", HypervisorType.KVM
+ "," + HypervisorType.XenServer + "," + HypervisorType.VMware + "," + HypervisorType.BareMetal
+ "," + HypervisorType.Ovm, "The list of hypervisors that this deployment will use.", "hypervisorList"),
+        //Bug:1773: Disabling BareMetal temporarily.
+        // HypervisorList("Advanced", ManagementServer.class, String.class, "hypervisor.list",
HypervisorType.KVM + "," + HypervisorType.XenServer + "," + HypervisorType.VMware + "," +
HypervisorType.BareMetal + "," + HypervisorType.Ovm, "The list of hypervisors that this deployment
will use.", "hypervisorList"),
+	HypervisorList("Advanced", ManagementServer.class, String.class, "hypervisor.list", HypervisorType.KVM
+ "," + HypervisorType.XenServer + "," + HypervisorType.VMware + "," + HypervisorType.Ovm,
"The list of hypervisors that this deployment will use.", "hypervisorList"),
 	ManagementHostIPAdr("Advanced", ManagementServer.class, String.class, "host", "localhost",
"The ip address of management server", null),
 	ManagementNetwork("Advanced", ManagementServer.class, String.class, "management.network.cidr",
null, "The cidr of management server network", null),
 	EventPurgeDelay("Advanced", ManagementServer.class, Integer.class, "event.purge.delay",
"15", "Events older than specified number days will be purged. Set this value to 0 to never
delete events", null),
@@ -359,11 +361,12 @@ public enum Config {
 	                null, "Limits number of snapshots that can be handled by the host concurrently;
default is NULL - unlimited", null),
 	NetworkIPv6SearchRetryMax("Network", ManagementServer.class, Integer.class, "network.ipv6.search.retry.max",
"10000", "The maximum number of retrying times to search for an available IPv6 address in
the table", null),
 
-	ExternalBaremetalSystemUrl("Advanced", ManagementServer.class, String.class, "external.baremetal.system.url",
null, "url of external baremetal system that CloudStack will talk to", null),
-	ExternalBaremetalResourceClassName("Advanced", ManagementServer.class, String.class, "external,baremetal.resource.classname",
null, "class name for handling external baremetal resource", null),
-	EnableBaremetalSecurityGroupAgentEcho("Advanced", ManagementServer.class, Boolean.class,
"enable.baremetal.securitygroup.agent.echo", "false", "After starting provision process, periodcially
echo security agent installed in the template. Treat provisioning as success only if echo
successfully", null),
-	IntervalToEchoBaremetalSecurityGroupAgent("Advanced", ManagementServer.class, Integer.class,
"interval.baremetal.securitygroup.agent.echo", "10", "Interval to echo baremetal security
group agent, in seconds", null),
-	TimeoutToEchoBaremetalSecurityGroupAgent("Advanced", ManagementServer.class, Integer.class,
"timeout.baremetal.securitygroup.agent.echo", "3600", "Timeout to echo baremetal security
group agent, in seconds, the provisioning process will be treated as a failure", null),
+	//Bug:1773: Disabling BareMetal temporarily.
+	//ExternalBaremetalSystemUrl("Advanced", ManagementServer.class, String.class, "external.baremetal.system.url",
null, "url of external baremetal system that CloudStack will talk to", null),
+	//ExternalBaremetalResourceClassName("Advanced", ManagementServer.class, String.class, "external,baremetal.resource.classname",
null, "class name for handling external baremetal resource", null),
+	//EnableBaremetalSecurityGroupAgentEcho("Advanced", ManagementServer.class, Boolean.class,
"enable.baremetal.securitygroup.agent.echo", "false", "After starting provision process, periodcially
echo security agent installed in the template. Treat provisioning as success only if echo
successfully", null),
+	//IntervalToEchoBaremetalSecurityGroupAgent("Advanced", ManagementServer.class, Integer.class,
"interval.baremetal.securitygroup.agent.echo", "10", "Interval to echo baremetal security
group agent, in seconds", null),
+	//TimeoutToEchoBaremetalSecurityGroupAgent("Advanced", ManagementServer.class, Integer.class,
"timeout.baremetal.securitygroup.agent.echo", "3600", "Timeout to echo baremetal security
group agent, in seconds, the provisioning process will be treated as a failure", null),
 
     ApiLimitEnabled("Advanced", ManagementServer.class, Boolean.class, "api.throttling.enabled",
"false", "Enable/disable Api rate limit", null),
 	ApiLimitInterval("Advanced", ManagementServer.class, Integer.class, "api.throttling.interval",
"1", "Time interval (in seconds) to reset API count", null),

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c25d60f1/setup/db/db/schema-40to410.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql
index 754bfb6..0380c4f 100644
--- a/setup/db/db/schema-40to410.sql
+++ b/setup/db/db/schema-40to410.sql
@@ -1675,3 +1675,5 @@ CREATE TABLE `cloud`.`ucs_manager` (
 
 
 SET foreign_key_checks = 1;
+
+UPDATE `cloud`.`configuration` SET value='KVM,XenServer,VMware,Ovm' WHERE name='hypervisor.list';


Mime
View raw message