X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FKeystone%2FDockerfile;h=861dfd60f94e3295344b97cca6aa2386e19b4911;hb=3c76174bd19e68861cd049898a89e651de95c66f;hp=571e88739bad6fc54432b6c1c2c7d68e2d6d915b;hpb=a77bf2a824b444c0351d6afec594abf5502b4336;p=osm%2Fdevops.git

diff --git a/docker/Keystone/Dockerfile b/docker/Keystone/Dockerfile
index 571e8873..861dfd60 100644
--- a/docker/Keystone/Dockerfile
+++ b/docker/Keystone/Dockerfile
@@ -1,3 +1,21 @@
+# Copyright 2018 Whitestack, LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact: esousa@whitestack.com or glavado@whitestack.com
+##
+
 FROM ubuntu:16.04
 
 LABEL Maintainer="esousa@whitestack.com" \
@@ -15,31 +33,28 @@ RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get autoremove -y && \
     apt-get install -y software-properties-common && \
-    add-apt-repository -y cloud-archive:queens && \
+    add-apt-repository -y cloud-archive:pike && \
     apt-get update && apt dist-upgrade -y && \
     apt-get install -y python-openstackclient keystone apache2 libapache2-mod-wsgi net-tools mysql-client && \
     rm -rf /var/lib/apt/lists/* && \
     chmod +x start.sh
 
-# DB Hostname
+# database
 ENV DB_HOST                 keystone-db
-
-# DB Port
 ENV DB_PORT                 3306
-
-# DB Root User
 ENV ROOT_DB_USER            root
-
-# DB Root Password
 ENV ROOT_DB_PASSWORD        admin
-
-# Keystone user password
 ENV KEYSTONE_DB_PASSWORD    admin
-
-# Admin password
+# keystone
+ENV REGION_ID               RegionOne
+ENV KEYSTONE_HOST           keystone
+# admin user
+ENV ADMIN_USERNAME          admin
 ENV ADMIN_PASSWORD          admin
+ENV ADMIN_PROJECT           admin
+# nbi service user
+ENV SERVICE_USERNAME        nbi
+ENV SERVICE_PASSWORD        nbi
+ENV SERVICE_PROJECT         service
 
-# NBI password
-ENV NBI_PASSWORD            nbi
-
-ENTRYPOINT ./install.sh
\ No newline at end of file
+ENTRYPOINT ./start.sh