X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=scripts%2Finstall%2Finstall-acm.sh;h=9c7414269b38b9abedb0aca08d62228266de99e2;hb=4b54b7ed29e736b2f80878bab90acaedb4e7117e;hp=e5182e5584786890ac8aecfa03601b91a7ab4073;hpb=fb46bc57fa0c51612111f45e34c9763ee0188f06;p=nonrtric%2Fplt%2Frappmanager.git

diff --git a/scripts/install/install-acm.sh b/scripts/install/install-acm.sh
index e5182e5..9c74142 100755
--- a/scripts/install/install-acm.sh
+++ b/scripts/install/install-acm.sh
@@ -56,20 +56,16 @@ 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
+# Using "default" as namespace for kafka installation. As the policy CSIT helm charts contains the namespace "default" inbuilt.
+# ACM installation fails to run, If the kubernetes cluster setup with a different default namespace,
+# Expected kafka service is "kafka.default.svc.cluster.local"
+# This can be removed when the kafka charts provided with "default" namespace or when policy CSIT charts can be configurable with different namespace.
+kubectl apply -f $KAFKA_DIR/zookeeper.yaml -n default
+kubectl apply -f $KAFKA_DIR/kafka.yaml -n default
 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 +83,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"