cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/3] git commit: updated refs/heads/4.7 to 0b5aa78
Date Wed, 20 Jan 2016 10:18:34 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.7 368bfc3e1 -> 0b5aa7871


CLOUDSTACK-9244 Fix setting up RFC1918 routes


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d6015700
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d6015700
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d6015700

Branch: refs/heads/4.7
Commit: d6015700532c7c4676f4d402611fa4738cd4045d
Parents: c7ad1b6
Author: Remi Bergsma <github@remi.nl>
Authored: Tue Jan 19 18:24:49 2016 +0100
Committer: Remi Bergsma <github@remi.nl>
Committed: Tue Jan 19 18:29:31 2016 +0100

----------------------------------------------------------------------
 systemvm/patches/debian/config/etc/init.d/cloud-early-config | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6015700/systemvm/patches/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index 07963d0..59e73a2 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -1166,6 +1166,9 @@ setup_storage_network() {
 }
 
 setup_system_rfc1918_internal() {
+  public_ip=$ETH2_IP
+  [ "$ETH2_IP" == "0.0.0.0" ] && public_ip=$ETH1_IP
+
   echo "$public_ip" | grep -E "^((127\.)|(10\.)|(172\.1[6-9]\.)|(172\.2[0-9]\.)|(172\.3[0-1]\.)|(192\.168\.))"
   if [ "$?" == "0" ]; then
      log_it "Not setting up route of RFC1918 space to $LOCAL_GW befause $public_ip is RFC1918."


Mime
View raw message