Merge "Add console logging output"

6 files changed, 21 insertions, 36 deletions

diff --git a/ocata/docker/Dockerfile b/ocata/docker/Dockerfile
index 422ba88c..cca1cf89 100644
--- a/ocata/docker/Dockerfile
+++ b/ocata/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:2
+FROM python:2.7
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
@@ -17,16 +17,13 @@ ENV AAI_PASSWORD "AAI"
 
 EXPOSE 9006
 
-# COPY ./ /opt/ocata/
-RUN apt-get update && \
-    apt-get install -y memcached && \
-    apt-get install -y unzip && \
-    cd /opt/ && \
-    wget -O multicloud-openstack-ocata.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-ocata&e=zip&v=LATEST" && \
-    unzip -q -o -B multicloud-openstack-ocata.zip && \
-    chmod +x /opt/ocata/*.sh && \
-    rm -f multicloud-openstack-ocata.zip && \
-    pip install -r /opt/ocata/requirements.txt
-
 WORKDIR /opt/ocata
-CMD /bin/sh -c /opt/ocata/run.sh
+RUN apt-get update && apt-get install -y memcached unzip
+RUN wget -O /opt/multicloud-openstack-ocata.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-ocata&e=zip&v=LATEST" && \
+    unzip -q -o -B /opt/multicloud-openstack-ocata.zip -d /opt/ && \
+    rm -f /opt/multicloud-openstack-ocata.zip
+RUN mkdir -p /var/log/onap/multicloud/openstack/ocata/
+#COPY ./ .
+RUN pip install -r requirements.txt
+
+CMD "/opt/ocata/run.sh"
diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh
index c85989d0..8e55f89f 100644
--- a/ocata/docker/build_image.sh
+++ b/ocata/docker/build_image.sh
@@ -5,13 +5,9 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
 cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
-ORG="onap"
 VERSION="1.1.2-SNAPSHOT"
 STAGING="1.1.2-STAGING"
-PROJECT="multicloud"
-IMAGE="openstack-ocata"
-DOCKER_REPOSITORY="nexus3.onap.org:10003"
-IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
+IMAGE_NAME="${DOCKER_REPOSITORY:-"nexus3.onap.org:10003"}/${ORG:-"onap"}/${PROJECT:-"multicloud"}/${IMAGE:-"openstack-ocata"}"
 
 if [ $HTTP_PROXY ]; then
     BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
@@ -31,4 +27,4 @@ function push_image {
 }
 
 build_image
-push_image
\ No newline at end of file
+push_image
diff --git a/ocata/initialize.sh b/ocata/initialize.sh
index 1d64bfca..1d64bfca 100644..100755
--- a/ocata/initialize.sh
+++ b/ocata/initialize.sh
diff --git a/ocata/ocata/pub/config/log.yml b/ocata/ocata/pub/config/log.yml
index bb6321fa..815b1753 100644
--- a/ocata/ocata/pub/config/log.yml
+++ b/ocata/ocata/pub/config/log.yml
@@ -3,19 +3,23 @@ disable_existing_loggers: False
 
 loggers:
     ocata:
-      handlers: [ocata_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
     newton_base:
-      handlers': [ocata_handler]
+      handlers': [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
     common:
-      handlers: [ocata_handler]
+      handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
 handlers:
-    ocata_handler:
+    console_handler:
+        level: "DEBUG"
+        class: "logging.StreamHandler"
+        formatter: "mdcFormat"
+    file_handler:
         level: "DEBUG"
         class: "logging.handlers.RotatingFileHandler"
         filename: "/var/log/onap/multicloud/openstack/ocata/ocata.log"
diff --git a/ocata/run.sh b/ocata/run.sh
index c0293f67..70af4df9 100644..100755
--- a/ocata/run.sh
+++ b/ocata/run.sh
@@ -15,16 +15,4 @@
 
 memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid
 export PYTHONPATH=lib/share
-#nohup python manage.py runserver 0.0.0.0:9006 2>&1 &
-nohup uwsgi --http :9006 --module ocata.wsgi --master --processes 4 &
-
-logDir="/var/log/onap/multicloud/openstack/ocata"
-if [ ! -x  $logDir  ]; then
-       mkdir -p $logDir
-fi
-while [ ! -f $logDir/ocata.log ]; do
-    sleep 1
-done
-
-tail -F $logDir/ocata.log
-
+uwsgi --http :9006 --module ocata.wsgi --master --processes 4
diff --git a/ocata/stop.sh b/ocata/stop.sh
index 1402a97c..1402a97c 100644..100755
--- a/ocata/stop.sh
+++ b/ocata/stop.sh