[2/6] git commit: updated refs/heads/4.5 to a592b01

[da...@apache.org]

renamed $leftgw to $leftnexthop to make clear what it does

(cherry picked from commit 8b2563a216b012ab1905e65f446c8b6b1435b983)


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

Branch: refs/heads/4.5
Commit: 08ab9a37690e059768622de8b90967d9e0a0afdf
Parents: bf7cd8a
Author: Remi Bergsma <rb...@schubergphilis.com>
Authored: Mon Dec 8 18:54:27 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Dec 9 11:18:59 2014 +0100

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08ab9a37/systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh b/systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh
index 9aa3f89..cfee6d1 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh
@@ -23,7 +23,7 @@ vpnoutmark="0x525"
 vpninmark="0x524"
 
 usage() {
-    printf "Usage: %s: (-A|-D) -l <left-side vpn peer> -n <left-side guest cidr> -g <left-side gateway> -r <right-side vpn peer> -N <right-side private subnets> -e <esp policy> -i <ike policy> -t <ike lifetime> -T <esp lifetime> -s <pre-shared secret> -d <dpd 0 or 1> [ -p <passive or not> ]\n" $(basename $0) >&2
+    printf "Usage: %s: (-A|-D) -l <left-side vpn peer> -n <left-side guest cidr> -g <left-side next hop> -r <right-side vpn peer> -N <right-side private subnets> -e <esp policy> -i <ike policy> -t <ike lifetime> -T <esp lifetime> -s <pre-shared secret> -d <dpd 0 or 1> [ -p <passive or not> ]\n" $(basename $0) >&2
 }
 
 #set -x
@@ -129,7 +129,7 @@ ipsec_tunnel_add() {
   local vpnsecretsfile=$vpnconfdir/ipsec.vpn-$rightpeer.secrets
 
   logger -t cloud "$(basename $0): creating configuration for ipsec tunnel: left peer=$leftpeer \
-    left net=$leftnet left gateway=$leftgw right peer=$rightpeer right network=$rightnets phase1 policy=$ikepolicy \
+    left net=$leftnet left gateway=$leftnexthop right peer=$rightpeer right network=$rightnets phase1 policy=$ikepolicy \
     phase2 policy=$esppolicy secret=$secret"
 
   [ "$op" == "-A" ] && ipsec_tunnel_del
@@ -139,7 +139,7 @@ ipsec_tunnel_add() {
     sudo echo "conn vpn-$rightpeer" > $vpnconffile &&
     sudo echo "  left=$leftpeer" >> $vpnconffile &&
     sudo echo "  leftsubnet=$leftnet" >> $vpnconffile &&
-    sudo echo "  leftnexthop=$leftgw" >> $vpnconffile &&
+    sudo echo "  leftnexthop=$leftnexthop" >> $vpnconffile &&
     sudo echo "  right=$rightpeer" >> $vpnconffile &&
     sudo echo "  rightsubnets={$rightnets}" >> $vpnconffile &&
     sudo echo "  type=tunnel" >> $vpnconffile &&
@@ -226,7 +226,7 @@ do
         leftnet="$OPTARG"
         ;;
   g)    gflag=1
-        leftgw="$OPTARG"
+        leftnexthop="$OPTARG"
         ;;
   r)    rflag=1
         rightpeer="$OPTARG"