From 09533ec3f776584d5e9779a70936a31254923f9f Mon Sep 17 00:00:00 2001 From: Denis Kirillov Date: Wed, 21 Dec 2022 15:34:14 +0300 Subject: [PATCH] [TrueCloudLab#1] Update Makefile, scripts and compose files Signed-off-by: Denis Kirillov --- .env | 30 +++++++++--------- Makefile | 18 +++++------ bin/config.sh | 4 +-- bin/deposit.sh | 2 +- bin/tick.sh | 4 +-- docs/notary.md | 6 ++-- neofs-adm.yml => frostfs-adm.yml | 2 +- neofs_config.mk => frostfs_config.mk | 0 services/chain/artifacts.mk | 2 +- services/chain/docker-compose.yml | 2 +- services/chain/protocol.privnet.yml | 11 ------- services/ir/.ir.env | 2 +- services/ir/artifacts.mk | 34 ++++++++++---------- services/ir/docker-compose.yml | 2 +- services/ir/healthcheck.sh | 2 +- services/ir/prepare.mk | 2 +- services/morph_chain/artifacts.mk | 46 ++++++++++++++-------------- services/nats/docker-compose.yml | 4 +-- services/storage/.storage.env | 10 +++--- services/storage/artifacts.mk | 4 +-- services/storage/docker-compose.yml | 32 +++++++++---------- services/storage/healthcheck.sh | 2 +- 22 files changed, 105 insertions(+), 116 deletions(-) rename neofs-adm.yml => frostfs-adm.yml (84%) rename neofs_config.mk => frostfs_config.mk (100%) diff --git a/.env b/.env index 01ecbc3..cb42a52 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ # Basenet settings -LOCAL_DOMAIN=neofs.devenv +LOCAL_DOMAIN=frostfs.devenv IPV4_PREFIX=192.168.130 CA_CERTS_TRUSTED_STORE=/etc/ssl/certs @@ -13,11 +13,11 @@ CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.16.0 NEOGO_VERSION=0.99.4 NEOGO_IMAGE=nspccdev/neo-go -# NeoFS InnerRing nodes +# FrostFS InnerRing nodes IR_VERSION=0.34.0 IR_IMAGE=nspccdev/neofs-ir -# NeoFS Storage nodes +# FrostFS Storage nodes NODE_VERSION=0.34.0 NODE_IMAGE=nspccdev/neofs-storage @@ -41,20 +41,20 @@ S3_GW_IMAGE=truecloudlab/frostfs-s3-gw COREDNS_VERSION=v016 COREDNS_IMAGE=nspccdev/coredns -# NeoFS LOCODE database +# FrostFS LOCODE database LOCODE_DB_URL=https://github.com/nspcc-dev/neofs-locode-db/releases/download/v0.3.0/locode_db.gz #LOCODE_DB_PATH=/path/to/locode_db -# NeoFS CLI binary -NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.34.0/neofs-cli-amd64.tar.gz -#NEOFS_CLI_PATH=/path/to/neofs-cli-binary +# FrostFS CLI binary +FROSTFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.34.0/neofs-cli-amd64.tar.gz +#FROSTFS_CLI_PATH=/path/to/frostfs-cli-binary -# NeoFS ADM tool binary -NEOFS_ADM_VERSION=v0.34.0 -NEOFS_ADM_URL=https://github.com/nspcc-dev/neofs-node/releases/download/${NEOFS_ADM_VERSION}/neofs-adm-amd64.tar.gz -#NEOFS_ADM_PATH=/path/to/neofs-adm-binary +# FrostFS ADM tool binary +FROSTFS_ADM_VERSION=v0.34.0 +FROSTFS_ADM_URL=https://github.com/nspcc-dev/neofs-node/releases/download/${FROSTFS_ADM_VERSION}/neofs-adm-amd64.tar.gz +#FROSTFS_ADM_PATH=/path/to/frostfs-adm-binary -# Compiled NeoFS Smart Contracts -NEOFS_CONTRACTS_VERSION=v0.16.0 -NEOFS_CONTRACTS_URL=https://github.com/nspcc-dev/neofs-contract/releases/download/${NEOFS_CONTRACTS_VERSION}/neofs-contract-${NEOFS_CONTRACTS_VERSION}.tar.gz -#NEOFS_CONTRACTS_PATH=/path/to/unpacked/neofs-contracts-dir +# Compiled FrostFS Smart Contracts +FROSTFS_CONTRACTS_VERSION=v0.16.0 +FROSTFS_CONTRACTS_URL=https://github.com/nspcc-dev/neofs-contract/releases/download/${FROSTFS_CONTRACTS_VERSION}/neofs-contract-${FROSTFS_CONTRACTS_VERSION}.tar.gz +#FROSTFS_CONTRACTS_PATH=/path/to/unpacked/frostfs-contracts-dir diff --git a/Makefile b/Makefile index 6e0ca96..59fc415 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ include .env # help target include help.mk -# update NeoFS global config targets -include neofs_config.mk +# update FrostFS global config targets +include frostfs_config.mk # Targets to get required artifacts and external resources for each service include services/*/artifacts.mk @@ -61,24 +61,24 @@ get: $(foreach SVC, $(GET_SVCS), get.$(SVC)) .PHONY: up up: up/basic @$(foreach SVC, $(START_SVCS), $(shell docker-compose -f services/$(SVC)/docker-compose.yml up -d)) - @echo "Full NeoFS Developer Environment is ready" + @echo "Full FrostFS Developer Environment is ready" -# Build up NeoFS +# Build up FrostFS .PHONY: up/basic up/basic: up/bootstrap @$(foreach SVC, $(START_BASIC), $(shell docker-compose -f services/$(SVC)/docker-compose.yml up -d)) @./bin/tick.sh @./bin/config.sh string SystemDNS container - @echo "Basic NeoFS Developer Environment is ready" + @echo "Basic FrostFS Developer Environment is ready" # Start bootstrap services .PHONY: up/bootstrap up/bootstrap: get vendor/hosts @$(foreach SVC, $(START_BOOTSTRAP), $(shell docker-compose -f services/$(SVC)/docker-compose.yml up -d)) @source ./bin/helper.sh - @./vendor/neofs-adm --config neofs-adm.yml morph init --alphabet-wallets ./services/ir --contracts vendor/contracts || die "Failed to initialize Alphabet wallets" - @for f in ./services/storage/wallet*.json; do echo "Transfer GAS to wallet $${f}" && ./vendor/neofs-adm -c neofs-adm.yml morph refill-gas --storage-wallet $${f} --gas 10.0 --alphabet-wallets services/ir || die "Failed to transfer GAS to alphabet wallets"; done - @echo "NeoFS sidechain environment is deployed" + @./vendor/frostfs-adm --config frostfs-adm.yml morph init --alphabet-wallets ./services/ir --contracts vendor/contracts || die "Failed to initialize Alphabet wallets" + @for f in ./services/storage/wallet*.json; do echo "Transfer GAS to wallet $${f}" && ./vendor/frostfs-adm -c frostfs-adm.yml morph refill-gas --storage-wallet $${f} --gas 10.0 --alphabet-wallets services/ir || die "Failed to transfer GAS to alphabet wallets"; done + @echo "FrostFS sidechain environment is deployed" # Build up certain service .PHONY: up/% @@ -89,7 +89,7 @@ up/%: get vendor/hosts # Stop environment .PHONY: down down: down/add down/basic down/bootstrap - @echo "Full NeoFS Developer Environment is down" + @echo "Full FrostFS Developer Environment is down" .PHONY: down/add down/add: diff --git a/bin/config.sh b/bin/config.sh index f63a49c..0351f7c 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -16,7 +16,7 @@ CONFIG_IMG="${CONFIG_IMG:-/wallets/config.yml}" NETMAP_ADDR=$(bin/resolve.sh netmap.neofs) || die "Failed to resolve 'netmap.neofs' domain name" -# NeoFS configuration record: variable type [string|int|etc], +# FrostFS configuration record: variable type [string|int|etc], # key is a string and value is a constant of given type TYPE=${1} KEY=${2} @@ -27,7 +27,7 @@ VALUE="${3}" [ -z "$VALUE" ] && echo "Empty config value" && exit 1 # Internal variables -if [[ -z "${NEOFS_NOTARY_DISABLED}" ]]; then +if [[ -z "${FROSTFS_NOTARY_DISABLED}" ]]; then ADDR=$(jq -r .accounts[2].address < "${WALLET}" || die "Cannot get address from ${WALLET}") else ADDR=$(jq -r .accounts[0].address < "${WALLET}" || die "Cannot get address from ${WALLET}") diff --git a/bin/deposit.sh b/bin/deposit.sh index 07610a5..f591178 100755 --- a/bin/deposit.sh +++ b/bin/deposit.sh @@ -32,4 +32,4 @@ ${NEOGO} wallet nep17 transfer \ --from ${ADDR} --force \ --to ${CONTRACT_ADDR} \ --token GAS \ - --amount ${DEPOSIT} || die "Cannot transfer GAS to NeoFS contract" + --amount ${DEPOSIT} || die "Cannot transfer GAS to FrostFS contract" diff --git a/bin/tick.sh b/bin/tick.sh index 8c89a90..cbbaaa9 100755 --- a/bin/tick.sh +++ b/bin/tick.sh @@ -15,7 +15,7 @@ WALLET="${WALLET:-services/chain/node-wallet.json}" CONFIG_IMG="${CONFIG_IMG:-/wallets/config.yml}" # Internal variables -if [[ -z "${NEOFS_NOTARY_DISABLED}" ]]; then +if [[ -z "${FROSTFS_NOTARY_DISABLED}" ]]; then ADDR=$(jq -r .accounts[2].address < "${WALLET}" || die "Cannot get address from ${WALLET}") else ADDR=$(jq -r .accounts[0].address < "${WALLET}" || die "Cannot get address from ${WALLET}") @@ -33,7 +33,7 @@ EPOCH=$(${NEOGO} contract testinvokefunction \ | grep 'value' | awk -F'"' '{ print $4 }') \ || die "Cannot fetch epoch from netmap contract" -echo "Updating NeoFS epoch to $((EPOCH+1))" +echo "Updating FrostFS epoch to $((EPOCH+1))" # shellcheck disable=SC2086 ${NEOGO} contract invokefunction \ diff --git a/docs/notary.md b/docs/notary.md index eab01f7..66cd713 100644 --- a/docs/notary.md +++ b/docs/notary.md @@ -44,14 +44,14 @@ network map. 3. Enable helper commands To enable helper commands such as `make tick.epoch` or `make update.epoch_duration` -make sure to export non-empty `NEOFS_NOTARY_DISABLED` environment variable. +make sure to export non-empty `FROSTFS_NOTARY_DISABLED` environment variable. ``` -$ export NEOFS_NOTARY_DISABLED=1 +$ export FROSTFS_NOTARY_DISABLED=1 ``` Use `unset` command to return it back. ``` -$ unset NEOFS_NOTARY_DISABLED +$ unset FROSTFS_NOTARY_DISABLED ``` # Enable notary service in main chain diff --git a/neofs-adm.yml b/frostfs-adm.yml similarity index 84% rename from neofs-adm.yml rename to frostfs-adm.yml index dc10a6e..ba2039c 100644 --- a/neofs-adm.yml +++ b/frostfs-adm.yml @@ -1,4 +1,4 @@ -rpc-endpoint: http://morph-chain.neofs.devenv:30333 +rpc-endpoint: http://morph-chain.frostfs.devenv:30333 network: max_object_size: 67108864 epoch_duration: 240 diff --git a/neofs_config.mk b/frostfs_config.mk similarity index 100% rename from neofs_config.mk rename to frostfs_config.mk diff --git a/services/chain/artifacts.mk b/services/chain/artifacts.mk index 26548de..186b634 100644 --- a/services/chain/artifacts.mk +++ b/services/chain/artifacts.mk @@ -1,4 +1,4 @@ -# Download privnet chain dump with pre-deployed NeoFS contracts +# Download privnet chain dump with pre-deployed FrostFS contracts get.chain: CHAIN_DUMP_NAME=devenv.dump. get.chain: CHAIN_PATH?= diff --git a/services/chain/docker-compose.yml b/services/chain/docker-compose.yml index 3fe1698..1db47e2 100644 --- a/services/chain/docker-compose.yml +++ b/services/chain/docker-compose.yml @@ -2,7 +2,7 @@ version: "2.4" services: - neofs_main_chain: + frostfs_main_chain: image: ${NEOGO_IMAGE}:${NEOGO_VERSION} container_name: main_chain command: ["node", "--config-path", "/config", "--privnet", "--debug"] diff --git a/services/chain/protocol.privnet.yml b/services/chain/protocol.privnet.yml index d614613..d9a6189 100644 --- a/services/chain/protocol.privnet.yml +++ b/services/chain/protocol.privnet.yml @@ -41,17 +41,6 @@ ApplicationConfiguration: UnlockWallet: Path: "./wallets/node-wallet.json" Password: "one" - Oracle: - Enabled: true - NeoFS: - Nodes: - - s01.neofs.devenv:8080 - - s02.neofs.devenv:8080 - - s03.neofs.devenv:8080 - - s04.neofs.devenv:8080 - UnlockWallet: - Path: "./wallets/node-wallet.json" - Password: "one" P2PNotary: Enabled: false UnlockWallet: diff --git a/services/ir/.ir.env b/services/ir/.ir.env index 9c970b6..f5860e8 100644 --- a/services/ir/.ir.env +++ b/services/ir/.ir.env @@ -31,7 +31,7 @@ NEOFS_IR_EMIT_STORAGE_AMOUNT=1000000000 NEOFS_IR_NETMAP_CLEANER_ENABLED=true NEOFS_IR_CONTRACTS_NEOFS=f5dba2f67baa3cbb5595f0a7e46adf564ec9407a -NEOFS_IR_CONTRACTS_PROCESSING=37d3232083dd2c1bed76bb28d1c992fc6262f699 +NEOFS_IR_CONTRACTS_PROCESSING=332016219b9eb48348fb12694409dbefe29bdf30 NEOFS_IR_MORPH_VALIDATORS=02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2 NEOFS_IR_AUDIT_PDP_MAX_SLEEP_INTERVAL=100ms diff --git a/services/ir/artifacts.mk b/services/ir/artifacts.mk index d85afcd..1a8311b 100644 --- a/services/ir/artifacts.mk +++ b/services/ir/artifacts.mk @@ -1,44 +1,44 @@ -# Get NeoFS IR artifacts (LOCODE database and NeoFS CLI) +# Get FrostFS IR artifacts (LOCODE database and FrostFS CLI) LOCODE_DB_ARCHIVE_PATH=./vendor LOCODE_DB_ARCHIVE_FILE=locode_db.gz get.ir: get.locode get.cli -# Get NeoFS LOCODE database +# Get FrostFS LOCODE database get.locode: LOCODE_DB_PATH?= get.locode: @mkdir -p ${LOCODE_DB_ARCHIVE_PATH} ifeq (${LOCODE_DB_PATH},) - @echo "⇒ Download NeoFS LOCODE database from ${LOCODE_DB_URL}" + @echo "⇒ Download FrostFS LOCODE database from ${LOCODE_DB_URL}" @curl \ -sSL "${LOCODE_DB_URL}" \ -o ${LOCODE_DB_ARCHIVE_PATH}/${LOCODE_DB_ARCHIVE_FILE} else - @echo "⇒ Copy local archive of NeoFS LOCODE database from ${LOCODE_DB_PATH}" + @echo "⇒ Copy local archive of FrostFS LOCODE database from ${LOCODE_DB_PATH}" @cp ${LOCODE_DB_PATH} ${LOCODE_DB_ARCHIVE_PATH}/${LOCODE_DB_ARCHIVE_FILE} endif gzip -dfk ${LOCODE_DB_ARCHIVE_PATH}/${LOCODE_DB_ARCHIVE_FILE} -# Download NeoFS CLI +# Download FrostFS CLI .ONESHELL: -get.cli: NEOFS_CLI_FILE=./vendor/neofs-cli -get.cli: NEOFS_CLI_ARCHIVE_FILE=${NEOFS_CLI_FILE}.tar.gz -get.cli: NEOFS_CLI_PATH?= +get.cli: FROSTFS_CLI_FILE=./vendor/frostfs-cli +get.cli: FROSTFS_CLI_ARCHIVE_FILE=${FROSTFS_CLI_FILE}.tar.gz +get.cli: FROSTFS_CLI_PATH?= get.cli: @mkdir -p ./vendor -ifeq (${NEOFS_CLI_PATH},) - @echo "⇒ Download NeoFS CLI binary from ${NEOFS_CLI_URL}" +ifeq (${FROSTFS_CLI_PATH},) + @echo "⇒ Download FrostFS CLI binary from ${FROSTFS_CLI_URL}" @curl \ - -sSL "${NEOFS_CLI_URL}" \ - -o ${NEOFS_CLI_ARCHIVE_FILE} - @tar -xvf ${NEOFS_CLI_ARCHIVE_FILE} -C ./vendor | xargs -I {} \ - mv ./vendor/{} ${NEOFS_CLI_FILE} - @rm ${NEOFS_CLI_ARCHIVE_FILE} + -sSL "${FROSTFS_CLI_URL}" \ + -o ${FROSTFS_CLI_ARCHIVE_FILE} + @tar -xvf ${FROSTFS_CLI_ARCHIVE_FILE} -C ./vendor | xargs -I {} \ + mv ./vendor/{} ${FROSTFS_CLI_FILE} + @rm ${FROSTFS_CLI_ARCHIVE_FILE} else - @echo "⇒ Copy local binary from ${NEOFS_CLI_PATH}" - @cp ${NEOFS_CLI_PATH} ${NEOFS_CLI_FILE} + @echo "⇒ Copy local binary from ${FROSTFS_CLI_PATH}" + @cp ${FROSTFS_CLI_PATH} ${FROSTFS_CLI_FILE} endif diff --git a/services/ir/docker-compose.yml b/services/ir/docker-compose.yml index 929b99a..cf23e22 100644 --- a/services/ir/docker-compose.yml +++ b/services/ir/docker-compose.yml @@ -19,7 +19,7 @@ services: - ./az.key:/wallet01.key - ./../../vendor/hosts:/etc/hosts - ./../../vendor/locode_db:/locode/db - - ./../../vendor/neofs-cli:/neofs-cli + - ./../../vendor/frostfs-cli:/frostfs-cli - ./healthcheck.sh:/healthcheck.sh env_file: [ ".env", ".ir.env", ".int_test.env" ] environment: diff --git a/services/ir/healthcheck.sh b/services/ir/healthcheck.sh index 2934969..6e8ac3f 100755 --- a/services/ir/healthcheck.sh +++ b/services/ir/healthcheck.sh @@ -1,6 +1,6 @@ #!/bin/sh -/neofs-cli control healthcheck \ +/frostfs-cli control healthcheck \ --endpoint "$NEOFS_IR_CONTROL_GRPC_ENDPOINT" \ --wallet /wallet01.key --ir | grep "Health status: READY" diff --git a/services/ir/prepare.mk b/services/ir/prepare.mk index 00a9253..5959964 100644 --- a/services/ir/prepare.mk +++ b/services/ir/prepare.mk @@ -1,3 +1,3 @@ -# Deposit GAS from default wallet to NeoFS privnet contract +# Deposit GAS from default wallet to FrostFS privnet contract prepare.ir: @./bin/deposit.sh diff --git a/services/morph_chain/artifacts.mk b/services/morph_chain/artifacts.mk index be6febf..d3c6ec7 100644 --- a/services/morph_chain/artifacts.mk +++ b/services/morph_chain/artifacts.mk @@ -1,35 +1,35 @@ -# Download NeoFS Contracts and Adm tool to deploy environment +# Download FrostFS Contracts and Adm tool to deploy environment get.morph_chain: get.contracts get.adm -# Download NeoFS Contracts -get.contracts: NEOFS_CONTRACTS_DEST=./vendor/contracts -get.contracts: NEOFS_CONTRACTS_ARCHIVE=neofs-contracts.tar.gz +# Download FrostFS Contracts +get.contracts: FROSTFS_CONTRACTS_DEST=./vendor/contracts +get.contracts: FROSTFS_CONTRACTS_ARCHIVE=frostfs-contracts.tar.gz get.contracts: - @mkdir -p ${NEOFS_CONTRACTS_DEST} + @mkdir -p ${FROSTFS_CONTRACTS_DEST} -ifeq (${NEOFS_CONTRACTS_PATH},) - @echo "⇒ Download compiled NeoFS contracts from ${NEOFS_CONTRACTS_URL}" - @curl -sSL ${NEOFS_CONTRACTS_URL} -o ${NEOFS_CONTRACTS_ARCHIVE} - @tar -xf ${NEOFS_CONTRACTS_ARCHIVE} -C ${NEOFS_CONTRACTS_DEST} --strip-components 1 - @rm ${NEOFS_CONTRACTS_ARCHIVE} +ifeq (${FROSTFS_CONTRACTS_PATH},) + @echo "⇒ Download compiled FrostFS contracts from ${FROSTFS_CONTRACTS_URL}" + @curl -sSL ${FROSTFS_CONTRACTS_URL} -o ${FROSTFS_CONTRACTS_ARCHIVE} + @tar -xf ${FROSTFS_CONTRACTS_ARCHIVE} -C ${FROSTFS_CONTRACTS_DEST} --strip-components 1 + @rm ${FROSTFS_CONTRACTS_ARCHIVE} else - @echo "⇒ Copy compiled contracts from ${NEOFS_CONTRACTS_PATH}" - @cp -r ${NEOFS_CONTRACTS_PATH}/* ${NEOFS_CONTRACTS_DEST} + @echo "⇒ Copy compiled contracts from ${FROSTFS_CONTRACTS_PATH}" + @cp -r ${FROSTFS_CONTRACTS_PATH}/* ${FROSTFS_CONTRACTS_DEST} endif -# Download NeoFS ADM tool -get.adm: NEOFS_ADM_DEST=./vendor/neofs-adm -get.adm: NEOFS_ADM_ARCHIVE=neofs-adm.tar.gz +# Download FrostFS ADM tool +get.adm: FROSTFS_ADM_DEST=./vendor/frostfs-adm +get.adm: FROSTFS_ADM_ARCHIVE=frostfs-adm.tar.gz get.adm: -ifeq (${NEOFS_ADM_PATH},) - @echo "⇒ Download NeoFS ADM binary from ${NEOFS_ADM_URL}" - @curl -sSL ${NEOFS_ADM_URL} -o ${NEOFS_ADM_ARCHIVE} - @tar -xvf ${NEOFS_ADM_ARCHIVE} -C ./vendor | xargs -I {} \ - mv ./vendor/{} ${NEOFS_ADM_DEST} - @rm ${NEOFS_ADM_ARCHIVE} +ifeq (${FROSTFS_ADM_PATH},) + @echo "⇒ Download FrostFS ADM binary from ${FROSTFS_ADM_URL}" + @curl -sSL ${FROSTFS_ADM_URL} -o ${FROSTFS_ADM_ARCHIVE} + @tar -xvf ${FROSTFS_ADM_ARCHIVE} -C ./vendor | xargs -I {} \ + mv ./vendor/{} ${FROSTFS_ADM_DEST} + @rm ${FROSTFS_ADM_ARCHIVE} else - @echo "⇒ Copy neofs-adm binary from ${NEOFS_ADM_PATH}" - @cp ${NEOFS_ADM_PATH} ${NEOFS_ADM_DEST} + @echo "⇒ Copy frostfs-adm binary from ${FROSTFS_ADM_PATH}" + @cp ${FROSTFS_ADM_PATH} ${FROSTFS_ADM_DEST} endif diff --git a/services/nats/docker-compose.yml b/services/nats/docker-compose.yml index d69d10d..d05dd04 100644 --- a/services/nats/docker-compose.yml +++ b/services/nats/docker-compose.yml @@ -16,13 +16,13 @@ services: ipv4_address: ${IPV4_PREFIX}.101 volumes: - ./../../vendor/hosts:/etc/hosts - - ./nats.conf:/etc/nats/neofs-nats-server.conf + - ./nats.conf:/etc/nats/frostfs-nats-server.conf - ./server-cert.pem:/certs/server-cert.pem - ./server-key.pem:/certs/server-key.pem - ./ca-cert.pem:/certs/ca-cert.pem stop_signal: SIGKILL env_file: [ ".env", ".int_test.env" ] - command: ["-c", "/etc/nats/neofs-nats-server.conf"] + command: ["-c", "/etc/nats/frostfs-nats-server.conf"] networks: nats_int: diff --git a/services/storage/.storage.env b/services/storage/.storage.env index 748eac6..50c0d6f 100644 --- a/services/storage/.storage.env +++ b/services/storage/.storage.env @@ -35,14 +35,14 @@ NEOFS_MORPH_RPC_ENDPOINT_0_ADDRESS=ws://morph-chain:30333/ws #NEOFS_APICLIENT_DIAL_TIMEOUT=1m # Common storage node attribute -NEOFS_NODE_ATTRIBUTE_0=User-Agent:NeoFS\/0.33 +NEOFS_NODE_ATTRIBUTE_0=User-Agent:FrostFS\/0.33 NEOFS_NODE_NOTIFICATION_ENABLED=true -NEOFS_NODE_NOTIFICATION_ENDPOINT=tls://nats.neofs.devenv:4222 +NEOFS_NODE_NOTIFICATION_ENDPOINT=tls://nats.frostfs.devenv:4222 NEOFS_NODE_NOTIFICATION_DEFAULT_TOPIC=test -NEOFS_NODE_NOTIFICATION_CERTIFICATE=/etc/neofs-node/nats.tls.cert -NEOFS_NODE_NOTIFICATION_KEY=/etc/neofs-node/nats.tls.key -NEOFS_NODE_NOTIFICATION_CA=/etc/neofs-node/nats.ca.crt +NEOFS_NODE_NOTIFICATION_CERTIFICATE=/etc/frostfs-node/nats.tls.cert +NEOFS_NODE_NOTIFICATION_KEY=/etc/frostfs-node/nats.tls.key +NEOFS_NODE_NOTIFICATION_CA=/etc/frostfs-node/nats.ca.crt # Tree section NEOFS_TREE_ENABLED=True diff --git a/services/storage/artifacts.mk b/services/storage/artifacts.mk index 7132ac1..30d60be 100644 --- a/services/storage/artifacts.mk +++ b/services/storage/artifacts.mk @@ -1,7 +1,7 @@ -# Create new TLS certs to NeoFS node +# Create new TLS certs to FrostFS node STORAGE_DIR=$(abspath services/storage) get.storage: - @echo "⇒ Creating TLS certs to NeoFS node" + @echo "⇒ Creating TLS certs to FrostFS node" ${STORAGE_DIR}/generate_cert.sh ${LOCAL_DOMAIN} > /dev/null diff --git a/services/storage/docker-compose.yml b/services/storage/docker-compose.yml index 6bf8939..3e94644 100644 --- a/services/storage/docker-compose.yml +++ b/services/storage/docker-compose.yml @@ -16,13 +16,13 @@ services: - ./wallet01.json:/wallet.json - ./../../vendor/hosts:/etc/hosts - storage_s01:/storage - - ./../../vendor/neofs-cli:/neofs-cli + - ./../../vendor/frostfs-cli:/frostfs-cli - ./cli-cfg.yml:/cli-cfg.yml - ./healthcheck.sh:/healthcheck.sh - ./s04tls.crt:/etc/ssl/certs/s04tls.crt - - ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert - - ../nats/client-key.pem:/etc/neofs-node/nats.tls.key - - ../nats/ca-cert.pem:/etc/neofs-node/nats.ca.crt + - ../nats/client-cert.pem:/etc/frostfs-node/nats.tls.cert + - ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key + - ../nats/ca-cert.pem:/etc/frostfs-node/nats.ca.crt stop_signal: SIGKILL env_file: [ ".env", ".storage.env", ".int_test.env" ] environment: @@ -54,13 +54,13 @@ services: - ./wallet02.json:/wallet.json - ./../../vendor/hosts:/etc/hosts - storage_s02:/storage - - ./../../vendor/neofs-cli:/neofs-cli + - ./../../vendor/frostfs-cli:/frostfs-cli - ./cli-cfg.yml:/cli-cfg.yml - ./healthcheck.sh:/healthcheck.sh - ./s04tls.crt:/etc/ssl/certs/s04tls.crt - - ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert - - ../nats/client-key.pem:/etc/neofs-node/nats.tls.key - - ../nats/ca-cert.pem:/etc/neofs-node/nats.ca.crt + - ../nats/client-cert.pem:/etc/frostfs-node/nats.tls.cert + - ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key + - ../nats/ca-cert.pem:/etc/frostfs-node/nats.ca.crt stop_signal: SIGKILL env_file: [ ".env", ".storage.env", ".int_test.env" ] environment: @@ -92,13 +92,13 @@ services: - ./wallet03.json:/wallet.json - ./../../vendor/hosts:/etc/hosts - storage_s03:/storage - - ./../../vendor/neofs-cli:/neofs-cli + - ./../../vendor/frostfs-cli:/frostfs-cli - ./cli-cfg.yml:/cli-cfg.yml - ./healthcheck.sh:/healthcheck.sh - ./s04tls.crt:/etc/ssl/certs/s04tls.crt - - ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert - - ../nats/client-key.pem:/etc/neofs-node/nats.tls.key - - ../nats/ca-cert.pem:/etc/neofs-node/nats.ca.crt + - ../nats/client-cert.pem:/etc/frostfs-node/nats.tls.cert + - ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key + - ../nats/ca-cert.pem:/etc/frostfs-node/nats.ca.crt stop_signal: SIGKILL env_file: [ ".env", ".storage.env", ".int_test.env" ] environment: @@ -130,14 +130,14 @@ services: - ./wallet04.json:/wallet.json - ./../../vendor/hosts:/etc/hosts - storage_s04:/storage - - ./../../vendor/neofs-cli:/neofs-cli + - ./../../vendor/frostfs-cli:/frostfs-cli - ./cli-cfg.yml:/cli-cfg.yml - ./healthcheck.sh:/healthcheck.sh - ./s04tls.crt:/tls.crt - ./s04tls.key:/tls.key - - ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert - - ../nats/client-key.pem:/etc/neofs-node/nats.tls.key - - ../nats/ca-cert.pem:/etc/neofs-node/nats.ca.crt + - ../nats/client-cert.pem:/etc/frostfs-node/nats.tls.cert + - ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key + - ../nats/ca-cert.pem:/etc/frostfs-node/nats.ca.crt stop_signal: SIGKILL env_file: [ ".env", ".storage.env", ".int_test.env" ] environment: diff --git a/services/storage/healthcheck.sh b/services/storage/healthcheck.sh index fdbf390..bdc5baf 100755 --- a/services/storage/healthcheck.sh +++ b/services/storage/healthcheck.sh @@ -1,5 +1,5 @@ #!/bin/sh -/neofs-cli control healthcheck -c /cli-cfg.yml \ +/frostfs-cli control healthcheck -c /cli-cfg.yml \ --endpoint "$NEOFS_CONTROL_GRPC_ENDPOINT" | grep "Health status: READY"