Commit 4febfe15 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent 14da4b5a

deploy/all.sh

+2 −2
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ bash scripts/dockerhub_login.sh 
./deploy/nats.sh



# Deploy QuestDB

#./deploy/qdb.sh

./deploy/qdb.sh



# Deploy Apache Kafka

./deploy/kafka.sh
@@ -266,7 +266,7 @@ bash scripts/dockerhub_login.sh 
# ./deploy/monitoring.sh



# Expose Dashboard

#./deploy/expose_dashboard.sh

./deploy/expose_dashboard.sh



# Deploy TeraFlowSDN

./deploy/tfs.sh

my_deploy.sh

+6 −6
Original line number Diff line number Diff line
@@ -43,11 +43,11 @@ export TFS_COMPONENTS="context device pathcomp service nbi webui" 
#   To manage optical connections, "service" requires "opticalcontroller" to be deployed

#   before "service", thus we "hack" the TFS_COMPONENTS environment variable prepending the

#   "opticalcontroller" only if "service" is already in TFS_COMPONENTS, and re-export it.

if [[ "$TFS_COMPONENTS" == *"service"* ]]; then

    BEFORE="${TFS_COMPONENTS% service*}"

    AFTER="${TFS_COMPONENTS#* service}"

    export TFS_COMPONENTS="${BEFORE} opticalcontroller service ${AFTER}"

fi

#if [[ "$TFS_COMPONENTS" == *"service"* ]]; then

#    BEFORE="${TFS_COMPONENTS% service*}"

#    AFTER="${TFS_COMPONENTS#* service}"

#    export TFS_COMPONENTS="${BEFORE} opticalcontroller service ${AFTER}"

#fi



# Uncomment to activate ZTP

#export TFS_COMPONENTS="${TFS_COMPONENTS} ztp"
@@ -148,7 +148,7 @@ export CRDB_PASSWORD="tfs123" 
export CRDB_DEPLOY_MODE="single"



# Disable flag for dropping database, if it exists.

export CRDB_DROP_DATABASE_IF_EXISTS="YES"

export CRDB_DROP_DATABASE_IF_EXISTS=""



# Disable flag for re-deploying CockroachDB from scratch.

export CRDB_REDEPLOY=""

redeploy.sh

deleted100755 → 0
+0 −4
Original line number Diff line number Diff line 
#!/bin/bash



source my_deploy.sh

./deploy/all.sh