Updated installation and components

[nonrtric/plt/ranpm.git] / install / install-pm-rapp.sh

diff --git a/install/install-pm-rapp.sh b/install/install-pm-rapp.sh
index 37fb826..6e00633 100755 (executable)
--- a/install/install-pm-rapp.sh
+++ b/install/install-pm-rapp.sh
@@ -19,7 +19,7 @@
 
 
 
-echo "Installtion pmrapp"
+echo "Installing pmrapp"
 
 . scripts/kube_get_controlplane_host.sh
 . scripts/kube_get_nodeport.sh
@@ -38,16 +38,14 @@ check_error() {
 echo "Creating client in keycloak"
 
 # Find host and port to keycloak
-export KHOST=$(kube_get_controlplane_host)
+export KUBERNETESHOST=$(kube_get_controlplane_host)
 if [ $? -ne 0 ]; then
-    echo $KHOST
+    echo $KUBERNETESHOST
     echo "Exiting"
     exit 1
 fi
 
-create_topic kafka-1-kafka-bootstrap.nonrtric:9092 pm-rapp 10
-
-export KC_PORT=$(kube_get_nodeport keycloak nonrtric http)
+create_topic kafka-1-kafka-bootstrap.nonrtric:9092 rapp-topic 10
 
 . scripts/populate_keycloak.sh
 
@@ -62,7 +60,7 @@ export PMRAPP_CLIENT_SECRET=$(< .sec_nonrtric-realm_$cid)
 envsubst < helm/nrt-pm-rapp/values-template.yaml > helm/nrt-pm-rapp/values.yaml
 
 echo " helm install..."
-helm install --wait -n nonrtric nrt-pm-rapp helm/nrt-pm-rapp
+helm install --wait -f helm/global-values.yaml -n nonrtric nrt-pm-rapp helm/nrt-pm-rapp
 
 echo "done"