Updated Branches: refs/heads/4.1 8a6d0ffda -> 3e2986492
CloudStack CLOUDSTACK-774 add baremetal related class declaration in nonossComponentContext.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3e298649 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3e298649 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3e298649 Branch: refs/heads/4.1 Commit: 3e29864925ccc63d1e3514c9a4d353b1a8e6217e Parents: 8a6d0ff Author: Mice Xia <mice_...@tcloudcomputing.com> Authored: Fri Feb 22 15:54:53 2013 +0800 Committer: Mice Xia <mice_...@tcloudcomputing.com> Committed: Fri Feb 22 15:54:53 2013 +0800 ---------------------------------------------------------------------- client/tomcatconf/nonossComponentContext.xml.in | 41 ++++++++++------- 1 files changed, 24 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3e298649/client/tomcatconf/nonossComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index 372f24e..4bf9426 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -58,22 +58,26 @@ <!-- 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="ExternalDhcpServer" class="com.cloud.network.element.ExternalDhcpElement"> - <property name="name" value="ExternalDhcpServer"/> - </bean> <bean id="BareMetalDhcp" class="com.cloud.baremetal.networkservice.BaremetalDhcpElement"> <property name="name" value="BareMetalDhcp"/> </bean> <bean id="BareMetalPxe" class="com.cloud.baremetal.networkservice.BaremetalPxeElement"> <property name="name" value="BareMetalPxe"/> </bean> + <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> @@ -131,6 +135,10 @@ <property name="name" value="Basic"/> </bean> + <bean id="BareMetalTemplateAdapter" class="com.cloud.baremetal.manager.BareMetalTemplateAdapter" > + <property name="name" value="BareMetalTemplateAdapter"/> + </bean> + <!-- Authenticators --> @@ -196,10 +204,14 @@ <property name="name" value="KVM Agent"/> </bean> - <bean id="BareMetalDiscoverer" class="com.cloud.baremetal.BareMetalDiscoverer"> + <bean id="BareMetalDiscoverer" class="com.cloud.baremetal.manager.BareMetalDiscoverer"> <property name="name" value="Bare Metal Agent"/> </bean> + <bean id="BaremetalPlannerSelector" class="com.cloud.baremetal.manager.BaremetalPlannerSelector"> + <property name="name" value="BaremetalPlannerSelector"/> + </bean> + <bean id="HypervServerDiscoverer" class="com.cloud.hypervisor.hyperv.HypervServerDiscoverer"> <property name="name" value="SCVMMServer"/> </bean> @@ -227,11 +239,10 @@ <property name="name" value="UserConcentratedPod"/> </bean> - <bean id="BareMetalPlanner" class="com.cloud.deploy.BareMetalPlanner"> + <bean id="BareMetalPlanner" class="com.cloud.baremetal.manager.BareMetalPlanner"> <property name="name" value="BareMetal Fit"/> </bean> - - + <!-- Network Gurus --> @@ -276,14 +287,6 @@ <bean id="KVMGuru" class="com.cloud.hypervisor.KVMGuru"> <property name="name" value="KVMGuru"/> </bean> - - <bean id="BareMetalGuru" class="com.cloud.baremetal.BareMetalGuru"> - <property name="name" value="BareMetalGuru"/> - </bean> - - <bean id="HypervGuru" class="com.cloud.hypervisor.guru.HypervGuru"> - <property name="name" value="HypervGuru"/> - </bean> <bean id="OvmGuru" class="com.cloud.ovm.hypervisor.OvmGuru"> <property name="name" value="OvmGuru"/> @@ -292,7 +295,11 @@ <bean id="VMwareGuru" class="com.cloud.hypervisor.guru.VMwareGuru"> <property name="name" value="VMwareGuru"/> </bean> - + + <bean id="BaremetalGuru" class="com.cloud.baremetal.manager.BareMetalGuru"> + <property name="name" value="BaremetalGuru"/> + </bean> + <!-- DAO with customized configuration -->
