From 433a79f989a51f88713b130cd51182373139577e Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 2 Dec 2015 13:45:18 +0530 Subject: [PATCH 1/2] debian: allow rules to pick ACS_BUILD_OPTS from env Only now debian builds can be noredist etc. Signed-off-by: Rohit Yadav --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index c6144320d00..05f9f34fcf1 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ override_dh_auto_configure: override_dh_auto_build: mvn -T C1.5 clean package -Psystemvm -DskipTests -Dsystemvm \ -Dcs.replace.properties=replace.properties.tmp \ - -Dmaven.repo.local=$(HOME)/.m2/repository + -Dmaven.repo.local=$(HOME)/.m2/repository \ ${ACS_BUILD_OPTS} override_dh_auto_clean: From 90e01c95a2db3d9b7c6586b2b228e0a9c5b9e415 Mon Sep 17 00:00:00 2001 From: Remi Bergsma Date: Thu, 3 Dec 2015 18:15:31 +0100 Subject: [PATCH 2/2] CLOUDSTACK-9097 Make public ip work immediately We need to send an Unsolicited ARP to the gateway, instead of our own address. We now encounter problems when people deploy/destroy/deploy and get the same public ip. --- systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py index 8defefc6778..e1c01eb4e1a 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py @@ -588,7 +588,7 @@ class CsIP: def arpPing(self): cmd = "arping -c 1 -I %s -A -U -s %s %s" % ( - self.dev, self.address['public_ip'], self.address['public_ip']) + self.dev, self.address['public_ip'], self.address['gateway']) CsHelper.execute(cmd) # Delete any ips that are configured but not in the bag