X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=0eb184c78db4d52ecb6ff95dc8eef9bcc028e619;hb=refs%2Fchanges%2F26%2F10726%2F4;hp=42c2ed564430919424613b1c57dd098bdae80312;hpb=cda4fbcc6ca2002b85303df528c711c7ca174c3b;p=osm%2Fdevops.git

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 42c2ed56..0eb184c7 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -29,7 +29,6 @@ function usage(){
     echo -e "                     -b tags/v1.1.0     (a specific tag)"
     echo -e "                     ..."
     echo -e "     -c <orchestrator> deploy osm services using container <orchestrator>. Valid values are <k8s> or <swarm>.  If -c is not used then osm will be deployed using default orchestrator. When used with --uninstall, osm services deployed by the orchestrator will be uninstalled"
-    echo -e "     -n <ui> install OSM with Next Gen UI. Valid values are <lwui> or <ngui>. If -n is not specified osm will be installed with light-ui. When used with uninstall, osm along with the UI specified will be uninstalled"
     echo -e "     -s <stack name> or <namespace>  user defined stack name when installed using swarm or namespace when installed using k8s, default is osm"
     echo -e "     -H <VCA host>   use specific juju host controller IP"
     echo -e "     -S <VCA secret> use VCA/juju secret key"
@@ -39,7 +38,7 @@ function usage(){
     echo -e "     --vimemu:       additionally deploy the VIM emulator as a docker container"
     echo -e "     --elk_stack:    additionally deploy an ELK docker stack for event logging"
     echo -e "     --pla:          install the PLA module for placement support"
-    echo -e "     -m <MODULE>:    install OSM but only rebuild or pull the specified docker images (LW-UI, NG-UI, NBI, LCM, RO, MON, POL, PLA, KAFKA, MONGO, PROMETHEUS, PROMETHEUS-CADVISOR, KEYSTONE-DB, NONE)"
+    echo -e "     -m <MODULE>:    install OSM but only rebuild or pull the specified docker images (NG-UI, NBI, LCM, RO, MON, POL, PLA, KAFKA, MONGO, PROMETHEUS, PROMETHEUS-CADVISOR, KEYSTONE-DB, NONE)"
     echo -e "     -o <ADDON>:     ONLY (un)installs one of the addons (vimemu, elk_stack, k8s_monitor)"
     echo -e "     -O <openrc file path/cloud name>: Install OSM to an OpenStack infrastructure. <openrc file/cloud name> is required. If a <cloud name> is used, the clouds.yaml file should be under ~/.config/openstack/ or /etc/openstack/"
     echo -e "     -N <openstack public network name/ID>: Public network name required to setup OSM to OpenStack"
@@ -229,11 +228,7 @@ for module in ro lcm keystone nbi mon pol pla osmclient; do
 done
 EONG
 
-        if [ -n "$NGUI" ]; then
-            sg docker -c "docker image rm ${DOCKER_REGISTRY_URL}${DOCKER_USER}/ng-ui:${OSM_DOCKER_TAG}"
-        else
-            sg docker -c "docker image rm ${DOCKER_REGISTRY_URL}${DOCKER_USER}/light-ui:${OSM_DOCKER_TAG}"
-        fi
+        sg docker -c "docker image rm ${DOCKER_REGISTRY_URL}${DOCKER_USER}/ng-ui:${OSM_DOCKER_TAG}"
 
         if [ -n "$KUBERNETES" ]; then
             OSM_NAMESPACE_VOL="${OSM_HOST_VOL}/${OSM_STACK_NAME}"
@@ -536,6 +531,17 @@ function docker_login() {
 }
 
 function generate_docker_images() {
+    cat << EOF
+========================================================================================
+
+
+
+
+
+========================================================================================
+EOF
+    set -x
+    sleep 5
     echo "Pulling and generating docker images"
     [ -n "${DOCKER_REGISTRY_URL}" ] && docker_login
 
@@ -572,18 +578,8 @@ function generate_docker_images() {
 
     if [ -n "$PULL_IMAGES" ]; then
         echo "Pulling OSM docker images"
-        for module in MON POL NBI KEYSTONE RO LCM NG-UI LW-UI PLA osmclient; do
+        for module in MON POL NBI KEYSTONE RO LCM NG-UI PLA osmclient; do
             module_lower=${module,,}
-            if [ $module == "LW-UI" ]; then
-                if [ -n "$NGUI" ]; then
-                    continue
-                else
-                    module_lower="light-ui"
-                fi
-            fi
-            if [ $module == "NG-UI" -a ! -n "$NGUI" ]; then
-                continue
-            fi
             if [ $module == "PLA" -a ! -n "$INSTALL_PLA" ]; then
                 continue
             fi
@@ -599,19 +595,9 @@ function generate_docker_images() {
         [ -z "$_build_from" ] && _build_from="latest"
         echo "OSM Docker images generated from $_build_from"
 
-        for module in MON POL NBI KEYSTONE RO LCM NG-UI LW-UI PLA; do
+        for module in MON POL NBI KEYSTONE RO LCM NG-UI PLA; do
             if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q ${module} ; then
                 module_lower=${module,,}
-                if [ $module == "LW-UI" ]; then
-                    if [ -n "$NGUI" ]; then
-                        continue
-                    else
-                        module_lower="light-ui"
-                    fi
-                fi
-                if [ $module == "NG-UI" -a ! -n "$NGUI" ]; then
-                    continue
-                fi
                 if [ $module == "PLA" -a ! -n "$INSTALL_PLA" ]; then
                     continue
                 fi
@@ -647,13 +633,7 @@ function cmp_overwrite() {
 
 function generate_docker_compose_files() {
     $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/docker-compose.yaml $OSM_DOCKER_WORK_DIR/docker-compose.yaml
-    if [ -n "$NGUI" ]; then
-        # For NG-UI
-        $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/docker-compose-ngui.yaml $OSM_DOCKER_WORK_DIR/docker-compose-ui.yaml
-    else
-        # Docker-compose
-        $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/docker-compose-lightui.yaml $OSM_DOCKER_WORK_DIR/docker-compose-ui.yaml
-    fi
+    $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/docker-compose-ngui.yaml $OSM_DOCKER_WORK_DIR/docker-compose-ui.yaml
     if [ -n "$INSTALL_PLA" ]; then
         $WORKDIR_SUDO cp -b ${OSM_DEVOPS}/installers/docker/osm_pla/docker-compose.yaml $OSM_DOCKER_WORK_DIR/osm_pla/docker-compose.yaml
     fi
@@ -663,11 +643,7 @@ function generate_k8s_manifest_files() {
     #Kubernetes resources
     $WORKDIR_SUDO cp -bR ${OSM_DEVOPS}/installers/docker/osm_pods $OSM_DOCKER_WORK_DIR
     $WORKDIR_SUDO rm -f $OSM_K8S_WORK_DIR/mongo.yaml
-    if [ -n "$NGUI" ]; then
-        $WORKDIR_SUDO rm -f $OSM_K8S_WORK_DIR/light-ui.yaml
-    else
-        $WORKDIR_SUDO rm -f $OSM_K8S_WORK_DIR/ng-ui.yaml
-    fi
+    $WORKDIR_SUDO rm -f $OSM_K8S_WORK_DIR/ng-ui.yaml
 }
 
 function generate_prometheus_grafana_files() {
@@ -693,7 +669,6 @@ function generate_docker_env_files() {
     $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/keystone-db.env{,~}
     $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/keystone.env{,~}
     $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/lcm.env{,~}
-    $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/lwui.env{,~}
     $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/mon.env{,~}
     $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/nbi.env{,~}
     $WORKDIR_SUDO cp $OSM_DOCKER_WORK_DIR/pol.env{,~}
@@ -825,11 +800,6 @@ function generate_docker_env_files() {
         echo "OSMPOL_SQL_DATABASE_URI=mysql://root:${MYSQL_ROOT_PASSWORD}@mysql:3306/pol" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/pol.env
     fi
 
-    # LW-UI
-    if [ ! -f $OSM_DOCKER_WORK_DIR/lwui.env ]; then
-        echo "OSMUI_SQL_DATABASE_URI=mysql://root:${MYSQL_ROOT_PASSWORD}@mysql:3306/lwui" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/lwui.env
-    fi
-
     echo "Finished generation of docker env files"
 }
 
@@ -925,7 +895,6 @@ function kube_secrets(){
     kubectl create secret generic ro-db-secret -n $OSM_STACK_NAME --from-env-file=$OSM_DOCKER_WORK_DIR/ro-db.env
     kubectl create secret generic ro-secret -n $OSM_STACK_NAME --from-env-file=$OSM_DOCKER_WORK_DIR/ro.env
     kubectl create secret generic keystone-secret -n $OSM_STACK_NAME --from-env-file=$OSM_DOCKER_WORK_DIR/keystone.env
-    kubectl create secret generic lwui-secret -n $OSM_STACK_NAME --from-env-file=$OSM_DOCKER_WORK_DIR/lwui.env
     kubectl create secret generic pol-secret -n $OSM_STACK_NAME --from-env-file=$OSM_DOCKER_WORK_DIR/pol.env
 }
 
@@ -1015,22 +984,14 @@ function parse_yaml() {
 }
 
 function update_manifest_files() {
-    if [ -n "$NGUI" ]; then
-        osm_services="nbi lcm ro pol mon ng-ui keystone pla"
-    else
-        osm_services="nbi lcm ro pol mon light-ui keystone pla"
-    fi
+    osm_services="nbi lcm ro pol mon ng-ui keystone pla"
     list_of_services=""
     for module in $osm_services; do
         module_upper="${module^^}"
-        if [ "$module_upper" == "LIGHT-UI" ]; then
-            module_upper="LW-UI"
-        fi
         if ! echo $TO_REBUILD | grep -q $module_upper ; then
             list_of_services="$list_of_services $module"
         fi
     done
-    list_of_services_to_rebuild=$(echo ${TO_REBUILD,,} |sed "s/lw-ui/light-ui/g")
     if [ ! "$OSM_DOCKER_TAG" == "9" ]; then
         parse_yaml $OSM_DOCKER_TAG $list_of_services
     fi
@@ -1573,7 +1534,6 @@ function dump_vars(){
     echo "OSM_STACK_NAME=$OSM_STACK_NAME"
     echo "PULL_IMAGES=$PULL_IMAGES"
     echo "KUBERNETES=$KUBERNETES"
-    echo "NGUI=$NGUI"
     echo "DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL"
     echo "DOCKER_PROXY_URL=$DOCKER_PROXY_URL"
     echo "SHOWOPTS=$SHOWOPTS"
@@ -1633,7 +1593,6 @@ INSTALL_NOLXD=""
 INSTALL_NODOCKER=""
 INSTALL_NOJUJU=""
 KUBERNETES="y"
-NGUI="y"
 INSTALL_K8S_MONITOR=""
 INSTALL_NOHOSTCLIENT=""
 INSTALL_NOCACHELXDIMAGES=""
@@ -1690,12 +1649,6 @@ while getopts ":b:r:c:n:k:u:R:D:o:O:m:N:H:S:s:w:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o
             echo -e "Invalid argument for -i : ' $OPTARG'\n" >&2
             usage && exit 1
             ;;
-        n)
-            [ "${OPTARG}" == "lwui" ] && NGUI="" && REPO_ARGS+=(-n "${OPTARG}") && continue
-            [ "${OPTARG}" == "ngui" ] && continue
-            echo -e "Invalid argument for -n : ' $OPTARG'\n" >&2
-            usage && exit 1
-            ;;
         k)
             REPOSITORY_KEY="${OPTARG}"
             REPO_ARGS+=(-k "$REPOSITORY_KEY")
@@ -1736,7 +1689,6 @@ while getopts ":b:r:c:n:k:u:R:D:o:O:m:N:H:S:s:w:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o
             OPENSTACK_PUBLIC_NET_NAME="${OPTARG}"
             ;;
         m)
-            [ "${OPTARG}" == "LW-UI" ] && TO_REBUILD="$TO_REBUILD LW-UI" && continue
             [ "${OPTARG}" == "NG-UI" ] && TO_REBUILD="$TO_REBUILD NG-UI" && continue
             [ "${OPTARG}" == "NBI" ] && TO_REBUILD="$TO_REBUILD NBI" && continue
             [ "${OPTARG}" == "LCM" ] && TO_REBUILD="$TO_REBUILD LCM" && continue