Commit fe4af7af authored by Javier Diaz's avatar Javier Diaz
Browse files

Code Cleanup

parent 1573e9cc

deploy/tfs.sh

+12 −24
Original line number Diff line number Diff line
@@ -118,20 +118,6 @@ export PROM_EXT_PORT_HTTP=${PROM_EXT_PORT_HTTP:-"9090"} 
# If not already set, set the external port Grafana HTTP Dashboards will be exposed to.

export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}



# ----- HLF Key Paths -----------------------------------------------------------



echo "Keystore PATH"

KEY_DIRECTORY_PATH="${HOME}/fabric-samples/test-network/organizations/peerOrganizations/org1.adrenaline.com/users/User1@org1.adrenaline.com/msp/keystore/priv_sk"

printf "\n"



echo "signcerts PATH"

CERT_DIRECTORY_PATH="${HOME}/fabric-samples/test-network/organizations/peerOrganizations/org1.adrenaline.com/users/User1@org1.adrenaline.com/msp/signcerts/User1@org1.adrenaline.com-cert.pem"

printf "\n"



echo "ca.crt PATH"

TLS_CERT_PATH="${HOME}/fabric-samples/test-network/organizations/peerOrganizations/org1.adrenaline.com/peers/peer0.org1.adrenaline.com/tls/ca.crt"

printf "\n"



########################################################################################################################

# Automated steps start here

########################################################################################################################
@@ -204,6 +190,8 @@ kubectl create secret generic qdb-data --namespace ${TFS_K8S_NAMESPACE} --type=' 
    --from-literal=METRICSDB_PASSWORD=${QDB_PASSWORD}

printf "\n"



# Check if "dlt" is in the list of components

if [[ " ${TFS_COMPONENTS[@]} " =~ " dlt " ]]; then

  echo "Create secret for HLF keystore"

  kubectl create secret generic dlt-keystone --namespace ${TFS_K8S_NAMESPACE} --from-file=keystore=${KEY_DIRECTORY_PATH}

  printf "\n"
@@ -215,7 +203,7 @@ printf "\n" 
  echo "Create secret for HLF ca.crt"

  kubectl create secret generic dlt-ca-crt --namespace ${TFS_K8S_NAMESPACE} --from-file=ca.crt=${TLS_CERT_PATH}

  printf "\n"



fi



echo "Deploying components and collecting environment variables..."

ENV_VARS_SCRIPT=tfs_runtime_env_vars.sh

my_deploy.sh

+8 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"



# Set the list of components, separated by spaces, you want to build images for, and deploy.

export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator interdomain dlt"

export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator"



# Uncomment to activate Monitoring (old)

#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
@@ -62,6 +62,13 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_gene 
# Uncomment to activate E2E Orchestrator

#export TFS_COMPONENTS="${TFS_COMPONENTS} e2e_orchestrator"



# Uncomment to activate DLT

export TFS_COMPONENTS="${TFS_COMPONENTS} interdomain dlt"

export KEY_DIRECTORY_PATH="${HOME}/fabric-samples/test-network/organizations/peerOrganizations/org1.adrenaline.com/users/User1@org1.adrenaline.com/msp/keystore/priv_sk"

export CERT_DIRECTORY_PATH="${HOME}/fabric-samples/test-network/organizations/peerOrganizations/org1.adrenaline.com/users/User1@org1.adrenaline.com/msp/signcerts/User1@org1.adrenaline.com-cert.pem"

export TLS_CERT_PATH="${HOME}/fabric-samples/test-network/organizations/peerOrganizations/org1.adrenaline.com/peers/peer0.org1.adrenaline.com/tls/ca.crt"





# Set the tag you want to use for your images.

export TFS_IMAGE_TAG="dev"