Bugfix:proxy env, ansible multinode support

[yardstick.git] / nsb_setup.sh

diff --git a/nsb_setup.sh b/nsb_setup.sh
index 40293fe..a983f4d 100755 (executable)
--- a/nsb_setup.sh
+++ b/nsb_setup.sh
@@ -13,37 +13,48 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apt-get update > /dev/null 2>&1
-pkg=(python-pip build-essential libssl-dev libffi-dev python3-dev python-dev)
-for i in "${pkg[@]}"; do
-    dpkg-query -W --showformat='${Status}\n' "${i}"|grep "install ok installed"
-    if [  "$?" -eq "1" ]; then
-        apt-get -y install "${i}";
-    fi
-done
-
-pip install ansible==2.3.2 shade==1.17.0 docker-py==1.10.6
-
+# OPENRC handling has to be first due no_proxy
 if [ $# -eq 1 ]; then
     OPENRC=$(readlink -f -- "$1")
-    extra_args="-e openrc_file=${OPENRC}"
+    extra_args="${extra_args} -e openrc_file=${OPENRC}"
     source "${OPENRC}"
     CONTROLLER_IP=$(echo ${OS_AUTH_URL} | sed -ne "s#http://\([0-9a-zA-Z.\-]*\):*[0-9]*/.*#\1#p")
-    export no_proxy="localhost,127.0.0.1,${CONTROLLER_IP},$no_proxy"
 fi
 
-if [ "$http_proxy" != "" ] || [ "$https_proxy" != "" ]; then
-    extra_args="${extra_args} -e @/tmp/proxy.yml"
+env_http_proxy=$(sed -ne "s/^http_proxy=[\"\']\(.*\)[\"\']/\1/p" /etc/environment)
+if [[ -z ${http_proxy} ]] && [[ ! -z ${env_http_proxy} ]]; then
+    export http_proxy=${env_http_proxy}
+fi
+env_https_proxy=$(sed -ne "s/^https_proxy=[\"\']\(.*\)[\"\']/\1/p" /etc/environment)
+if [[ -z ${https_proxy} ]] && [[ ! -z ${env_https_proxy} ]]; then
+    export https_proxy=${env_https_proxy}
+fi
+
+# if http[s]_proxy is set (from env or /etc/environment) prepare proxy for ansible
+if [[ ! -z ${http_proxy} ]] || [[ ! -z ${https_proxy} ]]; then
+    export no_proxy="localhost,127.0.0.1,${CONTROLLER_IP},${no_proxy}"
+    extra_args="${extra_args} -e @/tmp/proxy.yml "
 
     cat <<EOF > /tmp/proxy.yml
 ---
 proxy_env:
-  http_proxy: $http_proxy
-  https_proxy: $https_proxy
-  no_proxy: $no_proxy
+  http_proxy: ${http_proxy}
+  https_proxy: ${https_proxy}
+  no_proxy: ${no_proxy}
 EOF
 fi
 
+apt-get update > /dev/null 2>&1
+pkg=(python-pip build-essential libssl-dev libffi-dev python3-dev python-dev)
+for i in "${pkg[@]}"; do
+    dpkg-query -W --showformat='${Status}\n' "${i}"|grep "install ok installed"
+    if [  "$?" -eq "1" ]; then
+        apt-get -y install "${i}";
+    fi
+done
+
+pip install ansible==2.3.2 shade==1.17.0 docker-py==1.10.6
+
 ANSIBLE_SCRIPTS="ansible"
 
 cd ${ANSIBLE_SCRIPTS} &&\