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/Keystone/Dockerfile

diff --git a/docker/Keystone/Dockerfile b/docker/Keystone/Dockerfile
index 571e887..9163562 100644
--- a/docker/Keystone/Dockerfile
+++ b/docker/Keystone/Dockerfile
@@ -42,4 +42,4 @@
 # NBI password
 ENV NBI_PASSWORD            nbi
 
-ENTRYPOINT ./install.sh
\ No newline at end of file
+ENTRYPOINT ./start.sh
\ No newline at end of file

docker/Keystone/scripts/start.sh

diff --git a/docker/Keystone/scripts/start.sh b/docker/Keystone/scripts/start.sh
index 1530387..4d95c60 100755
--- a/docker/Keystone/scripts/start.sh
+++ b/docker/Keystone/scripts/start.sh
@@ -37,8 +37,6 @@
     fi
 }
 
-KEYSTONE_IP=`ifconfig eth0 | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*'`
-
 wait_db "$DB_HOST" "$DB_PORT" || exit 1
 
 is_db_created "$DB_HOST" "$DB_PORT" "$ROOT_DB_USER" "$ROOT_DB_PASSWORD" "keystone" && DB_EXISTS="Y"
@@ -67,19 +65,32 @@
 # Bootstrap Keystone service
 if [ -z $DB_EXISTS ]; then
     keystone-manage bootstrap --bootstrap-password "$ADMIN_PASSWORD" \
-        --bootstrap-admin-url http://"$KEYSTONE_IP":5000/v3/ \
-        --bootstrap-internal-url http://"$KEYSTONE_IP":5000/v3/ \
-        --bootstrap-public-url http://"$KEYSTONE_IP":5000/v3/ \
+        --bootstrap-admin-url http://keystone:5000/v3/ \
+        --bootstrap-internal-url http://keystone:5000/v3/ \
+        --bootstrap-public-url http://keystone:5000/v3/ \
         --bootstrap-region-id RegionOne
 fi
 
 # Restart Apache Service
 service apache2 restart
 
+cat << EOF >> setup_env
+export OS_PROJECT_DOMAIN_NAME=default
+export OS_USER_DOMAIN_NAME=default
+export OS_PROJECT_NAME=admin
+export OS_USERNAME=admin
+export OS_PASSWORD=$ADMIN_PASSWORD
+export OS_AUTH_URL=http://keystone:5000/v3
+export OS_IDENTITY_API_VERSION=3
+export OS_IMAGE_API_VERSION=2
+EOF
+
+source setup_env
+
 # Create NBI User
 if [ -z $DB_EXISTS ]; then
     openstack user create --domain default --password "$NBI_PASSWORD" nbi
-    openstack project create --domain defaul --description "Service Project" service
+    openstack project create --domain default --description "Service Project" service
     openstack role add --project service --user nbi admin
 fi