summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2023-10-31 14:22:13 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2023-11-01 14:15:47 +0000
commitd1161fc9fbff06c61c1b9647790fffe5a028147d (patch)
tree1d86f71ce0e831214ac1b38cce2b4765d1ea594f
parent6bf3aaf12524ff0ad30bdb572d324e68aa300cd2 (diff)
downloadaports-d1161fc9fbff06c61c1b9647790fffe5a028147d.zip
testing/ovn: add some init depends, generate the OVS system ID
-rw-r--r--testing/ovn/APKBUILD9
-rw-r--r--testing/ovn/ovn-controller.initd2
-rw-r--r--testing/ovn/ovn-ovsdb-server-nb.initd2
-rw-r--r--testing/ovn/ovn-ovsdb-server-sb.initd2
-rw-r--r--testing/ovn/ovn.post-install3
5 files changed, 11 insertions, 7 deletions
diff --git a/testing/ovn/APKBUILD b/testing/ovn/APKBUILD
index d141dc2cc5f..e59113ac33a 100644
--- a/testing/ovn/APKBUILD
+++ b/testing/ovn/APKBUILD
@@ -3,7 +3,7 @@
pkgname=ovn
pkgver=23.09.0
ovs_pkgver=3.2.1
-pkgrel=3
+pkgrel=4
pkgdesc="Open Virtual Network"
url="https://www.ovn.org"
arch="all"
@@ -21,6 +21,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg $pkgname-openrc"
giturl="https://github.com/openvswitch/ovs.git"
_gitrev="498cedc"
options="!check" # most of the tests are failing
+install="$pkgname.post-install"
source="$pkgname-$pkgver.tar.gz::https://github.com/ovn-org/ovn/archive/refs/tags/v$pkgver.tar.gz
openvswitch-$ovs_pkgver.tar.gz::https://github.com/openvswitch/ovs/archive/refs/tags/v$ovs_pkgver.tar.gz
ovn-ctl.confd
@@ -139,9 +140,9 @@ sha512sums="
709e7a39c97d44cb4fc2741ec386d2bb446adf4c374d5d15480dc62e49d5e327354eb81ca09b55b0c0954dd42b28d3bd278840247d42b2f8802e667f90bd8c97 openvswitch-3.2.1.tar.gz
b98fd4acefcc03714cebe18dd78839ec1e6777ed6b1b035873b7a05c24ce5c91b62d890543e58529ed47413c4ab926468a9915bf15675475712ac039f9d1cda5 ovn-ctl.confd
436f3bc162675b5baa9e301d58fe30d7d0dfb7a196f73012cd8dd3ee7b3e9016c8db81092629da08ee08fc572a697c4c1463c819254c26eaf1f69150f522c503 ovn-northd.initd
-eb9ad8be32752acb2cc43590629568855957b2da9a3df3374498e983f7cd87c7562cf39c28ef33e4162ee11ebfee201fdfbdb3efc8cf98676cc06eb84d61d6ea ovn-ovsdb-server-nb.initd
-752b57d73f8fe9583b09c814758a0d779c3e87680b47efa55e80ed4b2e80c949b1094ddc36f2533e1b8a3eea3cb7481c09dcfae15b0a6381463b27b898823ee5 ovn-ovsdb-server-sb.initd
-26ad49aa5deeb216bb24b8a76ed1f2bbaee582a53f034546110d7380f8c5d225663994ce44b108bac8cd2ea4c5348b3c8edef1cd7c9668c14f39151d35a0ed35 ovn-controller.initd
+e2dc52c9328514d5ebe1b6b9e63a6b6055ff9fe1d9b4eb1cec429631f65d24b2144d5f328c7943b501eef40f1aafdf5bd247d5e7d58b028d25a8a361b9ebdcb0 ovn-ovsdb-server-nb.initd
+393e8ae14280e8495b92063556c40273a8dc04572e2a78f03cbf61fd37fe509d9deacf30f50831f23664c1c3dd566122c5e683e928aa5e5c8a035f3183d84a78 ovn-ovsdb-server-sb.initd
+9d54d84d1e70b0cc13c2c19b327f1441208ebcf3c1248c6625afa32cd47f8207ea80006fa82c9de6aa4d3fe03b2ab3bd3c887fb85dd6cb9bb7e5c3925afa38af ovn-controller.initd
1e08aa5ac6ce55b97256478b9243c8a4c92a42a97fc70ea0439c832b12a775af28a127224ae6c4ce01642dde65f76c610a44105912338bf443d8ea390c2d9ccf ovs-modules.initd
346aea099f51707d2b4fc9fdc8c1502582723fb4e00c4d5d1624b0378c94dfb76674fa95e2af894f36169df52109dbe441ee6a45aa744584d9e4c74d15a46c1d ovs-vswitchd.confd
4bff37f8bed32d5327b4b0433984ab8ffdce77f618034aa6ffd1ad4a7caa00703ea2bef312876dce5aafa4c17fe06dddd75e5c05c10e13bf8f5c3805a0654a96 ovs-vswitchd.initd
diff --git a/testing/ovn/ovn-controller.initd b/testing/ovn/ovn-controller.initd
index 12a75893bb6..5c93465eb35 100644
--- a/testing/ovn/ovn-controller.initd
+++ b/testing/ovn/ovn-controller.initd
@@ -7,7 +7,7 @@ pidfile="/run/ovn/$RC_SVCNAME.pid"
description="Open Virtual Network host control daemon"
depend() {
- need net
+ need net ovs-vswitchd
after firewall
}
diff --git a/testing/ovn/ovn-ovsdb-server-nb.initd b/testing/ovn/ovn-ovsdb-server-nb.initd
index 93eb086e302..c04148bcced 100644
--- a/testing/ovn/ovn-ovsdb-server-nb.initd
+++ b/testing/ovn/ovn-ovsdb-server-nb.initd
@@ -7,7 +7,7 @@ pidfile="/run/ovn/$RC_SVCNAME.pid"
description="Open vSwitch database server for OVN Northbound database"
depend() {
- need net
+ need net ovn-northd
after firewall
}
diff --git a/testing/ovn/ovn-ovsdb-server-sb.initd b/testing/ovn/ovn-ovsdb-server-sb.initd
index 2adbeb69289..89e1743df57 100644
--- a/testing/ovn/ovn-ovsdb-server-sb.initd
+++ b/testing/ovn/ovn-ovsdb-server-sb.initd
@@ -7,7 +7,7 @@ pidfile="/run/ovn/$RC_SVCNAME.pid"
description="Open vSwitch database server for OVN Southbound database"
depend() {
- need net
+ need net ovn-northd
after firewall
}
diff --git a/testing/ovn/ovn.post-install b/testing/ovn/ovn.post-install
new file mode 100644
index 00000000000..8ce006b744c
--- /dev/null
+++ b/testing/ovn/ovn.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+test -e /proc/sys/kernel/random/uuid && cat /proc/sys/kernel/random/uuid > /etc/openvswitch/system-id.conf