Fix bug 1753: update keystone dockerfile to ubuntu 20.04

[osm/devops.git] / installers / full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 1202e33..c6f5979 100755 (executable)
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -657,7 +657,11 @@ function install_osm() {
 
     track prereqok
 
-    [ -n "$INSTALL_NODOCKER" ] || $OSM_DEVOPS/installers/install_docker_ce.sh -p $DOCKER_PROXY_URL -D $OSM_DEVOPS $DEBUG_INSTALL
+    if [ ! -n "$INSTALL_NODOCKER" ]; then
+        DOCKER_CE_OPTS="-D ${OSM_DEVOPS} ${DEBUG_INSTALL}"
+        [ -n "${DOCKER_PROXY_URL}" ] && DOCKER_CE_OPTS="${DOCKER_CE_OPTS} -p ${DOCKER_PROXY_URL}"
+        $OSM_DEVOPS/installers/install_docker_ce.sh ${DOCKER_CE_OPTS}
+    fi
 
     track docker_ce
 
@@ -1169,7 +1173,7 @@ OSM_K8S_WORK_DIR="$OSM_DOCKER_WORK_DIR/osm_pods" && OSM_NAMESPACE_VOL="${OSM_HOS
 
 #Installation starts here
 wget -q -O- https://osm-download.etsi.org/ftp/osm-11.0-eleven/README.txt &> /dev/null
-OSM_INSTALLATION_ID="$(date +%s)-$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16)"
+OSM_TRACK_INSTALLATION_ID="$(date +%s)-$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16)"
 
 track start release $RELEASE none none docker_tag $OSM_DOCKER_TAG none none