From a8359af0ca39da09493c62cca9325b087b23a185 Mon Sep 17 00:00:00 2001
From: Guo Ruijing <ruijing.guo@intel.com>
Date: Tue, 31 May 2016 15:41:38 +0800
Subject: [PATCH] Add parameters to setup network

Change-Id: I3a5f52f9df396e70456e511509dfdd27e25a8bc7
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
---
 demo/01_setup_network.sh | 38 ++++++++++++++++++++++++++++++++------
 demo/README.md           |  2 +-
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/demo/01_setup_network.sh b/demo/01_setup_network.sh
index 694eca2..fefac8f 100755
--- a/demo/01_setup_network.sh
+++ b/demo/01_setup_network.sh
@@ -1,8 +1,34 @@
 #!/bin/sh
-HTTP_PROXY=http://10.19.8.225:911
-DNS_SERVER=10.248.2.1
-SOCK5_IP=10.7.211.16
-SOCK5_PORT=1080
+
+HTTP_PROXY=${HTTP_PROXY:-http://10.19.8.225:911}
+DNS_SERVER=${DNS_SERVER:-10.248.2.1}
+SOCKS5_IP=${SOCKS5_IP:-10.7.211.16}
+SOCKS5_PORT=${SOCKS5:-1080}
+
+for i in "$@"
+do
+case $i in
+    -h=*|--http=*)
+    HTTP_PROXY="${i#*=}"
+    shift
+    ;;
+    -d=*|--dns=*)
+    DNS_SERVER="${i#*=}"
+    shift
+    ;;
+    -s=*|--socks5-ip=*)
+    SOCKS5_IP="${i#*=}"
+    shift
+    ;;
+    -p=*|--socks5-port=*)
+    SOCKS5_PORT="${i#*=}"
+    shift
+    ;;
+    *)
+    # unknown option
+    ;;
+esac
+done
 
 cat <<EOF | sudo tee /etc/apt/apt.conf
 Acquire::http::Proxy "$HTTP_PROXY";
@@ -23,8 +49,8 @@ base {
 redsocks {
  local_ip = 0.0.0.0;
  local_port = 6666;
- ip = $SOCK5_IP;
- port = $SOCK5_PORT;
+ ip = $SOCKS5_IP;
+ port = $SOCKS5_PORT;
  type = socks5;
 }
 
diff --git a/demo/README.md b/demo/README.md
index 6d41cd1..a19525e 100644
--- a/demo/README.md
+++ b/demo/README.md
@@ -31,7 +31,7 @@ d. SOCK5_PORT: socks5 proxy for fuel VM
 
 In fresh installation, 01_setup_network.sh can be run by:
 
-curl --socks5 <socks5 proxy> https://raw.githubusercontent.com/openstack/fuel-plugin-ovs/master/demo/01_setup_network.sh | bash
+curl --socks5 <socks5-proxy> https://raw.githubusercontent.com/openstack/fuel-plugin-ovs/master/demo/01_setup_network.sh | bash -s -- -h=<http-proxy>-d=<dns-server> -s=<socks5-ip> -p=<socks5-port>
 
 2. 02_install_packages.sh