Cou out camel converter and webssh

melodic_installation/installMorphemic.sh

@@ -180,7 +180,7 @@ generate_certs() {
   TRUSTSTORE_FILE=~/conf/common/melodic-truststore.p12
 
   # Creation of key pairs, certificates of all components and population of common truststore
-  MELODIC_SERVICES=(forecasting-exsmoothing uf-backend uf-frontend forecasting-arima forecasting-eshybrid predictionorchestrator slo-violation-detector forecasting-gluonmachines forecasting-prophet forecasting-tft forecasting-cnn persistentstorage forecasting-nbeats cdoserver mule adapter generator cpsolver camunda memcache ldap metasolver jwtserver authdb authserver ems gui-backend functionizer-testing-tool gui-frontend ui-webssh ptsolver ncsolver geneticsolver mctssolver prometheus performance-model camel_converter polymorphic_solver)
+  MELODIC_SERVICES=(forecasting-exsmoothing uf-backend uf-frontend forecasting-arima forecasting-eshybrid predictionorchestrator slo-violation-detector forecasting-gluonmachines forecasting-prophet forecasting-tft forecasting-cnn persistentstorage forecasting-nbeats cdoserver mule adapter generator cpsolver camunda memcache ldap metasolver jwtserver authdb authserver ems gui-backend functionizer-testing-tool gui-frontend ptsolver ncsolver geneticsolver mctssolver prometheus performance-model polymorphic_solver)
 
   for i in ${MELODIC_SERVICES[*]}; do
     create_keystore_for $i

melodic_installation/installMorphemicSwap.sh

@@ -202,7 +202,7 @@ generate_certs() {
   TRUSTSTORE_FILE=~/conf/common/melodic-truststore.p12
 
   # Creation of key pairs, certificates of all components and population of common truststore
-  MELODIC_SERVICES=(forecasting-exsmoothing uf-backend uf-frontend forecasting-arima forecasting-eshybrid predictionorchestrator slo-violation-detector forecasting-gluonmachines forecasting-prophet forecasting-tft forecasting-cnn persistentstorage forecasting-nbeats cdoserver mule adapter generator cpsolver camunda memcache ldap metasolver jwtserver authdb authserver ems gui-backend functionizer-testing-tool gui-frontend ui-webssh ptsolver ncsolver geneticsolver mctssolver prometheus performance-model camel_converter polymorphic_solver)
+  MELODIC_SERVICES=(forecasting-exsmoothing uf-backend uf-frontend forecasting-arima forecasting-eshybrid predictionorchestrator slo-violation-detector forecasting-gluonmachines forecasting-prophet forecasting-tft forecasting-cnn persistentstorage forecasting-nbeats cdoserver mule adapter generator cpsolver camunda memcache ldap metasolver jwtserver authdb authserver ems gui-backend functionizer-testing-tool gui-frontend ptsolver ncsolver geneticsolver mctssolver prometheus performance-model polymorphic_solver)
 
   for i in ${MELODIC_SERVICES[*]}; do
     create_keystore_for $i

melodic_installation/installMorphemicSwapUnattended.sh

@@ -209,7 +209,7 @@ generate_certs() {
   TRUSTSTORE_FILE=~/conf/common/melodic-truststore.p12
 
   # Creation of key pairs, certificates of all components and population of common truststore
-  MELODIC_SERVICES=(forecasting-exsmoothing uf-backend uf-frontend forecasting-arima forecasting-eshybrid predictionorchestrator slo-violation-detector forecasting-gluonmachines forecasting-prophet forecasting-tft forecasting-cnn persistentstorage forecasting-nbeats cdoserver mule adapter generator cpsolver camunda memcache ldap metasolver jwtserver authdb authserver ems gui-backend functionizer-testing-tool gui-frontend ui-webssh ptsolver ncsolver geneticsolver mctssolver prometheus performance-model camel_converter polymorphic_solver)
+  MELODIC_SERVICES=(forecasting-exsmoothing uf-backend uf-frontend forecasting-arima forecasting-eshybrid predictionorchestrator slo-violation-detector forecasting-gluonmachines forecasting-prophet forecasting-tft forecasting-cnn persistentstorage forecasting-nbeats cdoserver mule adapter generator cpsolver camunda memcache ldap metasolver jwtserver authdb authserver ems gui-backend functionizer-testing-tool gui-frontend ptsolver ncsolver geneticsolver mctssolver prometheus performance-model polymorphic_solver)
 
   for i in ${MELODIC_SERVICES[*]}; do
     create_keystore_for $i

melodic_properties/templates/melodicStack/docker-compose.yml

 version: "3"
 services:
 
-  ui-webssh:
-    image: gitlab.ow2.org:4567/melodic/melodic-utils/webssh:${IMAGE_BRANCH}
-    logging:
-      driver: journald
-      options:
-        tag: ui-webssh
-    ports:
-      - 2121:2121
-      - 4433:4433
-    volumes:
-      - ~/certs/ui-webssh:/certs
-    environment:
-      - USE_HTTPS=true
-      - CERT_FILE=/certs/ui-webssh.cert
-      - KEY_FILE=/certs/ui-webssh.key
-      - HTTPS_PORT=4433
-      - PORT=2121
-    networks:
-      - elk
   ui-mq-http-adapter:
     depends_on:
       - "ui-influxdb"

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

@@ -151,7 +151,7 @@ services:
       - /morphemic/camel_converter:/app/src/models
     ports:
       - 7879:7879
-    environment: 
+    environment:
     - "ACTIVEMQ_HOST=ems"
     - "ACTIVEMQ_PORT=61610"
     - "MULE_HOSTNAME=http://mule:8088"
@@ -178,24 +178,6 @@ services:
     networks: 
       - elk
 
-  camel_converter:
-    image: gitlab.ow2.org:4567/melodic/morphemic-preprocessor/camel_converter:${IMAGE_BRANCH}
-    restart: always
-    logging:
-      driver: journald
-      options:
-        tag: camelconverter
-    ports:
-    - 7676:7676
-    environment:
-    - PAASAGE_CONFIG_DIR=.paasage
-    volumes:
-    - ./morphemic/camel_converter:/app/src/models 
-    - ~/conf/eu.paasage.mddb.cdo.client.properties:/app/src/.paasage/eu.melodic.event.brokerclient.properties
-    - /config:/app/src/.paasage
-    networks:
-    - elk
-
   forecasting-cnn:
     image: gitlab.ow2.org:4567/melodic/morphemic-preprocessor/cnn:${IMAGE_BRANCH}
     restart: always