Please cherry pick 1f0b804dd3972f373c196799fc48929a7bc3f473 to 4.1 Fixes a bug where ips would not apply to a Nicira L3 gateway.
Cheers, Hugo > -----Original Message----- > From: h...@apache.org [mailto:h...@apache.org] > Sent: Monday, April 15, 2013 3:43 PM > To: comm...@cloudstack.apache.org > Subject: git commit: updated refs/heads/master to 1f0b804 > > Updated Branches: > refs/heads/master e94c70254 -> 1f0b804dd > > > NiciraNvpElement is also implements IpDeployer. > > IpDeployer is required for the L3 components. > > Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo > Commit: http://git-wip- > us.apache.org/repos/asf/cloudstack/commit/1f0b804d > Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1f0b804d > Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1f0b804d > > Branch: refs/heads/master > Commit: 1f0b804dd3972f373c196799fc48929a7bc3f473 > Parents: e94c702 > Author: Hugo Trippaers <htrippa...@schubergphilis.com> > Authored: Mon Apr 15 15:42:10 2013 +0200 > Committer: Hugo Trippaers <htrippa...@schubergphilis.com> > Committed: Mon Apr 15 15:42:40 2013 +0200 > > ---------------------------------------------------------------------- > client/tomcatconf/componentContext.xml.in | 1 + > client/tomcatconf/nonossComponentContext.xml.in | 1 + > 2 files changed, 2 insertions(+), 0 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip- > us.apache.org/repos/asf/cloudstack/blob/1f0b804d/client/tomcatconf/com > ponentContext.xml.in > ---------------------------------------------------------------------- > diff --git a/client/tomcatconf/componentContext.xml.in > b/client/tomcatconf/componentContext.xml.in > index 92838fd..23284ab 100644 > --- a/client/tomcatconf/componentContext.xml.in > +++ b/client/tomcatconf/componentContext.xml.in > @@ -197,6 +197,7 @@ > <ref bean="elasticLoadBalancerElement"/> > <ref bean="VirtualRouter"/> > <ref bean="VpcVirtualRouter"/> > + <ref bean="NiciraNvp"/> > </list> > </property> > </bean> > > http://git-wip- > us.apache.org/repos/asf/cloudstack/blob/1f0b804d/client/tomcatconf/nono > ssComponentContext.xml.in > ---------------------------------------------------------------------- > diff --git a/client/tomcatconf/nonossComponentContext.xml.in > b/client/tomcatconf/nonossComponentContext.xml.in > index aac3b89..a2182d1 100644 > --- a/client/tomcatconf/nonossComponentContext.xml.in > +++ b/client/tomcatconf/nonossComponentContext.xml.in > @@ -293,6 +293,7 @@ > <ref bean="elasticLoadBalancerElement"/> > <ref bean="VirtualRouter"/> > <ref bean="VpcVirtualRouter"/> > + <ref bean="NiciraNvp"/> > </list> > </property> > </bean>
