Merge release branch 4.6 to master

remibergsma · remibergsma · commit 58ba44a1c04d · 2015-12-04T11:05:23.000+01:00
* 4.6:
  CLOUDSTACK-9097 Make public ip work immediately
  debian: allow rules to pick ACS_BUILD_OPTS from env
diff --git 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:
diff --git 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 @@ def hasIP(self, ip):
 
     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
