Include os-autoinst-setup-multi-machine in doc+package

os-autoinst · Aug 1, 2023 · afb76d3 · afb76d3
1 parent 9cca1aa
commit afb76d3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -227,6 +227,11 @@ foreach (EXTRA_SCRIPT check_qemu_oom dewebsockify vnctest)
         PERMISSIONS ${EXECUTABLE_PERMISSIONS}
     )
 endforeach ()
+install(
+    FILES "script/os-autoinst-setup-multi-machine"
+    DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    PERMISSIONS ${EXECUTABLE_PERMISSIONS}
+)
 add_custom_target(install-openvswitch
     COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=openvswitch -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")
 

diff --git a/dist/rpm/os-autoinst.spec b/dist/rpm/os-autoinst.spec
@@ -293,6 +293,7 @@ cd %{__builddir}
 %{_unitdir}/os-autoinst-openvswitch.service
 %config /etc/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf
 %{_sbindir}/rcos-autoinst-openvswitch
+%{_sbindir}/os-autoinst-setup-multi-machine
 
 %files devel
 %ifarch x86_64

diff --git a/doc/networking.md b/doc/networking.md
@@ -27,6 +27,10 @@ e.g. "tunctl -u _openqa-worker -p -t tap0".
 Some configuration can also be configured by environment variables as defined
 in the script `os-autoinst-openvswitch`.
 
+The script `script/os-autoinst-setup-multi-machine` can be used to setup
+common dependencies for that setup to work including firewalld configuration
+and TAP and bridge device setup.
+
 ## Multiple network devices
 To create multiple network devices, one can set multiple, comma-separated MAC addresses
 via NICMAC. The TAPDEV variable supports multiple, comma-separated values, too.