You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/06/19 02:06:06 UTC
[3/4] git commit: updated refs/heads/baremetal-4.2 to f6d71c5
Revert "Removing baremetal related references"
This reverts commit 99ea4011b18356d09686889205ef5df1b170b0dc.
Conflicts:
server/src/com/cloud/network/NetworkServiceImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a61fd5dc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a61fd5dc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a61fd5dc
Branch: refs/heads/baremetal-4.2
Commit: a61fd5dc85250a6fdb8cafcc19ff2906441089ba
Parents: 0a8343e
Author: Sheng Yang <sh...@citrix.com>
Authored: Tue Jun 18 14:04:05 2013 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Tue Jun 18 14:04:05 2013 -0700
----------------------------------------------------------------------
client/pom.xml | 5 +++++
.../dns-notifier/resources/components-example.xml | 8 --------
server/src/com/cloud/network/NetworkServiceImpl.java | 9 +++------
3 files changed, 8 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a61fd5dc/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index ab758eb..9fe5081 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -106,6 +106,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-hypervisor-ucs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-hypervisor-ovm</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a61fd5dc/plugins/network-elements/dns-notifier/resources/components-example.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/dns-notifier/resources/components-example.xml b/plugins/network-elements/dns-notifier/resources/components-example.xml
index 2e9c5be..717c5e0 100755
--- a/plugins/network-elements/dns-notifier/resources/components-example.xml
+++ b/plugins/network-elements/dns-notifier/resources/components-example.xml
@@ -112,9 +112,7 @@ under the License.
<adapter name="XCP Agent" class="com.cloud.hypervisor.xen.discoverer.XcpServerDiscoverer"/>
<adapter name="SecondaryStorage" class="com.cloud.storage.secondary.SecondaryStorageDiscoverer"/>
<adapter name="KVM Agent" class="com.cloud.hypervisor.kvm.discoverer.KvmServerDiscoverer"/>
- <!--
<adapter name="Bare Metal Agent" class="com.cloud.baremetal.BareMetalDiscoverer"/>
- -->
<adapter name="SCVMMServer" class="com.cloud.hypervisor.hyperv.HypervServerDiscoverer"/>
<adapter name="Ovm Discover" class="com.cloud.ovm.hypervisor.OvmDiscoverer" />
</adapters>
@@ -122,9 +120,7 @@ under the License.
<adapter name="First Fit" class="com.cloud.deploy.FirstFitPlanner"/>
<adapter name="UserDispersing" class="com.cloud.deploy.UserDispersingPlanner"/>
<adapter name="UserConcentratedPod" class="com.cloud.deploy.UserConcentratedPodPlanner"/>
- <!--
<adapter name="BareMetal Fit" class="com.cloud.deploy.BareMetalPlanner"/>
- -->
</adapters>
<adapters key="com.cloud.alert.AlertAdapter">
<adapter name="ClusterAlert" class="com.cloud.alert.ClusterAlertAdapter"/>
@@ -138,9 +134,7 @@ under the License.
<adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
<adapter name="Ovs" class="com.cloud.network.element.OvsElement"/>
<adapter name="ExternalDhcpServer" class="com.cloud.network.element.ExternalDhcpElement"/>
- <!--
<adapter name="BareMetal" class="com.cloud.network.element.BareMetalElement"/>
- -->
<adapter name="SecurityGroupProvider" class="com.cloud.network.element.SecurityGroupElement"/>
<adapter name="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement"/>
<adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/>
@@ -152,9 +146,7 @@ under the License.
<adapters key="com.cloud.hypervisor.HypervisorGuru">
<adapter name="XenServerGuru" class="com.cloud.hypervisor.XenServerGuru"/>
<adapter name="KVMGuru" class="com.cloud.hypervisor.KVMGuru"/>
- <!--
<adapter name="BareMetalGuru" class="com.cloud.baremetal.BareMetalGuru"/>
- -->
<adapter name="HypervGuru" class="com.cloud.hypervisor.guru.HypervGuru"/>
<adapter name="OvmGuru" class="com.cloud.ovm.hypervisor.OvmGuru" />
</adapters>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a61fd5dc/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index aace68d..6ede914 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -2491,11 +2491,11 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
addDefaultVpcVirtualRouterToPhysicalNetwork(pNetwork.getId());
// add baremetal as the defualt network service provider
- /* addDefaultBaremetalProvidersToPhysicalNetwork(pNetwork.getId()); */
-
+ addDefaultBaremetalProvidersToPhysicalNetwork(pNetwork.getId());
+
//Add Internal Load Balancer element as a default network service provider
addDefaultInternalLbProviderToPhysicalNetwork(pNetwork.getId());
-
+
txn.commit();
return pNetwork;
} catch (Exception ex) {
@@ -3752,12 +3752,9 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
DataCenterVO dvo = _dcDao.findById(pvo.getDataCenterId());
if (dvo.getNetworkType() == NetworkType.Basic) {
- // Baremetal is currently disabled
-/*
addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalDhcpProvider", null, null);
addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalPxeProvider", null, null);
addProviderToPhysicalNetwork(physicalNetworkId, "BaremetaUserdataProvider", null, null);
-*/
}
return null;
}