realloc/frostfs-dev-env
1
0
Fork 0
forked from TrueCloudLab/frostfs-dev-env
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

10
services/storage/.storage.env
View file

@ -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

4
services/storage/artifacts.mk
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)
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

32
services/storage/docker-compose.yml
View file

@ -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:

2
services/storage/healthcheck.sh
View file

@ -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"