From: aravind.est Date: Thu, 25 Jan 2024 17:20:34 +0000 (+0000) Subject: Remove workarounds in ACM installation X-Git-Tag: 0.1.0~38^2 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=7214b15b5798694fa37497b4545b538169c691e2;hp=fb46bc57fa0c51612111f45e34c9763ee0188f06;p=nonrtric%2Fplt%2Frappmanager.git Remove workarounds in ACM installation Workaround has been removed from ACM installation scripts. HELM charts improvemets has been merged as part of https://gerrit.onap.org/r/c/policy/docker/+/137075. It contains the changes required, hence the workaround's are removed. Issue-ID: NONRTRIC-969 Signed-off-by: aravind.est Change-Id: I93b4ee2df1067ea32bfd4fd9322d3a02ac4af32d --- diff --git a/scripts/install/install-acm.sh b/scripts/install/install-acm.sh index e5182e5..7535c1f 100755 --- a/scripts/install/install-acm.sh +++ b/scripts/install/install-acm.sh @@ -56,20 +56,12 @@ git clone "https://gerrit.onap.org/r/policy/docker" CWD=$(pwd) export WORKSPACE="$CWD/docker" -#Temporary workaround, Should be removed once https://gerrit.onap.org/r/c/policy/docker/+/137075 or similar change is merged -echo "Updating kafka advertised listeners..." -sed -i 's|PLAINTEXT_INTERNAL://kafka:9092|PLAINTEXT_INTERNAL://kafka.default.svc.cluster.local:9092|g' $KAFKA_DIR/kafka.yaml - # Kafka installation echo "Installing Confluent kafka" kubectl apply -f $KAFKA_DIR/zookeeper.yaml kubectl apply -f $KAFKA_DIR/kafka.yaml wait_for_pods_to_be_running -#Temporary workaround. Should be removed once this gets fixed in policy/docker repo -echo "Update policy-db-migrator version..." -yq eval '.dbmigrator.image="onap/policy-db-migrator:3.1-SNAPSHOT-latest"' -i $ACM_VALUES_FILE - echo "Updating policy docker image versions..." bash $K8S_VERSIONS_FILE @@ -87,10 +79,6 @@ for element in "${DISABLE_COMPONENTS[@]}"; do done echo "Updating A1PMS Participant" - -#Temporary workaround, Should be removed once https://gerrit.onap.org/r/c/policy/docker/+/137075 or similar change is merged -sed -i 's|{{ \.Values\.global\.kafkaServer }}:9092|"\0"|g' $A1PMS_CONFIGURATION_FILE - yq eval '.a1pms.baseUrl="'$A1PMS_HOST'"' -i $A1PMS_CONFIGURATION_FILE echo "Updating the k8s participant repo list"