Adding Keystone to MDG Dockerfiles
Included environment files.
Admin password selection and storage needs to be discussed.
Change-Id: Ibcaa818bcc3ae6fd013507b0b114b15b70e60150
Signed-off-by: Eduardo Sousa <esousa@whitestack.com>
diff --git a/installers/docker/__keystone-db__.env b/installers/docker/__keystone-db__.env
new file mode 100644
index 0000000..ac2a8d8
--- /dev/null
+++ b/installers/docker/__keystone-db__.env
@@ -0,0 +1 @@
+MYSQL_ROOT_PASSWORD=__MYSQL_ROOT_PASSWORD__
diff --git a/installers/docker/__keystone__.env b/installers/docker/__keystone__.env
new file mode 100644
index 0000000..0b937e4
--- /dev/null
+++ b/installers/docker/__keystone__.env
@@ -0,0 +1,4 @@
+ROOT_DB_PASSWORD=__MYSQL_ROOT_PASSWORD__
+KEYSTONE_DB_PASSWORD=__KEYSTONE_DB_PASSWORD__
+#ADMIN_PASSWORD=__ADMIN_PASSWORD__
+NBI_PASSWORD=__NBI_PASSWORD__
diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index c09de86..3917c9e 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -4,6 +4,7 @@
mongo_db:
mon_db:
osm_packages:
+ keystone_db:
networks:
netOSM:
external:
@@ -45,6 +46,26 @@
- netOSM
volumes:
- mongo_db:/data/db
+ keystone-db:
+ image: mariadb:10
+ networks:
+ - netOSM
+ volumes:
+ - keystone_db:/var/lib/mysql
+ env_file:
+ - ./keystone-db.env
+# ports:
+# - "3306:3306"
+ keystone:
+ image: osm/keystone:${TAG:-latest}
+ networks:
+ - netOSM
+ environment:
+ DB_HOST: keystone-db
+ env_file:
+ - ./keystone.env
+ ports:
+ - "${OSM_KEYSTONE_PORTS:-5000:5000}"
nbi:
image: osm/nbi:${TAG:-latest}
networks:
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index f96bfae..02ed427 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -165,6 +165,7 @@
docker image rm osm/ro
docker image rm osm/lcm
docker image rm osm/light-ui
+ docker image rm osm/keystone
docker image rm osm/nbi
docker image rm osm/mon
docker image rm osm/pm
@@ -715,6 +716,21 @@
if [ ! -f $OSM_DOCKER_WORK_DIR/ro.env ]; then
echo "RO_DB_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" |$WORKDIR_SUDO tee $OSM_DOCKER_WORK_DIR/ro.env
fi
+
+ MYSQL_ROOT_PASSWORD=`date +%s | sha256sum | base64 | head -c 32` && sleep 1
+ KEYSTONE_DB_PASSWORD=`date +%s | sha256sum | base64 | head -c 32` && sleep 1
+ #ADMIN_PASSWORD=`date +%s | sha256sum | base64 | head -c 32` && sleep 1
+ NBI_PASSWORD=`date +%s | sha256sum | base64 | head -c 32`
+ if [ ! -f $OSM_DOCKER_WORK_DIR/keystone-db.env ]; then
+ echo "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" |$WORKDIR_SUDO tee $OSM_DOCKER_WORK_DIR/keystone-db.env
+ 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
+ fi
+
echo "OS_NOTIFIER_URI=http://${DEFAULT_IP}:8662" |$WORKDIR_SUDO tee $OSM_DOCKER_WORK_DIR/mon.env
echo "Finished generation of docker env files"
@@ -747,15 +763,18 @@
echo "Deploying lightweight build"
OSM_NBI_PORT=9999
OSM_RO_PORT=9090
+ OSM_KEYSTONE_PORT=5000
OSM_UI_PORT=80
if [ -n "$NO_HOST_PORTS" ]; then
OSM_PORTS+=(OSM_NBI_PORTS=$OSM_NBI_PORT)
OSM_PORTS+=(OSM_RO_PORTS=$OSM_RO_PORT)
+ OSM_PORTS+=(OSM_KEYSTONE_PORTS=$OSM_KEYSTONE_PORT)
OSM_PORTS+=(OSM_UI_PORTS=$OSM_UI_PORT)
else
OSM_PORTS+=(OSM_NBI_PORTS=$OSM_NBI_PORT:$OSM_NBI_PORT)
OSM_PORTS+=(OSM_RO_PORTS=$OSM_RO_PORT:$OSM_RO_PORT)
+ OSM_PORTS+=(OSM_KEYSTONE_PORTS=$OSM_KEYSTONE_PORT:$OSM_KEYSTONE_PORT)
OSM_PORTS+=(OSM_UI_PORTS=$OSM_UI_PORT:$OSM_UI_PORT)
fi
echo "export ${OSM_PORTS[@]}" | $WORKDIR_SUDO tee $OSM_DOCKER_WORK_DIR/osm_ports.sh