Adapted env variables of sal. Adapted properties files to delete old properties

melodic_installation/installMorphemic.sh

@@ -93,6 +93,8 @@ install_morphemic_without_docker() {
   cp ~/melodic-utils/melodic_properties/templates/melodicStack/executionware/morphemic/prometheus.yml ~/morphemic/prometheus_db/prometheus.yml
   #cp -R melodic_properties/templates/config/ui-visualization/grafana/provisioning ~/morphemic/prometheus_db/
 
+  sudo sed -i "s/PUBLICIP/${MELODIC_IP}/g" ~/morphemic/.env
+
   sudo chmod -R 777 ~/morphemic/prometheus_db/
   sudo chown -R root:root ~/morphemic/prometheus_db/
   cp ~/melodic-utils/melodic_installation/.get_logs.sh ~/morphemic/.getlogs.sh

melodic_installation/installMorphemicSwap.sh

@@ -93,6 +93,8 @@ install_morphemic_without_docker() {
   cp ~/melodic-utils/melodic_properties/templates/melodicStack/executionware/morphemic/prometheus.yml ~/morphemic/prometheus_db/prometheus.yml
   #cp -R melodic_properties/templates/config/ui-visualization/grafana/provisioning ~/morphemic/prometheus_db/
 
+  sudo sed -i "s/PUBLICIP/${MELODIC_IP}/g" ~/morphemic/.env
+
   sudo chmod -R 777 ~/morphemic/prometheus_db/
   sudo chown -R root:root ~/morphemic/prometheus_db/
   cp ~/melodic-utils/melodic_installation/.get_logs.sh ~/morphemic/.getlogs.sh

melodic_installation/installMorphemicSwapUnattended.sh

@@ -94,6 +94,8 @@ install_morphemic_without_docker() {
   cp ~/melodic-utils/melodic_properties/templates/melodicStack/executionware/morphemic/prometheus.yml ~/morphemic/prometheus_db/prometheus.yml
   #cp -R melodic_properties/templates/config/ui-visualization/grafana/provisioning ~/morphemic/prometheus_db/
 
+  sudo sed -i "s/PUBLICIP/${MELODIC_IP}/g" ~/morphemic/.env
+
   sudo chmod -R 777 ~/morphemic/prometheus_db/
   sudo chown -R root:root ~/morphemic/prometheus_db/
   cp ~/melodic-utils/melodic_installation/.get_logs.sh ~/morphemic/.getlogs.sh

melodic_properties/templates/config/eu.morphemic.integration.proactiveClientConnector.properties

 # ProActive config
-pa-config.rest-url=http://sal-as-a-service:8880
-pa-config.login=i4EYCtBsuRpxnU7gomxbvQ==
-pa-config.password=i4EYCtBsuRpxnU7gomxbvQ==
-pa-config.encryptor-pw=${PROACTIVE_ENCRYPTOR_PW}
\ No newline at end of file
+pa-config.rest-url=http://sal-as-a-service:8080/sal
+pa-config.login=admin
+pa-config.password=admin

melodic_properties/templates/config/eu.morphemic.schedulingAbstractionLayer.properties

-# Scheduling Abstraction Layer's Persistence config
-sal.persistence.url=jdbc:mariadb://melodic-store:3306/proactive
-sal.persistence.username=${env:SAL_USERNAME}
-sal.persistence.password=${env:SAL_PASSWORD}

melodic_properties/templates/melodicStack/executionware/morphemic/docker-compose.yml

@@ -301,8 +301,8 @@ services:
       - EXTERNAL_CONFIG_DIR=/config
       - spring.config.location=/config/eu.morphemic.integration.sal-as-a-service.properties
       - PROPERTIES_FILENAME=eu.morphemic.integration.sal-as-a-service
-      - JPDA_ADDRESS= 9001
-      - JPDA_TRANSPORT= dt_socket
+      - JPDA_ADDRESS=9001
+      - JPDA_TRANSPORT=dt_socket
       - PROACTIVE_IP=${MELODIC_IP}
       - PA_HOME='/'
     ports:

melodic_properties/templates/melodicStack/executionware/morphemic/envtemplate-morphemic

 IMAGE_BRANCH=morphemic-rc2.5
+MELODIC_IP=PUBLICIP
\ No newline at end of file