Deuxfleurs/mknet
17
1
Fork 2
Code Issues Pull requests Projects Releases Wiki Activity

update to support garage new layout concept

Browse source
This commit is contained in:
Trinity Pointard 2021-11-18 19:21:58 +01:00
parent 179d18fcec
commit 79bd5f17a6
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.yml
View file

@ -40,7 +40,7 @@ servers:
global: global:
subnet: subnet:
base: fc00:9a7a:9e:: base: 'fc00:9a7a:9e::'
local: 64 local: 64
zone: 16 zone: 16
latency-offset: 3ms latency-offset: 3ms

20
example/deploy_garage.sh
View file

@ -3,11 +3,15 @@
set -euo pipefail set -euo pipefail
IFS=$'\n\t' IFS=$'\n\t'
GARAGE_PATH=/home/trinity/tmp/garage/target/release/garage GARAGE_PATH=garage
STORAGE_PATH=/tmp/garage-testnet STORAGE_PATH=/tmp/garage-testnet
export RPC_SECRET=3e9abff5f9e480afbadb46a77b7a26fe0e404258f0dc3fd5386b0ba8e0ad2fba export RPC_SECRET=3e9abff5f9e480afbadb46a77b7a26fe0e404258f0dc3fd5386b0ba8e0ad2fba
NODE_STORAGE_PATH=${STORAGE_PATH}/${ZONE}/${HOST} if [ -z "$ZONE" ]; then
NODE_STORAGE_PATH=${STORAGE_PATH}/${HOST}
else
NODE_STORAGE_PATH=${STORAGE_PATH}/${ZONE}/${HOST}
fi
BOOTSTRAP_FILE=${STORAGE_PATH}/bootstrap_peer BOOTSTRAP_FILE=${STORAGE_PATH}/bootstrap_peer
export GARAGE_CONFIG_FILE=${NODE_STORAGE_PATH}/garage.toml export GARAGE_CONFIG_FILE=${NODE_STORAGE_PATH}/garage.toml
@ -31,6 +35,7 @@ bootstrap_peers=[]
[s3_api] [s3_api]
s3_region = "garage" s3_region = "garage"
api_bind_addr = "[::]:3900" api_bind_addr = "[::]:3900"
root_domain = ".s3.garage"
[s3_web] [s3_web]
bind_addr = "[::]:3902" bind_addr = "[::]:3902"
@ -43,9 +48,14 @@ sleep 2
CONFIG_NODE_FPATH=(${STORAGE_PATH}/*{,/*}/garage.toml) CONFIG_NODE_FPATH=(${STORAGE_PATH}/*{,/*}/garage.toml)
SELF_ID=$(${GARAGE_PATH} node-id 2>/dev/null) SELF_ID=$(${GARAGE_PATH} node id 2>/dev/null)
SHORT_ID=$(echo ${SELF_ID} | cut -c-64) SHORT_ID=$(echo ${SELF_ID} | cut -c-64)
${GARAGE_PATH} -c ${CONFIG_NODE_FPATH[0]} node connect ${SELF_ID} ${GARAGE_PATH} -c ${CONFIG_NODE_FPATH[0]} node connect ${SELF_ID}
sleep ${ID} ${GARAGE_PATH} -c ${CONFIG_NODE_FPATH[0]} layout assign ${SHORT_ID} -z ${ZONE:-unzonned-${HOST}} -c 1 -t ${HOST}
${GARAGE_PATH} -c ${CONFIG_NODE_FPATH[0]} node configure -z ${ZONE:-unzonned-${HOST}} -c 1 -t ${HOST} ${SHORT_ID}
if [ ${CONFIG_NODE_FPATH[0]} == ${GARAGE_CONFIG_FILE} ]; then
sleep 2
${GARAGE_PATH} layout show
${GARAGE_PATH} layout apply --version 1
fi