commit e193dfd4b1e2f8c530eaf9be6423942a68aec07e
author Eduardo Sousa <esousa@whitestack.com> Fri Sep 21 11:37:49 2018 +0100
committer Eduardo Sousa <esousa@whitestack.com> Wed Sep 26 00:35:35 2018 +0100
tree d82ca164fd0aad312cfa335ee75238ac76ea1fb7
parent 7abb18b1a22f35bf13725dde05130e3a567419ac

Adding Keystone environment variables to NBI

Adding the necessary environment variables to the
NBI MDG Dockerfile in order for the Keystone authentication
to work.

Completing the docker-compose yaml, fixing renaming typo
in keystone dockerfile and updating environment file
creation.

Change-Id: I4eb15119f4dba304494ef16fc90eea8d8c230927
Signed-off-by: Eduardo Sousa <esousa@whitestack.com>

docker/NBI/Dockerfile

diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile
index 0531f3a..d2d0c36 100644
--- a/docker/NBI/Dockerfile
+++ b/docker/NBI/Dockerfile
@@ -5,9 +5,9 @@
 RUN apt-get update && apt-get -y install curl software-properties-common
 
 RUN apt-get update && apt-get install -y git python3 python3-jsonschema \
-    python3-pymongo python3-yaml python3-pip \
+    python3-pymongo python3-yaml python3-pip python3-keystoneclient \
     && pip3 install pip==9.0.3 \
-    && pip3 install aiokafka cherrypy pyangbind \
+    && pip3 install aiokafka cherrypy==18.0.0 pyangbind keystoneauth1 \
     && mkdir -p /app/storage/kafka && mkdir -p /app/log
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
@@ -65,6 +65,16 @@
 # logs
 ENV OSMNBI_LOG_FILE        /app/log/nbi.log
 ENV OSMNBI_LOG_LEVEL       DEBUG
+# authentication
+ENV OSMNBI_AUTHENTICATION_BACKEND               internal
+#ENV OSMNBI_AUTHENTICATION_BACKEND               keystone
+#ENV OSMNBI_AUTHENTICATION_AUTH_URL              keystone
+#ENV OSMNBI_AUTHENTICATION_AUTH_PORT             5000
+#ENV OSMNBI_AUTHENTICATION_USER_DOMAIN_NAME      default
+#ENV OSMNBI_AUTHENTICATION_PROJECT_DOMAIN_NAME   default
+#ENV OSMNBI_AUTHENTICATION_SERVICE_USERNAME      nbi
+#ENV OSMNBI_AUTHENTICATION_SERVICE_PASSWORD      nbi
+#ENV OSMNBI_AUTHENTICATION_SERVICE_PROJECT       service
 
 HEALTHCHECK --interval=5s --timeout=2s --retries=12 \
   CMD curl -k https://localhost:9999/osm/ | grep Welcome || exit 1