Baremetal: Re-enable baremetal component
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/43b7a544 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/43b7a544 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/43b7a544 Branch: refs/heads/baremetal-4.2 Commit: 43b7a544007167e2ca1c7cc062353d76af2544f0 Parents: a61fd5d Author: Sheng Yang <[email protected]> Authored: Tue Jun 18 14:04:05 2013 -0700 Committer: Sheng Yang <[email protected]> Committed: Tue Jun 18 14:04:05 2013 -0700 ---------------------------------------------------------------------- client/tomcatconf/applicationContext.xml.in | 4 ---- client/tomcatconf/componentContext.xml.in | 10 ---------- client/tomcatconf/nonossComponentContext.xml.in | 8 -------- 3 files changed, 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43b7a544/client/tomcatconf/applicationContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 049e483..294822e 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -183,8 +183,6 @@ <bean id="autoScaleVmGroupDaoImpl" class="com.cloud.network.as.dao.AutoScaleVmGroupDaoImpl" /> <bean id="autoScaleVmGroupPolicyMapDaoImpl" class="com.cloud.network.as.dao.AutoScaleVmGroupPolicyMapDaoImpl" /> <bean id="autoScaleVmProfileDaoImpl" class="com.cloud.network.as.dao.AutoScaleVmProfileDaoImpl" /> - <bean id="baremetalDhcpDaoImpl" class="com.cloud.baremetal.database.BaremetalDhcpDaoImpl" /> - <bean id="baremetalPxeDaoImpl" class="com.cloud.baremetal.database.BaremetalPxeDaoImpl" /> <bean id="capacityDaoImpl" class="com.cloud.capacity.dao.CapacityDaoImpl" /> <bean id="certificateDaoImpl" class="com.cloud.certificate.dao.CertificateDaoImpl" /> <bean id="clusterDaoImpl" class="com.cloud.dc.dao.ClusterDaoImpl" /> @@ -822,7 +820,6 @@ Baremetal components --> -<!-- <bean id="BareMetalDhcp" class="com.cloud.baremetal.networkservice.BaremetalDhcpElement"> <property name="name" value="BareMetalDhcp"/> </bean> @@ -856,7 +853,6 @@ <bean id="BAREMETAL" class="org.apache.cloudstack.storage.image.format.BAREMETAL" /> <bean id="baremetalDhcpDaoImpl" class="com.cloud.baremetal.database.BaremetalDhcpDaoImpl" /> <bean id="baremetalPxeDaoImpl" class="com.cloud.baremetal.database.BaremetalPxeDaoImpl" /> ---> <bean id="AffinityGroupServiceImpl" class="org.apache.cloudstack.affinity.AffinityGroupServiceImpl"/> <bean id="DeploymentPlanningManager" class="com.cloud.deploy.DeploymentPlanningManagerImpl"> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43b7a544/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index 93ef21f..7563d69 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -116,11 +116,7 @@ <ref bean="SecondaryStorageDiscoverer"/> <ref bean="KvmServerDiscoverer"/> <ref bean="LxcServerDiscoverer"/> - - <!-- <ref bean="BareMetalDiscoverer"/> - --> - <ref bean="OvmDiscoverer"/> </list> </property> @@ -156,9 +152,7 @@ <ref bean="UserDispersingPlanner" /> <ref bean="UserConcentratedPodPlanner" /> <ref bean="ImplicitDedicationPlanner" /> -<!-- <ref bean="BareMetalPlanner" /> ---> </list> </property> </bean> @@ -208,9 +202,7 @@ <list> <ref bean="VirtualRouter"/> <ref bean="VpcVirtualRouter"/> -<!-- <ref bean="BareMetalDhcp"/> ---> </list> </property> </bean> @@ -243,11 +235,9 @@ <ref bean="NiciraNvp" /> <ref bean="MidoNetElement"/> <ref bean="InternalLbVm"/> -<!-- <ref bean="BareMetalDhcp"/> <ref bean="BareMetalPxe"/> <ref bean="BareMetalUserdata"/> ---> </list> </property> </bean> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43b7a544/client/tomcatconf/nonossComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index 143aa22..62685e9 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -215,9 +215,7 @@ <ref bean="XcpServerDiscoverer"/> <ref bean="SecondaryStorageDiscoverer"/> <ref bean="KvmServerDiscoverer"/> -<!-- <ref bean="BareMetalDiscoverer"/> ---> <ref bean="OvmDiscoverer"/> <ref bean="vmwareServerDiscoverer"/> </list> @@ -256,9 +254,7 @@ <ref bean="UserDispersingPlanner" /> <ref bean="UserConcentratedPodPlanner" /> <ref bean="ImplicitDedicationPlanner" /> -<!-- <ref bean="BareMetalPlanner" /> ---> </list> </property> </bean> @@ -308,9 +304,7 @@ <list> <ref bean="VirtualRouter"/> <ref bean="VpcVirtualRouter"/> -<!-- <ref bean="BareMetalDhcp"/> ---> </list> </property> </bean> @@ -349,11 +343,9 @@ <ref bean="SecurityGroupProvider"/> <ref bean="VpcVirtualRouter"/> <ref bean="InternalLbVm"/> -<!-- <ref bean="BareMetalDhcp"/> <ref bean="BareMetalPxe"/> <ref bean="BareMetalUserdata"/> ---> </list> </property> </bean>
