added logic to run ovncontoller as ovn host service

Author: Rutvik Saptarshi

build-aux/build-rpms.sh

@@ -37,9 +37,12 @@ pf9_submodule_update
 
 # --- OVN CONFIGURATION ---
 # RPM Version field does not allow hyphens; use dots throughout
-PF9_OVN_BUILD_VERSION=${OVN_BASE}.pf9.${PF9_VERSION}.${BUILD_NUMBER}.${ROCKY_VERSION}
+PF9_OVN_BUILD_VERSION=${OVN_BASE}.pf9.${PF9_VERSION}.${BUILD_NUMBER}
 printf '%s\n' "1:$PF9_OVN_BUILD_VERSION" > $TEAMCITY_ROOT/ovn-rpm-version.txt
 
+# add the rocky version after writing to the file
+PF9_OVN_BUILD_VERSION=${PF9_OVN_BUILD_VERSION}.${ROCKY_VERSION}
+
 # Update OVN configure.ac
 sed -i "s/__PF9_OVN_BUILD_VERSION__/${PF9_OVN_BUILD_VERSION}/g" "$ROOT/configure.ac"
 

rhel/ovn-fedora.spec.in

@@ -172,7 +172,7 @@ for service in ovn-controller-vtep ovn-northd ovn-ic ovn-ic-db ovn-db@; do
                         $RPM_BUILD_ROOT%{_unitdir}/${service}.service
 done
 install -p -D -m 0644 \
-                rhel/usr_lib_systemd_system_ovn-controller.service \
+                rhel/usr_lib_systemd_system_ovn-host.service \
                 $RPM_BUILD_ROOT%{_unitdir}/ovn-host.service
 
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/

rhel/usr_lib_systemd_system_ovn-host.service

@@ -0,0 +1,16 @@
+# this service replaces ovn-controller service from the upstream build in the custom pf9 OVN build
+[Unit]
+Description=OVN controller daemon
+After=network.target
+Requires=openvswitch.service
+After=openvswitch.service
+
+[Service]
+Type=forking
+Restart=on-failure
+EnvironmentFile=-/etc/sysconfig/ovn-host
+ExecStart=/usr/share/ovn/scripts/ovn-ctl --no-monitor --ovn-manage-ovsdb=no start_controller $OVN_CTL_OPTS
+ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_controller --no-monitor
+
+[Install]
+WantedBy=multi-user.target