X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=monitor%2Fmonitoring.sh;h=8ad388a317e6075a394a2931a91d31633be13b7c;hb=HEAD;hp=26b63fc591422717d287047ee828b42397319b76;hpb=c4e5626d4ecf05a1b72b4bd0ab8f5c83245b0305;p=bottlenecks.git

diff --git a/monitor/monitoring.sh b/monitor/monitoring.sh
index 26b63fc5..5442d331 100644
--- a/monitor/monitoring.sh
+++ b/monitor/monitoring.sh
@@ -52,7 +52,7 @@ while [[ $# > 0 ]]
             INSTALLER_TYPE="$2"
             shift
         ;;
-        -i|--openstack-env)
+        -o|--openstack-env)
             OPENSTACK_ENV="$2"
             shift
         ;;
@@ -104,7 +104,6 @@ sudo docker run --name bottlenecks-node-exporter \
   -v "/proc:/host/proc:ro" \
   -v "/sys:/host/sys:ro" \
   -v "/:/rootfs:ro" \
-  --net="host" \
   quay.io/prometheus/node-exporter:v0.14.0 \
     -collector.procfs /host/proc \
     -collector.sysfs /host/sys \
@@ -150,14 +149,13 @@ python ${DISPATCH}/server_ip_configure.py ${MONITOR_CONFIG}/barometer_server.con
 set +e
 # Install on jumpserver
 docker pull opnfv/barometer
-sudo docker run  --name bottlenecks-barometer -d --net=host \
+sudo docker run  --name bottlenecks-barometer -d \
   -v ${MONITOR_CONFIG}/barometer_server.conf:/src/barometer/src/collectd/collectd/src/collectd.conf \
   -v ${MONITOR_CONFIG}/barometer_server.conf:/opt/collectd/etc/collectd.conf \
   -v /var/run:/var/run \
   -v /tmp:/tmp \
   --privileged opnfv/barometer /run_collectd.sh
 
-set -e
 # INSTALL BAROMETER + CADVISOR (+ COLLECTD) CLIENTS on COMPUTE/CONTROL NODES
 # Configure IP Address in barometer client configuration
 python ${DISPATCH}/client_ip_configure.py ${MONITOR_CONFIG}/barometer_client.conf