You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/04/05 23:03:13 UTC
[18/50] [abbrv] git commit: updated refs/heads/affinity_groups to
ca1a794
Enable the midonet plugin
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/44567453
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/44567453
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/44567453
Branch: refs/heads/affinity_groups
Commit: 44567453e0511e3090ac22518113b283cfa26b4b
Parents: eddf7b9
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Apr 3 12:04:58 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Wed Apr 3 12:04:58 2013 +0200
----------------------------------------------------------------------
client/tomcatconf/componentContext.xml.in | 13 +++++++++++++
client/tomcatconf/nonossComponentContext.xml.in | 15 +++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/44567453/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index 51980c9..6c7c7d4 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -141,6 +141,7 @@
<ref bean="OvsGuestNetworkGuru"/>
<ref bean="PrivateNetworkGuru"/>
<ref bean="NiciraNvpGuestNetworkGuru"/>
+ <ref bean="MidoNetGuestNetworkGuru"/>
</list>
</property>
<property name="NetworkElements">
@@ -150,6 +151,7 @@
<ref bean="SecurityGroupProvider"/>
<ref bean="VpcVirtualRouter"/>
<ref bean="NiciraNvp"/>
+ <ref bean="MidoNetElement"/>
<!--
<ref bean="BareMetalDhcp"/>
<ref bean="BareMetalPxe"/>
@@ -183,6 +185,7 @@
<ref bean="SecurityGroupProvider"/>
<ref bean="VpcVirtualRouter"/>
<ref bean="NiciraNvp" />
+ <ref bean="MidoNetElement"/>
<!--
<ref bean="BareMetalDhcp"/>
<ref bean="BareMetalPxe"/>
@@ -206,6 +209,16 @@
<bean id="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement">
<property name="name" value="NiciraNvp"/>
</bean>
+
+ <!--
+ Midonet support components
+ -->
+ <bean id="MidoNetGuestNetworkGuru" class="com.cloud.network.guru.MidoNetGuestNetworkGuru">
+ <property name="name" value="MidoNetGuestNetworkGuru"/>
+ </bean>
+ <bean id="MidoNetElement" class="com.cloud.network.element.MidoNetElement">
+ <property name="name" value="MidoNetElement"/>
+ </bean>
</beans>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/44567453/client/tomcatconf/nonossComponentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in
index a9418d7..479c03f 100644
--- a/client/tomcatconf/nonossComponentContext.xml.in
+++ b/client/tomcatconf/nonossComponentContext.xml.in
@@ -235,6 +235,7 @@
<ref bean="OvsGuestNetworkGuru"/>
<ref bean="PrivateNetworkGuru"/>
<ref bean="NiciraNvpGuestNetworkGuru" />
+ <ref bean="MidoNetGuestNetworkGuru" />
</list>
</property>
<property name="NetworkElements">
@@ -244,6 +245,7 @@
<ref bean="F5BigIP"/>
<ref bean="CiscoNexus1000vVSM"/>
<ref bean="NiciraNvp" />
+ <ref bean="MidoNetElement" />
<ref bean="bigSwitchVnsElement"/>
<ref bean="VirtualRouter"/>
<ref bean="Ovs"/>
@@ -282,6 +284,7 @@
<ref bean="F5BigIP"/>
<ref bean="CiscoNexus1000vVSM"/>
<ref bean="NiciraNvp" />
+ <ref bean="MidoNetElement" />
<ref bean="bigSwitchVnsElement"/>
<ref bean="VirtualRouter"/>
<ref bean="Ovs"/>
@@ -296,4 +299,16 @@
</property>
</bean>
+ <!--
+ Midonet support components
+ -->
+ <bean id="MidoNetGuestNetworkGuru" class="com.cloud.network.guru.MidoNetGuestNetworkGuru">
+ <property name="name" value="MidoNetGuestNetworkGuru"/>
+ </bean>
+ <bean id="MidoNetElement" class="com.cloud.network.element.MidoNetElement">
+ <property name="name" value="MidoNetElement"/>
+ </bean>
+
+
+
</beans>