forked from tfgrid/zosbuilder
Integrate zosstorage build path and runtime orchestration
Summary: * add openssh-client to the builder image and mount host SSH keys into the dev container when available * switch RFS to git builds, register the zosstorage source, and document the extra Rust component * wire zosstorage into the build: add build_zosstorage(), ship the binary in the initramfs, and extend component validation * refresh kernel configuration to 6.12.49 while dropping Xen guest selections and enabling counted-by support * tighten runtime configs: use cached mycelium key path, add zosstorage zinit unit, bootstrap ovsdb-server, and enable openvswitch module * adjust the network health check ping invocation and fix the RFS pack-tree --debug flag order * update NOTES changelog, README component list, and introduce a runit helper for qemu/cloud-hypervisor testing * add ovsdb init script wiring under config/zinit/init and ensure zosstorage is available before mycelium
This commit is contained in:
32
config/zinit/init/ovs-dbserver.sh
Normal file
32
config/zinit/init/ovs-dbserver.sh
Normal file
@@ -0,0 +1,32 @@
|
||||
#!/bin/bash
|
||||
# Simple script to create OVS database and start ovsdb-server
|
||||
|
||||
# Configuration
|
||||
DATABASE=${DATABASE:-"/etc/openvswitch/conf.db"}
|
||||
DBSCHEMA="/usr/share/openvswitch/vswitch.ovsschema"
|
||||
DB_SOCKET=${DB_SOCKET:-"/var/run/openvswitch/db.sock"}
|
||||
RUNDIR="/var/run/openvswitch"
|
||||
|
||||
# Create run directory
|
||||
mkdir -p "$RUNDIR"
|
||||
|
||||
# Create database if it doesn't exist
|
||||
if [ ! -e "$DATABASE" ]; then
|
||||
echo "Creating database: $DATABASE"
|
||||
ovsdb-tool create "$DATABASE" "$DBSCHEMA"
|
||||
fi
|
||||
|
||||
# Check if database needs conversion
|
||||
if [ "$(ovsdb-tool needs-conversion "$DATABASE" "$DBSCHEMA")" = "yes" ]; then
|
||||
echo "Converting database: $DATABASE"
|
||||
ovsdb-tool convert "$DATABASE" "$DBSCHEMA"
|
||||
fi
|
||||
|
||||
# Start ovsdb-server
|
||||
echo "Starting ovsdb-server..."
|
||||
exec ovsdb-server \
|
||||
--remote=punix:"$DB_SOCKET" \
|
||||
--remote=db:Open_vSwitch,Open_vSwitch,manager_options \
|
||||
--pidfile \
|
||||
--detach \
|
||||
"$DATABASE"
|
||||
@@ -1,7 +1,8 @@
|
||||
exec: /usr/bin/mycelium --key-file /tmp/mycelium_priv_key.bin
|
||||
exec: /usr/bin/mycelium --key-file /var/cache/etc/mycelium_priv_key.bin
|
||||
--tun-name my0 --silent --peers tcp://188.40.132.242:9651 tcp://136.243.47.186:9651
|
||||
tcp://185.69.166.7:9651 tcp://185.69.166.8:9651 tcp://65.21.231.58:9651 tcp://65.109.18.113:9651
|
||||
tcp://209.159.146.190:9651 tcp://5.78.122.16:9651 tcp://5.223.43.251:9651 tcp://142.93.217.194:9651
|
||||
after:
|
||||
- network
|
||||
- udev-rfs
|
||||
- udev-rfs
|
||||
- zosstorage
|
||||
@@ -3,4 +3,4 @@ after:
|
||||
- depmod
|
||||
- udevd
|
||||
- udev-trigger
|
||||
test: ping www.google.com
|
||||
test: ping -c1 www.google.com
|
||||
|
||||
4
config/zinit/ovs-dbserver.yaml
Normal file
4
config/zinit/ovs-dbserver.yaml
Normal file
@@ -0,0 +1,4 @@
|
||||
exec: /etc/zinit/init/ovsdb-server.sh
|
||||
oneshot: true
|
||||
after:
|
||||
- zossstorage
|
||||
4
config/zinit/zosstorage.yaml
Normal file
4
config/zinit/zosstorage.yaml
Normal file
@@ -0,0 +1,4 @@
|
||||
exec: /usr/bin/zosstorage -l debug
|
||||
oneshot: true
|
||||
after:
|
||||
- rfs-modules
|
||||
Reference in New Issue
Block a user