[TrueCloudLab#1] Update Makefile, scripts and compose files

Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
This commit is contained in:
Denis Kirillov 2022-12-21 15:34:14 +03:00 committed by Alex Vanin
parent ffe5012ab6
commit 09533ec3f7
22 changed files with 105 additions and 116 deletions

30
.env
View file

@ -1,5 +1,5 @@
# Basenet settings # Basenet settings
LOCAL_DOMAIN=neofs.devenv LOCAL_DOMAIN=frostfs.devenv
IPV4_PREFIX=192.168.130 IPV4_PREFIX=192.168.130
CA_CERTS_TRUSTED_STORE=/etc/ssl/certs 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_VERSION=0.99.4
NEOGO_IMAGE=nspccdev/neo-go NEOGO_IMAGE=nspccdev/neo-go
# NeoFS InnerRing nodes # FrostFS InnerRing nodes
IR_VERSION=0.34.0 IR_VERSION=0.34.0
IR_IMAGE=nspccdev/neofs-ir IR_IMAGE=nspccdev/neofs-ir
# NeoFS Storage nodes # FrostFS Storage nodes
NODE_VERSION=0.34.0 NODE_VERSION=0.34.0
NODE_IMAGE=nspccdev/neofs-storage NODE_IMAGE=nspccdev/neofs-storage
@ -41,20 +41,20 @@ S3_GW_IMAGE=truecloudlab/frostfs-s3-gw
COREDNS_VERSION=v016 COREDNS_VERSION=v016
COREDNS_IMAGE=nspccdev/coredns 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_URL=https://github.com/nspcc-dev/neofs-locode-db/releases/download/v0.3.0/locode_db.gz
#LOCODE_DB_PATH=/path/to/locode_db #LOCODE_DB_PATH=/path/to/locode_db
# NeoFS CLI binary # FrostFS CLI binary
NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.34.0/neofs-cli-amd64.tar.gz FROSTFS_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_PATH=/path/to/frostfs-cli-binary
# NeoFS ADM tool binary # FrostFS ADM tool binary
NEOFS_ADM_VERSION=v0.34.0 FROSTFS_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 FROSTFS_ADM_URL=https://github.com/nspcc-dev/neofs-node/releases/download/${FROSTFS_ADM_VERSION}/neofs-adm-amd64.tar.gz
#NEOFS_ADM_PATH=/path/to/neofs-adm-binary #FROSTFS_ADM_PATH=/path/to/frostfs-adm-binary
# Compiled NeoFS Smart Contracts # Compiled FrostFS Smart Contracts
NEOFS_CONTRACTS_VERSION=v0.16.0 FROSTFS_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 FROSTFS_CONTRACTS_URL=https://github.com/nspcc-dev/neofs-contract/releases/download/${FROSTFS_CONTRACTS_VERSION}/neofs-contract-${FROSTFS_CONTRACTS_VERSION}.tar.gz
#NEOFS_CONTRACTS_PATH=/path/to/unpacked/neofs-contracts-dir #FROSTFS_CONTRACTS_PATH=/path/to/unpacked/frostfs-contracts-dir

View file

@ -10,8 +10,8 @@ include .env
# help target # help target
include help.mk include help.mk
# update NeoFS global config targets # update FrostFS global config targets
include neofs_config.mk include frostfs_config.mk
# Targets to get required artifacts and external resources for each service # Targets to get required artifacts and external resources for each service
include services/*/artifacts.mk include services/*/artifacts.mk
@ -61,24 +61,24 @@ get: $(foreach SVC, $(GET_SVCS), get.$(SVC))
.PHONY: up .PHONY: up
up: up/basic up: up/basic
@$(foreach SVC, $(START_SVCS), $(shell docker-compose -f services/$(SVC)/docker-compose.yml up -d)) @$(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 .PHONY: up/basic
up/basic: up/bootstrap up/basic: up/bootstrap
@$(foreach SVC, $(START_BASIC), $(shell docker-compose -f services/$(SVC)/docker-compose.yml up -d)) @$(foreach SVC, $(START_BASIC), $(shell docker-compose -f services/$(SVC)/docker-compose.yml up -d))
@./bin/tick.sh @./bin/tick.sh
@./bin/config.sh string SystemDNS container @./bin/config.sh string SystemDNS container
@echo "Basic NeoFS Developer Environment is ready" @echo "Basic FrostFS Developer Environment is ready"
# Start bootstrap services # Start bootstrap services
.PHONY: up/bootstrap .PHONY: up/bootstrap
up/bootstrap: get vendor/hosts up/bootstrap: get vendor/hosts
@$(foreach SVC, $(START_BOOTSTRAP), $(shell docker-compose -f services/$(SVC)/docker-compose.yml up -d)) @$(foreach SVC, $(START_BOOTSTRAP), $(shell docker-compose -f services/$(SVC)/docker-compose.yml up -d))
@source ./bin/helper.sh @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" @./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/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 @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 "NeoFS sidechain environment is deployed" @echo "FrostFS sidechain environment is deployed"
# Build up certain service # Build up certain service
.PHONY: up/% .PHONY: up/%
@ -89,7 +89,7 @@ up/%: get vendor/hosts
# Stop environment # Stop environment
.PHONY: down .PHONY: down
down: down/add down/basic down/bootstrap down: down/add down/basic down/bootstrap
@echo "Full NeoFS Developer Environment is down" @echo "Full FrostFS Developer Environment is down"
.PHONY: down/add .PHONY: down/add
down/add: down/add:

View file

@ -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" 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 # key is a string and value is a constant of given type
TYPE=${1} TYPE=${1}
KEY=${2} KEY=${2}
@ -27,7 +27,7 @@ VALUE="${3}"
[ -z "$VALUE" ] && echo "Empty config value" && exit 1 [ -z "$VALUE" ] && echo "Empty config value" && exit 1
# Internal variables # 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}") ADDR=$(jq -r .accounts[2].address < "${WALLET}" || die "Cannot get address from ${WALLET}")
else else
ADDR=$(jq -r .accounts[0].address < "${WALLET}" || die "Cannot get address from ${WALLET}") ADDR=$(jq -r .accounts[0].address < "${WALLET}" || die "Cannot get address from ${WALLET}")

View file

@ -32,4 +32,4 @@ ${NEOGO} wallet nep17 transfer \
--from ${ADDR} --force \ --from ${ADDR} --force \
--to ${CONTRACT_ADDR} \ --to ${CONTRACT_ADDR} \
--token GAS \ --token GAS \
--amount ${DEPOSIT} || die "Cannot transfer GAS to NeoFS contract" --amount ${DEPOSIT} || die "Cannot transfer GAS to FrostFS contract"

View file

@ -15,7 +15,7 @@ WALLET="${WALLET:-services/chain/node-wallet.json}"
CONFIG_IMG="${CONFIG_IMG:-/wallets/config.yml}" CONFIG_IMG="${CONFIG_IMG:-/wallets/config.yml}"
# Internal variables # 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}") ADDR=$(jq -r .accounts[2].address < "${WALLET}" || die "Cannot get address from ${WALLET}")
else else
ADDR=$(jq -r .accounts[0].address < "${WALLET}" || die "Cannot get address from ${WALLET}") 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 }') \ | grep 'value' | awk -F'"' '{ print $4 }') \
|| die "Cannot fetch epoch from netmap contract" || die "Cannot fetch epoch from netmap contract"
echo "Updating NeoFS epoch to $((EPOCH+1))" echo "Updating FrostFS epoch to $((EPOCH+1))"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
${NEOGO} contract invokefunction \ ${NEOGO} contract invokefunction \

View file

@ -44,14 +44,14 @@ network map.
3. Enable helper commands 3. Enable helper commands
To enable helper commands such as `make tick.epoch` or `make update.epoch_duration` 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. Use `unset` command to return it back.
``` ```
$ unset NEOFS_NOTARY_DISABLED $ unset FROSTFS_NOTARY_DISABLED
``` ```
# Enable notary service in main chain # Enable notary service in main chain

View file

@ -1,4 +1,4 @@
rpc-endpoint: http://morph-chain.neofs.devenv:30333 rpc-endpoint: http://morph-chain.frostfs.devenv:30333
network: network:
max_object_size: 67108864 max_object_size: 67108864
epoch_duration: 240 epoch_duration: 240

View file

@ -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_DUMP_NAME=devenv.dump.
get.chain: CHAIN_PATH?= get.chain: CHAIN_PATH?=

View file

@ -2,7 +2,7 @@
version: "2.4" version: "2.4"
services: services:
neofs_main_chain: frostfs_main_chain:
image: ${NEOGO_IMAGE}:${NEOGO_VERSION} image: ${NEOGO_IMAGE}:${NEOGO_VERSION}
container_name: main_chain container_name: main_chain
command: ["node", "--config-path", "/config", "--privnet", "--debug"] command: ["node", "--config-path", "/config", "--privnet", "--debug"]

View file

@ -41,17 +41,6 @@ ApplicationConfiguration:
UnlockWallet: UnlockWallet:
Path: "./wallets/node-wallet.json" Path: "./wallets/node-wallet.json"
Password: "one" 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: P2PNotary:
Enabled: false Enabled: false
UnlockWallet: UnlockWallet:

View file

@ -31,7 +31,7 @@ NEOFS_IR_EMIT_STORAGE_AMOUNT=1000000000
NEOFS_IR_NETMAP_CLEANER_ENABLED=true NEOFS_IR_NETMAP_CLEANER_ENABLED=true
NEOFS_IR_CONTRACTS_NEOFS=f5dba2f67baa3cbb5595f0a7e46adf564ec9407a NEOFS_IR_CONTRACTS_NEOFS=f5dba2f67baa3cbb5595f0a7e46adf564ec9407a
NEOFS_IR_CONTRACTS_PROCESSING=37d3232083dd2c1bed76bb28d1c992fc6262f699 NEOFS_IR_CONTRACTS_PROCESSING=332016219b9eb48348fb12694409dbefe29bdf30
NEOFS_IR_MORPH_VALIDATORS=02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2 NEOFS_IR_MORPH_VALIDATORS=02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2
NEOFS_IR_AUDIT_PDP_MAX_SLEEP_INTERVAL=100ms NEOFS_IR_AUDIT_PDP_MAX_SLEEP_INTERVAL=100ms

View file

@ -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_PATH=./vendor
LOCODE_DB_ARCHIVE_FILE=locode_db.gz LOCODE_DB_ARCHIVE_FILE=locode_db.gz
get.ir: get.locode get.cli get.ir: get.locode get.cli
# Get NeoFS LOCODE database # Get FrostFS LOCODE database
get.locode: LOCODE_DB_PATH?= get.locode: LOCODE_DB_PATH?=
get.locode: get.locode:
@mkdir -p ${LOCODE_DB_ARCHIVE_PATH} @mkdir -p ${LOCODE_DB_ARCHIVE_PATH}
ifeq (${LOCODE_DB_PATH},) ifeq (${LOCODE_DB_PATH},)
@echo "⇒ Download NeoFS LOCODE database from ${LOCODE_DB_URL}" @echo "⇒ Download FrostFS LOCODE database from ${LOCODE_DB_URL}"
@curl \ @curl \
-sSL "${LOCODE_DB_URL}" \ -sSL "${LOCODE_DB_URL}" \
-o ${LOCODE_DB_ARCHIVE_PATH}/${LOCODE_DB_ARCHIVE_FILE} -o ${LOCODE_DB_ARCHIVE_PATH}/${LOCODE_DB_ARCHIVE_FILE}
else 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} @cp ${LOCODE_DB_PATH} ${LOCODE_DB_ARCHIVE_PATH}/${LOCODE_DB_ARCHIVE_FILE}
endif endif
gzip -dfk ${LOCODE_DB_ARCHIVE_PATH}/${LOCODE_DB_ARCHIVE_FILE} gzip -dfk ${LOCODE_DB_ARCHIVE_PATH}/${LOCODE_DB_ARCHIVE_FILE}
# Download NeoFS CLI # Download FrostFS CLI
.ONESHELL: .ONESHELL:
get.cli: NEOFS_CLI_FILE=./vendor/neofs-cli get.cli: FROSTFS_CLI_FILE=./vendor/frostfs-cli
get.cli: NEOFS_CLI_ARCHIVE_FILE=${NEOFS_CLI_FILE}.tar.gz get.cli: FROSTFS_CLI_ARCHIVE_FILE=${FROSTFS_CLI_FILE}.tar.gz
get.cli: NEOFS_CLI_PATH?= get.cli: FROSTFS_CLI_PATH?=
get.cli: get.cli:
@mkdir -p ./vendor @mkdir -p ./vendor
ifeq (${NEOFS_CLI_PATH},) ifeq (${FROSTFS_CLI_PATH},)
@echo "⇒ Download NeoFS CLI binary from ${NEOFS_CLI_URL}" @echo "⇒ Download FrostFS CLI binary from ${FROSTFS_CLI_URL}"
@curl \ @curl \
-sSL "${NEOFS_CLI_URL}" \ -sSL "${FROSTFS_CLI_URL}" \
-o ${NEOFS_CLI_ARCHIVE_FILE} -o ${FROSTFS_CLI_ARCHIVE_FILE}
@tar -xvf ${NEOFS_CLI_ARCHIVE_FILE} -C ./vendor | xargs -I {} \ @tar -xvf ${FROSTFS_CLI_ARCHIVE_FILE} -C ./vendor | xargs -I {} \
mv ./vendor/{} ${NEOFS_CLI_FILE} mv ./vendor/{} ${FROSTFS_CLI_FILE}
@rm ${NEOFS_CLI_ARCHIVE_FILE} @rm ${FROSTFS_CLI_ARCHIVE_FILE}
else else
@echo "⇒ Copy local binary from ${NEOFS_CLI_PATH}" @echo "⇒ Copy local binary from ${FROSTFS_CLI_PATH}"
@cp ${NEOFS_CLI_PATH} ${NEOFS_CLI_FILE} @cp ${FROSTFS_CLI_PATH} ${FROSTFS_CLI_FILE}
endif endif

View file

@ -19,7 +19,7 @@ services:
- ./az.key:/wallet01.key - ./az.key:/wallet01.key
- ./../../vendor/hosts:/etc/hosts - ./../../vendor/hosts:/etc/hosts
- ./../../vendor/locode_db:/locode/db - ./../../vendor/locode_db:/locode/db
- ./../../vendor/neofs-cli:/neofs-cli - ./../../vendor/frostfs-cli:/frostfs-cli
- ./healthcheck.sh:/healthcheck.sh - ./healthcheck.sh:/healthcheck.sh
env_file: [ ".env", ".ir.env", ".int_test.env" ] env_file: [ ".env", ".ir.env", ".int_test.env" ]
environment: environment:

View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
/neofs-cli control healthcheck \ /frostfs-cli control healthcheck \
--endpoint "$NEOFS_IR_CONTROL_GRPC_ENDPOINT" \ --endpoint "$NEOFS_IR_CONTROL_GRPC_ENDPOINT" \
--wallet /wallet01.key --ir | --wallet /wallet01.key --ir |
grep "Health status: READY" grep "Health status: READY"

View file

@ -1,3 +1,3 @@
# Deposit GAS from default wallet to NeoFS privnet contract # Deposit GAS from default wallet to FrostFS privnet contract
prepare.ir: prepare.ir:
@./bin/deposit.sh @./bin/deposit.sh

View file

@ -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 get.morph_chain: get.contracts get.adm
# Download NeoFS Contracts # Download FrostFS Contracts
get.contracts: NEOFS_CONTRACTS_DEST=./vendor/contracts get.contracts: FROSTFS_CONTRACTS_DEST=./vendor/contracts
get.contracts: NEOFS_CONTRACTS_ARCHIVE=neofs-contracts.tar.gz get.contracts: FROSTFS_CONTRACTS_ARCHIVE=frostfs-contracts.tar.gz
get.contracts: get.contracts:
@mkdir -p ${NEOFS_CONTRACTS_DEST} @mkdir -p ${FROSTFS_CONTRACTS_DEST}
ifeq (${NEOFS_CONTRACTS_PATH},) ifeq (${FROSTFS_CONTRACTS_PATH},)
@echo "⇒ Download compiled NeoFS contracts from ${NEOFS_CONTRACTS_URL}" @echo "⇒ Download compiled FrostFS contracts from ${FROSTFS_CONTRACTS_URL}"
@curl -sSL ${NEOFS_CONTRACTS_URL} -o ${NEOFS_CONTRACTS_ARCHIVE} @curl -sSL ${FROSTFS_CONTRACTS_URL} -o ${FROSTFS_CONTRACTS_ARCHIVE}
@tar -xf ${NEOFS_CONTRACTS_ARCHIVE} -C ${NEOFS_CONTRACTS_DEST} --strip-components 1 @tar -xf ${FROSTFS_CONTRACTS_ARCHIVE} -C ${FROSTFS_CONTRACTS_DEST} --strip-components 1
@rm ${NEOFS_CONTRACTS_ARCHIVE} @rm ${FROSTFS_CONTRACTS_ARCHIVE}
else else
@echo "⇒ Copy compiled contracts from ${NEOFS_CONTRACTS_PATH}" @echo "⇒ Copy compiled contracts from ${FROSTFS_CONTRACTS_PATH}"
@cp -r ${NEOFS_CONTRACTS_PATH}/* ${NEOFS_CONTRACTS_DEST} @cp -r ${FROSTFS_CONTRACTS_PATH}/* ${FROSTFS_CONTRACTS_DEST}
endif endif
# Download NeoFS ADM tool # Download FrostFS ADM tool
get.adm: NEOFS_ADM_DEST=./vendor/neofs-adm get.adm: FROSTFS_ADM_DEST=./vendor/frostfs-adm
get.adm: NEOFS_ADM_ARCHIVE=neofs-adm.tar.gz get.adm: FROSTFS_ADM_ARCHIVE=frostfs-adm.tar.gz
get.adm: get.adm:
ifeq (${NEOFS_ADM_PATH},) ifeq (${FROSTFS_ADM_PATH},)
@echo "⇒ Download NeoFS ADM binary from ${NEOFS_ADM_URL}" @echo "⇒ Download FrostFS ADM binary from ${FROSTFS_ADM_URL}"
@curl -sSL ${NEOFS_ADM_URL} -o ${NEOFS_ADM_ARCHIVE} @curl -sSL ${FROSTFS_ADM_URL} -o ${FROSTFS_ADM_ARCHIVE}
@tar -xvf ${NEOFS_ADM_ARCHIVE} -C ./vendor | xargs -I {} \ @tar -xvf ${FROSTFS_ADM_ARCHIVE} -C ./vendor | xargs -I {} \
mv ./vendor/{} ${NEOFS_ADM_DEST} mv ./vendor/{} ${FROSTFS_ADM_DEST}
@rm ${NEOFS_ADM_ARCHIVE} @rm ${FROSTFS_ADM_ARCHIVE}
else else
@echo "⇒ Copy neofs-adm binary from ${NEOFS_ADM_PATH}" @echo "⇒ Copy frostfs-adm binary from ${FROSTFS_ADM_PATH}"
@cp ${NEOFS_ADM_PATH} ${NEOFS_ADM_DEST} @cp ${FROSTFS_ADM_PATH} ${FROSTFS_ADM_DEST}
endif endif

View file

@ -16,13 +16,13 @@ services:
ipv4_address: ${IPV4_PREFIX}.101 ipv4_address: ${IPV4_PREFIX}.101
volumes: volumes:
- ./../../vendor/hosts:/etc/hosts - ./../../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-cert.pem:/certs/server-cert.pem
- ./server-key.pem:/certs/server-key.pem - ./server-key.pem:/certs/server-key.pem
- ./ca-cert.pem:/certs/ca-cert.pem - ./ca-cert.pem:/certs/ca-cert.pem
stop_signal: SIGKILL stop_signal: SIGKILL
env_file: [ ".env", ".int_test.env" ] env_file: [ ".env", ".int_test.env" ]
command: ["-c", "/etc/nats/neofs-nats-server.conf"] command: ["-c", "/etc/nats/frostfs-nats-server.conf"]
networks: networks:
nats_int: nats_int:

View file

@ -35,14 +35,14 @@ NEOFS_MORPH_RPC_ENDPOINT_0_ADDRESS=ws://morph-chain:30333/ws
#NEOFS_APICLIENT_DIAL_TIMEOUT=1m #NEOFS_APICLIENT_DIAL_TIMEOUT=1m
# Common storage node attribute # 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_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_DEFAULT_TOPIC=test
NEOFS_NODE_NOTIFICATION_CERTIFICATE=/etc/neofs-node/nats.tls.cert NEOFS_NODE_NOTIFICATION_CERTIFICATE=/etc/frostfs-node/nats.tls.cert
NEOFS_NODE_NOTIFICATION_KEY=/etc/neofs-node/nats.tls.key NEOFS_NODE_NOTIFICATION_KEY=/etc/frostfs-node/nats.tls.key
NEOFS_NODE_NOTIFICATION_CA=/etc/neofs-node/nats.ca.crt NEOFS_NODE_NOTIFICATION_CA=/etc/frostfs-node/nats.ca.crt
# Tree section # Tree section
NEOFS_TREE_ENABLED=True NEOFS_TREE_ENABLED=True

View file

@ -1,7 +1,7 @@
# Create new TLS certs to NeoFS node # Create new TLS certs to FrostFS node
STORAGE_DIR=$(abspath services/storage) STORAGE_DIR=$(abspath services/storage)
get.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 ${STORAGE_DIR}/generate_cert.sh ${LOCAL_DOMAIN} > /dev/null

View file

@ -16,13 +16,13 @@ services:
- ./wallet01.json:/wallet.json - ./wallet01.json:/wallet.json
- ./../../vendor/hosts:/etc/hosts - ./../../vendor/hosts:/etc/hosts
- storage_s01:/storage - storage_s01:/storage
- ./../../vendor/neofs-cli:/neofs-cli - ./../../vendor/frostfs-cli:/frostfs-cli
- ./cli-cfg.yml:/cli-cfg.yml - ./cli-cfg.yml:/cli-cfg.yml
- ./healthcheck.sh:/healthcheck.sh - ./healthcheck.sh:/healthcheck.sh
- ./s04tls.crt:/etc/ssl/certs/s04tls.crt - ./s04tls.crt:/etc/ssl/certs/s04tls.crt
- ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert - ../nats/client-cert.pem:/etc/frostfs-node/nats.tls.cert
- ../nats/client-key.pem:/etc/neofs-node/nats.tls.key - ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key
- ../nats/ca-cert.pem:/etc/neofs-node/nats.ca.crt - ../nats/ca-cert.pem:/etc/frostfs-node/nats.ca.crt
stop_signal: SIGKILL stop_signal: SIGKILL
env_file: [ ".env", ".storage.env", ".int_test.env" ] env_file: [ ".env", ".storage.env", ".int_test.env" ]
environment: environment:
@ -54,13 +54,13 @@ services:
- ./wallet02.json:/wallet.json - ./wallet02.json:/wallet.json
- ./../../vendor/hosts:/etc/hosts - ./../../vendor/hosts:/etc/hosts
- storage_s02:/storage - storage_s02:/storage
- ./../../vendor/neofs-cli:/neofs-cli - ./../../vendor/frostfs-cli:/frostfs-cli
- ./cli-cfg.yml:/cli-cfg.yml - ./cli-cfg.yml:/cli-cfg.yml
- ./healthcheck.sh:/healthcheck.sh - ./healthcheck.sh:/healthcheck.sh
- ./s04tls.crt:/etc/ssl/certs/s04tls.crt - ./s04tls.crt:/etc/ssl/certs/s04tls.crt
- ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert - ../nats/client-cert.pem:/etc/frostfs-node/nats.tls.cert
- ../nats/client-key.pem:/etc/neofs-node/nats.tls.key - ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key
- ../nats/ca-cert.pem:/etc/neofs-node/nats.ca.crt - ../nats/ca-cert.pem:/etc/frostfs-node/nats.ca.crt
stop_signal: SIGKILL stop_signal: SIGKILL
env_file: [ ".env", ".storage.env", ".int_test.env" ] env_file: [ ".env", ".storage.env", ".int_test.env" ]
environment: environment:
@ -92,13 +92,13 @@ services:
- ./wallet03.json:/wallet.json - ./wallet03.json:/wallet.json
- ./../../vendor/hosts:/etc/hosts - ./../../vendor/hosts:/etc/hosts
- storage_s03:/storage - storage_s03:/storage
- ./../../vendor/neofs-cli:/neofs-cli - ./../../vendor/frostfs-cli:/frostfs-cli
- ./cli-cfg.yml:/cli-cfg.yml - ./cli-cfg.yml:/cli-cfg.yml
- ./healthcheck.sh:/healthcheck.sh - ./healthcheck.sh:/healthcheck.sh
- ./s04tls.crt:/etc/ssl/certs/s04tls.crt - ./s04tls.crt:/etc/ssl/certs/s04tls.crt
- ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert - ../nats/client-cert.pem:/etc/frostfs-node/nats.tls.cert
- ../nats/client-key.pem:/etc/neofs-node/nats.tls.key - ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key
- ../nats/ca-cert.pem:/etc/neofs-node/nats.ca.crt - ../nats/ca-cert.pem:/etc/frostfs-node/nats.ca.crt
stop_signal: SIGKILL stop_signal: SIGKILL
env_file: [ ".env", ".storage.env", ".int_test.env" ] env_file: [ ".env", ".storage.env", ".int_test.env" ]
environment: environment:
@ -130,14 +130,14 @@ services:
- ./wallet04.json:/wallet.json - ./wallet04.json:/wallet.json
- ./../../vendor/hosts:/etc/hosts - ./../../vendor/hosts:/etc/hosts
- storage_s04:/storage - storage_s04:/storage
- ./../../vendor/neofs-cli:/neofs-cli - ./../../vendor/frostfs-cli:/frostfs-cli
- ./cli-cfg.yml:/cli-cfg.yml - ./cli-cfg.yml:/cli-cfg.yml
- ./healthcheck.sh:/healthcheck.sh - ./healthcheck.sh:/healthcheck.sh
- ./s04tls.crt:/tls.crt - ./s04tls.crt:/tls.crt
- ./s04tls.key:/tls.key - ./s04tls.key:/tls.key
- ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert - ../nats/client-cert.pem:/etc/frostfs-node/nats.tls.cert
- ../nats/client-key.pem:/etc/neofs-node/nats.tls.key - ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key
- ../nats/ca-cert.pem:/etc/neofs-node/nats.ca.crt - ../nats/ca-cert.pem:/etc/frostfs-node/nats.ca.crt
stop_signal: SIGKILL stop_signal: SIGKILL
env_file: [ ".env", ".storage.env", ".int_test.env" ] env_file: [ ".env", ".storage.env", ".int_test.env" ]
environment: environment:

View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
/neofs-cli control healthcheck -c /cli-cfg.yml \ /frostfs-cli control healthcheck -c /cli-cfg.yml \
--endpoint "$NEOFS_CONTROL_GRPC_ENDPOINT" | --endpoint "$NEOFS_CONTROL_GRPC_ENDPOINT" |
grep "Health status: READY" grep "Health status: READY"