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>

installers/docker/__nbi__.env

diff --git a/installers/docker/__nbi__.env b/installers/docker/__nbi__.env
new file mode 100644
index 0000000..34671e1
--- /dev/null
+++ b/installers/docker/__nbi__.env
@@ -0,0 +1 @@
+OSMNBI_AUTHENTICATION_SERVICE_PASSWORD=__NBI_PASSWORD__
\ No newline at end of file

installers/docker/docker-compose.yaml

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index 3917c9e..38d322d 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -75,6 +75,8 @@
     environment:
       OSMNBI_DATABASE_HOST: mongo
       OSMNBI_MESSAGE_HOST: kafka
+    env_file:
+      - ./nbi.env
     ports:
       - "${OSM_NBI_PORTS:-9999:9999}"
     #depends_on:

installers/full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 02ed427..66cb848 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -726,9 +726,13 @@
     fi
     if [ ! -f $OSM_DOCKER_WORK_DIR/keystone.env ]; then
         echo "ROOT_DB_PASSWORD=${MYSQL_ROOT_PASSWORD}" |$WORKDIR_SUDO tee $OSM_DOCKER_WORK_DIR/keystone.env
-        echo "KEYSTONE_DB_PASSWORD=${KEYSTONE_DB_PASSWORD}" |$WORKDIR_SUDO tee $OSM_DOCKER_WORK_DIR/keystone.env
-        #echo "ADMIN_PASSWORD=${ADMIN_PASSWORD}" |$WORKDIR_SUDO tee $OSM_DOCKER_WORK_DIR/keystone.env
-        echo "NBI_PASSWORD=${NBI_PASSWORD}" |$WORKDIR_SUDO tee $OSM_DOCKER_WORK_DIR/keystone.env
+        echo "KEYSTONE_DB_PASSWORD=${KEYSTONE_DB_PASSWORD}" |$WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/keystone.env
+        #echo "ADMIN_PASSWORD=${ADMIN_PASSWORD}" |$WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/keystone.env
+        echo "NBI_PASSWORD=${NBI_PASSWORD}" |$WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/keystone.env
+    fi
+
+    if [ ! -f $OSM_DOCKER_WORK_DIR/nbi.env ]; then
+        echo "OSMNBI_AUTHENTICATION_SERVICE_PASSWORD=${NBI_PASSWORD}" |$WORKDIR_SUDO tee $OSM_DOCKER_WORK_DIR/nbi.env
     fi
 
     echo "OS_NOTIFIER_URI=http://${DEFAULT_IP}:8662" |$WORKDIR_SUDO tee $OSM_DOCKER_WORK_DIR/mon.env