From: Benjamin Diaz <bdiaz@whitestack.com>
Date: Thu, 15 Nov 2018 13:31:08 +0000 (-0300)
Subject: Adds osm-mon-collector to install script of MON Dockerfile
X-Git-Tag: v5.0.0~28
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=6a2398787c49421e43f92de6598d7b4079a58795;p=osm%2Fdevops.git

Adds osm-mon-collector to install script of MON Dockerfile

Exposes port 8000 in MON Dockerfile.
Adds additional env var defaults to Dockerfile.

Signed-off-by: Benjamin Diaz <bdiaz@whitestack.com>
---

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 5b9da33e..6a42717b 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -51,7 +51,12 @@ ENV DATABASE sqlite:///mon_sqlite.db
 ENV OS_NOTIFIER_URI localhost:8662
 ENV OS_DEFAULT_GRANULARITY 300
 ENV REQUEST_TIMEOUT 10
+ENV OSMMON_LOG_LEVEL INFO
+ENV OSMMON_KAFKA_LOG_LEVEL INFO
+ENV OSMMON_VCA_HOST localhost
+ENV OSMMON_VCA_SECRET secret
+ENV OSMMON_VCA_USER admin
 
-EXPOSE 8662
+EXPOSE 8662 8000
 
 CMD /bin/bash scripts/runInstall.sh
diff --git a/docker/MON/scripts/runInstall.sh b/docker/MON/scripts/runInstall.sh
index 236aa3da..29695f02 100755
--- a/docker/MON/scripts/runInstall.sh
+++ b/docker/MON/scripts/runInstall.sh
@@ -22,5 +22,5 @@
 ##
 /bin/bash /mon/osm_mon/plugins/vRealiseOps/vROPs_Webservice/install.sh
 python3 /usr/lib/python3/dist-packages/osm_mon/plugins/OpenStack/Aodh/notifier.py &
-python3 ./usr/lib/python3/dist-packages/osm_mon/core/message_bus/common_consumer.py
-
+python3 /usr/lib/python3/dist-packages/osm_mon/core/message_bus/common_consumer.py
+osm-mon-collector