summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordon Kelly <gordon.kelly@intel.com>2018-01-19 16:13:45 +0000
committerMaryam Tahhan <maryam.tahhan@intel.com>2018-01-23 11:50:02 +0000
commit2f5bdd402affef56c340a9ece577036d8183e8fe (patch)
treeae561e5b48c79c9a5f015df814e4dbc23ec7343a
parent04c4011bf6dab58da8365eca9388e6cacbdf8734 (diff)
docker: update ves image to load yaml and config files
Update ves image to load yaml and config files from /opt/ves/ directory and rename host yaml file. Change-Id: I3caf51150d10db08b8ef1c20a53c320b27a6acb8 Signed-off-by: gordonkelly <gordon.kelly@intel.com>
-rw-r--r--3rd_party/collectd-ves-app/ves_app/yaml/host.yaml (renamed from 3rd_party/collectd-ves-app/ves_app/yaml/native.yaml)0
-rw-r--r--docker/barometer-ves/Dockerfile18
-rw-r--r--docker/barometer-ves/start_ves_app.sh11
3 files changed, 19 insertions, 10 deletions
diff --git a/3rd_party/collectd-ves-app/ves_app/yaml/native.yaml b/3rd_party/collectd-ves-app/ves_app/yaml/host.yaml
index 8a351547..8a351547 100644
--- a/3rd_party/collectd-ves-app/ves_app/yaml/native.yaml
+++ b/3rd_party/collectd-ves-app/ves_app/yaml/host.yaml
diff --git a/docker/barometer-ves/Dockerfile b/docker/barometer-ves/Dockerfile
index 869a587f..e36ef848 100644
--- a/docker/barometer-ves/Dockerfile
+++ b/docker/barometer-ves/Dockerfile
@@ -22,14 +22,18 @@ RUN yum install -y python-pip
RUN pip install pyyaml \
kafka-python
-ENV repos_dir /src
-ENV ves_dir barometer/3rd_party/collectd-ves-app/ves_app
-WORKDIR ${repos_dir}
+ENV VES_DIR /opt/ves
+ENV REPOS_DIR /src
+
+RUN mkdir -p ${VES_DIR}/yaml
+RUN mkdir -p ${VES_DIR}/config
+WORKDIR ${REPOS_DIR}
RUN git clone https://gerrit.opnfv.org/gerrit/barometer
-WORKDIR ${ves_dir}
-COPY start_ves_app.sh ${ves_dir}/start_ves_app.sh
-RUN chmod +x ${ves_dir}/start_ves_app.sh
+COPY ./start_ves_app.sh ${VES_DIR}/
+RUN cp -rf barometer/3rd_party/collectd-ves-app/ves_app/* ${VES_DIR}
+WORKDIR ${VES_DIR}
+RUN chmod 755 ${VES_DIR}/start_ves_app.sh
-ENTRYPOINT ["./barometer/3rd_party/collectd-ves-app/ves_app/start_ves_app.sh"]
+ENTRYPOINT ["./start_ves_app.sh"]
CMD ["host.yaml"]
diff --git a/docker/barometer-ves/start_ves_app.sh b/docker/barometer-ves/start_ves_app.sh
index d61078db..f859bc45 100644
--- a/docker/barometer-ves/start_ves_app.sh
+++ b/docker/barometer-ves/start_ves_app.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2018 OPNFV and Intel Corporation
+#Copyright 2018 OPNFV and Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +16,12 @@
YAML_FILE="$1"
+if [ -z "${ves_kafka_host}" ]
+then
+ ves_kafka_host=localhost
+fi
+
#wait for kafka service to be available
-while ! nc localhost 9092 < /dev/null; do sleep 1; done
+while ! nc $ves_kafka_host 9092 < /dev/null; do sleep 1; done
-python ves_app.py --events-schema="$YAML_FILE" --config=ves_app_config.conf
+python ves_app.py --events-schema="./yaml/$YAML_FILE" --config="./config/ves_app_config.conf"