From 836354fe4faf5ec29acfabcaf1a79cefd86b5848 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 10 May 2023 18:12:00 +0200 Subject: [PATCH] Enable NGSA installation (Airflow, AlertMgr and PushGW) by default This reverts commit 64885c283f162872a85ea05142d3ebf927aaacdc. Change-Id: I5afc552335f8f25656f1947c5b212750683b807b Signed-off-by: garciadeblas --- installers/full_install_osm.sh | 6 ++++-- installers/install_ngsa.sh | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 426b79c9..7413bd66 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -36,7 +36,8 @@ function usage(){ echo -e " -P use VCA/juju public key file" echo -e " -A use VCA/juju API proxy" echo -e " --pla: install the PLA module for placement support" - echo -e " --ng-sa: install Airflow and Pushgateway to get VNF and NS status (experimental)" + echo -e " --old-sa: install old Service Assurance framework (MON, POL); do not install Airflow and Pushgateway" + echo -e " --ng-sa: install new Service Assurance framework (Airflow, AlertManager and Pushgateway) (enabled by default)" echo -e " -m : 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 : ONLY (un)installs one of the addons (k8s_monitor, ng-sa)" echo -e " -O : Install OSM to an OpenStack infrastructure. is required. If a is used, the clouds.yaml file should be under ~/.config/openstack/ or /etc/openstack/" @@ -1004,7 +1005,7 @@ DEBUG_INSTALL="" RELEASE="ReleaseTEN" REPOSITORY="stable" INSTALL_K8S_MONITOR="" -INSTALL_NGSA="" +INSTALL_NGSA="y" INSTALL_PLA="" INSTALL_VIMEMU="" LXD_REPOSITORY_BASE="https://osm-download.etsi.org/repository/osm/lxd" @@ -1204,6 +1205,7 @@ while getopts ":a:b:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o; [ "${OPTARG}" == "tag" ] && continue [ "${OPTARG}" == "registry" ] && continue [ "${OPTARG}" == "pla" ] && INSTALL_PLA="y" && continue + [ "${OPTARG}" == "old-sa" ] && INSTALL_NGSA="" && continue [ "${OPTARG}" == "ng-sa" ] && INSTALL_NGSA="y" && continue [ "${OPTARG}" == "volume" ] && OPENSTACK_ATTACH_VOLUME="true" && continue [ "${OPTARG}" == "nocachelxdimages" ] && continue diff --git a/installers/install_ngsa.sh b/installers/install_ngsa.sh index 4ccd54d0..30edc701 100755 --- a/installers/install_ngsa.sh +++ b/installers/install_ngsa.sh @@ -29,8 +29,8 @@ function install_airflow() { # update airflow-values.yaml to use the right tag echo "Updating Helm values file helm/values/airflow-values.yaml to use defaultAirflowTag: ${OSM_DOCKER_TAG}" sudo sed -i "s#defaultAirflowTag:.*#defaultAirflowTag: ${OSM_DOCKER_TAG}#g" ${OSM_HELM_WORK_DIR}/airflow-values.yaml - echo "Updating Helm values file helm/values/airflow-values.yaml to use the right image: ${DOCKER_REGISTRY_URL}${DOCKER_USER}/airflow" - sudo sed -i "s#defaultAirflowRepository:-*#defaultAirflowRepository: ${DOCKER_REGISTRY_URL}${DOCKER_USER}/airflow#g" ${OSM_HELM_WORK_DIR}/airflow-values.yaml + echo "Updating Helm values file helm/values/airflow-values.yaml to use defaultAirflowRepository: ${DOCKER_REGISTRY_URL}${DOCKER_USER}/airflow" + sudo sed -i "s#defaultAirflowRepository:.*#defaultAirflowRepository: ${DOCKER_REGISTRY_URL}${DOCKER_USER}/airflow#g" ${OSM_HELM_WORK_DIR}/airflow-values.yaml if ! helm -n osm status airflow 2> /dev/null ; then # if it does not exist, create secrets and install kubectl -n osm create secret generic airflow-webserver-secret --from-literal="webserver-secret-key=$(python3 -c 'import secrets; print(secrets.token_hex(16))')" -- 2.25.1