Commit 9eda1dba authored by vmasip's avatar vmasip
Browse files

Changing dataclay user&pass to default

parent 84867332
......@@ -10,7 +10,7 @@ LABEL maintainer="Unai Perez <unai.perez@bsc.es>"
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-arm64
######## ENV VARIABLES DEFINED FOR NFR-WORKERS-IMAGE #######
ENV USER=ElasticUser
ENV USER=defaultUser
ENV PASS=defaultPass
ENV NAMESPACE_JAVA=ElasticNFR
ENV STUBSPATH=/root/smartcity-compss/stubs
......
......@@ -7,6 +7,6 @@ echo "Retrieving Java stubs in $PWD folder"
docker run --rm -v $PWD/cfgfiles-for-stubs:/home/dataclayusr/dataclay/cfgfiles \
-v $PWD/stubs:/stubs --network host -e HOST_USER_ID=$(id -u) \
-e HOST_GROUP_ID=$(id -g) bscdataclay/client:dev20210603-alpine \
GetStubs ElasticUser defaultPass ElasticNFR /stubs
GetStubs defaultUser defaultPass ElasticNFR /stubs
jar cvf stubs.jar -C stubs .
# Account=CityUser
# Password=p4ssw0rd
Account=ElasticUser
Account=defaultUser
Password=defaultPass
StubsClasspath=/home/eudald/odt-containers/smartcity-compss/stubs
DataClayClientConfig=/home/eudald/odt-containers/smartcity-compss/cfgfiles/client.properties
......
# Account=CityUser
# Password=p4ssw0rd
Account=ElasticUser
Account=defaultUser
Password=defaultPass
StubsClasspath=/root/smartcity-compss/stubs
DataClayClientConfig=/root/smartcity-compss/cfgfiles/client.properties
......
......@@ -2,7 +2,7 @@
docker run --rm -v $PWD/cfgfiles:/home/dataclayusr/dataclay/cfgfiles \
-v /compss/stubs:/stubs --network host \
bscdataclay/client:alpine GetStubs CityUser p4ssw0rd CityNS /stubs
bscdataclay/client:alpine GetStubs defaultUser defaultPass CityNS /stubs
rm /compss/dataclay.jar
......
......@@ -71,9 +71,9 @@ services:
environment:
- LOGICMODULE_PORT_TCP=11034
- LOGICMODULE_HOST=192.168.50.103
- USER=CityUser
- PASS=p4ssw0rd
- DATASET=City
- USER=defaultUser
- PASS=defaultPass
- DATASET=defaultDS
- IMPORT_MODELS_FROM_EXTERNAL_DC_HOSTS=192.168.7.32
#- IMPORT_MODELS_FROM_EXTERNAL_DC_HOSTS=192.168.50.103
- IMPORT_MODELS_FROM_EXTERNAL_DC_PORTS=11034
......
......@@ -109,9 +109,9 @@ services:
environment:
- LOGICMODULE_PORT_TCP=11034
- LOGICMODULE_HOST=logicmodule
- USER=CityUser
- PASS=p4ssw0rd
- DATASET=City
- USER=defaultUser
- PASS=defaultPass
- DATASET=defaultDS
- IMPORT_MODELS_FROM_EXTERNAL_DC_HOSTS=192.168.50.174
- IMPORT_MODELS_FROM_EXTERNAL_DC_PORTS=21034
- IMPORT_MODELS_FROM_EXTERNAL_DC_NAMESPACES=CityNS
......@@ -131,9 +131,9 @@ services:
environment:
- LOGICMODULE_PORT_TCP=11034
- LOGICMODULE_HOST=logicmodule
- USER=CityUser
- PASS=p4ssw0rd
- DATASET=City
- USER=defaultUser
- PASS=defaultPass
- DATASET=defaultDS
- NAMESPACE=CityNS
object-tracking:
......@@ -153,9 +153,9 @@ services:
- LOGICMODULE_PORT_TCP=11034
# - LOGICMODULE_HOST=172.17.0.1
- LOGICMODULE_HOST=192.168.50.174
- USER=CityUser
- PASS=p4ssw0rd
- DATASET=City
- USER=defaultUser
- PASS=defaultPass
- DATASET=defaultDS
- NAMESPACE=CityNS
- STUBSPATH=/root/smartcity-compss/stubs
- CONTRACT_ID_PATH=/srv/dataclay/shared/CityNS_contractid
......
......@@ -7,7 +7,7 @@ def main():
# Env variables
dataclay_jar_path = "dataclay/dataclay.jar"
user = "ElasticUser"
user = "defaultUser"
password = "defaultPass"
# namespaces = ["ElasticNFR", "CityNS"]
namespace = "CityNS"
......
......@@ -13,10 +13,20 @@ function ctrl_c() {
if [ "$1" == "-d" ];
then
DEBUG="$1"
shift
fi
if [ "$1" == "-g" ];
then
GRAPH="$1"
# generates a complete_graph.dot file in ~/.COMPSs/app/monitor/complete_graph.dot
shift
fi
./remove_dockers.sh
echo "Launching runcompss....."
runcompss ${DEBUG} --python_interpreter=python3 --master_name=192.168.121.210 --master_port=43001 --scheduler_config_file=config/sched.config \
runcompss ${DEBUG} ${GRAPH} --python_interpreter=python3 --master_name=192.168.121.210 --master_port=43001 --scheduler_config_file=config/sched.config \
--scheduler="es.bsc.compss.scheduler.prometheus.PrometheusScheduler" --task_monitor="es.bsc.compss.types.DeadlineMonitor" \
--nfrtool=true --project=config/project_3workers.xml --resources=config/resources_3workers.xml \
--classpath=/root/.m2/repository/es/bsc/compss/nfrtool-dataclay-stubs/1.0/nfrtool-dataclay-stubs-1.0.jar:/root/.m2/repository/es/bsc/dataclay/dataclay/2.6.1-SNAPSHOT/dataclay-2.6.1-SNAPSHOT.jar\
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment