Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 301D011E75 for ; Wed, 14 May 2014 14:18:28 +0000 (UTC) Received: (qmail 62301 invoked by uid 500); 14 May 2014 14:11:47 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 62274 invoked by uid 500); 14 May 2014 14:11:47 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 62265 invoked by uid 99); 14 May 2014 14:11:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 14:11:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BE0598C401D; Wed, 14 May 2014 14:11:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 2ebeec4 Date: Wed, 14 May 2014 14:11:46 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 24bf1c56d -> 2ebeec433 releasing dhcp leases on vpcs failes because the network tier of the tennant aren't behinbd eth0. Here we make interface selection dynamic. Signed-off-by: Daan Hoogland Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2ebeec43 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2ebeec43 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2ebeec43 Branch: refs/heads/master Commit: 2ebeec43340f33e2a00553b171452c6516ccc946 Parents: 24bf1c5 Author: Joris van Lieshout Authored: Wed May 14 12:05:36 2014 +0200 Committer: Daan Hoogland Committed: Wed May 14 16:11:03 2014 +0200 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2ebeec43/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh b/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh index 70c95a8..c1046c6 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh +++ b/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh @@ -99,7 +99,7 @@ if [ $dnsmasq_managed_lease ] then #release previous dhcp lease if present logger -t cloud "edithosts: releasing $ipv4" - dhcp_release eth0 $ipv4 $(grep "$ipv4 " $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1 + dhcp_release $(ip route get "$ipv4/32" | tr " " "\n" | grep eth) $ipv4 $(grep "$ipv4 " $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1 logger -t cloud "edithosts: released $ipv4" fi