summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdeploy_vm1.sh16
-rwxr-xr-xdeploy_vm2.sh16
-rw-r--r--docker-compose-app.yml4
3 files changed, 18 insertions, 18 deletions
diff --git a/deploy_vm1.sh b/deploy_vm1.sh
index 19b243d..ba7dfb8 100755
--- a/deploy_vm1.sh
+++ b/deploy_vm1.sh
@@ -10,8 +10,8 @@ fi
export RESOURCES_LOGS="/opt/aai/logroot/AAI-RESOURCES";
export TRAVERSAL_LOGS="/opt/aai/logroot/AAI-TRAVERSAL";
export SEARCH_LOGS="/opt/aai/logroot/AAI-SEARCH";
-export DATA-ROUTER_LOGS="/opt/aai/logroot/AAI-DATA-ROUTER";
-export MODEL-LOADER_LOGS="/opt/aai/logroot/AAI-MODEL-LOADER";
+export DATA_ROUTER_LOGS="/opt/aai/logroot/AAI-DATA-ROUTER";
+export MODEL_LOADER_LOGS="/opt/aai/logroot/AAI-MODEL-LOADER";
if [ ! -d "$RESOURCES_LOGS" ];
then
@@ -31,16 +31,16 @@ then
mkdir -p $SEARCH_LOGS;
fi;
-if [ ! -d "$DATA-ROUTER_LOGS" ];
+if [ ! -d "$DATA_ROUTER_LOGS" ];
then
- echo "Warning: Unable to find the volume directory $DATA-ROUTER_LOGS so creating it as regular directory";
- mkdir -p $DATA-ROUTER_LOGS;
+ echo "Warning: Unable to find the volume directory $DATA_ROUTER_LOGS so creating it as regular directory";
+ mkdir -p $DATA_ROUTER_LOGS;
fi;
-if [ ! -d "$MODEL-LOADER_LOGS" ];
+if [ ! -d "$MODEL_LOADER_LOGS" ];
then
- echo "Warning: Unable to find the volume directory $MODEL-LOADER_LOGS so creating it as regular directory";
- mkdir -p $MODEL-LOADER_LOGS;
+ echo "Warning: Unable to find the volume directory $MODEL_LOADER_LOGS so creating it as regular directory";
+ mkdir -p $MODEL_LOADER_LOGS;
fi;
export MTU=${MTU:-1500};
diff --git a/deploy_vm2.sh b/deploy_vm2.sh
index d890528..01631e3 100755
--- a/deploy_vm2.sh
+++ b/deploy_vm2.sh
@@ -10,8 +10,8 @@ fi
export RESOURCES_LOGS="/opt/aai/logroot/AAI-RESOURCES";
export TRAVERSAL_LOGS="/opt/aai/logroot/AAI-TRAVERSAL";
export SEARCH_LOGS="/opt/aai/logroot/AAI-SEARCH";
-export DATA-ROUTER_LOGS="/opt/aai/logroot/AAI-DATA-ROUTER";
-export MODEL-LOADER_LOGS="/opt/aai/logroot/AAI-MODEL-LOADER";
+export DATA_ROUTER_LOGS="/opt/aai/logroot/AAI-DATA-ROUTER";
+export MODEL_LOADER_LOGS="/opt/aai/logroot/AAI-MODEL-LOADER";
if [ ! -d "$RESOURCES_LOGS" ];
then
@@ -31,16 +31,16 @@ then
mkdir -p $SEARCH_LOGS;
fi;
-if [ ! -d "$DATA-ROUTER_LOGS" ];
+if [ ! -d "$DATA_ROUTER_LOGS" ];
then
- echo "Warning: Unable to find the volume directory $DATA-ROUTER_LOGS so creating it as regular directory";
- mkdir -p $DATA-ROUTER_LOGS;
+ echo "Warning: Unable to find the volume directory $DATA_ROUTER_LOGS so creating it as regular directory";
+ mkdir -p $DATA_ROUTER_LOGS;
fi;
-if [ ! -d "$MODEL-LOADER_LOGS" ];
+if [ ! -d "$MODEL_LOADER_LOGS" ];
then
- echo "Warning: Unable to find the volume directory $MODEL-LOADER_LOGS so creating it as regular directory";
- mkdir -p $MODEL-LOADER_LOGS;
+ echo "Warning: Unable to find the volume directory $MODEL_LOADER_LOGS so creating it as regular directory";
+ mkdir -p $MODEL_LOADER_LOGS;
fi;
export MTU=${MTU:-1500};
diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index 3ae78ce..6f2602f 100644
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -74,7 +74,7 @@ services:
image: ${DOCKER_REGISTRY}/openecomp/datarouter-service
hostname: datarouter
volumes:
- - ${DATA-ROUTER_LOGS}:/logs
+ - ${DATA_ROUTER_LOGS}:/logs
- /opt/app/datarouter-service/appconfig:/opt/app/data-router/config
- /opt/app/datarouter-service/dynamic:/opt/app/data-router/dynamic
ports:
@@ -95,7 +95,7 @@ services:
image: ${DOCKER_REGISTRY}/openecomp/model-loader
hostname: model-loader
volumes:
- - ${MODEL-LOADER_LOGS}:/logs
+ - ${MODEL_LOADER_LOGS}:/logs
- /opt/app/model-loader/appconfig:/opt/app/model-loader/config
environment:
- CONFIG_HOME=/opt/app/model-loader/config/