You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/05/20 12:34:00 UTC
[1/2] git commit: updated refs/heads/4.4 to 8326428
Repository: cloudstack
Updated Branches:
refs/heads/4.4 c4ae789e8 -> 8326428bb
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 <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1c88ea51
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1c88ea51
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1c88ea51
Branch: refs/heads/4.4
Commit: 1c88ea51e54cc13f460512258531058552debea9
Parents: c4ae789
Author: Joris van Lieshout <jv...@schubergphilis.com>
Authored: Wed May 14 12:05:36 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue May 20 12:33:44 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/1c88ea51/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
[2/2] git commit: updated refs/heads/4.4 to 8326428
Posted by da...@apache.org.
A slightly more reliable way of extracting the device name. Thanks John.
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8326428b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8326428b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8326428b
Branch: refs/heads/4.4
Commit: 8326428bb86d3cd80c8984a74c8513ca86e1ba80
Parents: 1c88ea5
Author: Joris van Lieshout <jv...@schubergphilis.com>
Authored: Tue May 20 11:02:14 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue May 20 12:33:48 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/8326428b/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 c1046c6..a07f40d 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 $(ip route get "$ipv4/32" | tr " " "\n" | grep eth) $ipv4 $(grep "$ipv4 " $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1
+ dhcp_release $(ip route get "$ipv4/32" | grep " dev " | sed -e "s/^.* dev \([^ ]*\) .*$/\1/g") $ipv4 $(grep "$ipv4 " $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1
logger -t cloud "edithosts: released $ipv4"
fi