Most real deployments will need to customize the database locations
for ovn-controller and ovn-controller-vtep. Instead of making them
override the entire command used to start the daemons, provide and
document some environment variables that can be overridden in a custom
config file.
Signed-off-by: Russell Bryant <rbry...@redhat.com>
---
...sr_lib_systemd_system_ovn-controller-vtep.service | 20 +++++++++++++++++++-
rhel/usr_lib_systemd_system_ovn-controller.service | 12 ++++++++++--
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
b/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
index f8ec238..867a906 100644
--- a/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
+++ b/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
@@ -1,3 +1,18 @@
+#
+# You may override the following variables to customize ovn-controller-vtep
+# behavior:
+#
+# OVN_DB - Set this variable to the location of the ovsdb server that is
+# serving the OVN_Southbound database. See the manpage for
+# ovn-controller-vtep for more details on the format for the db
+# location.
+#
+# VTEP_DB - Set this variable to the location of the ovsdb server that is
+# serving the hardware_vtep database. See the manpage for
+# ovn-controller-vtep for more details on the format for the db
+# location.
+#
+
[Unit]
Description=OVN VTEP gateway controller daemon
After=syslog.target
@@ -7,6 +22,9 @@ After=openvswitch.service
[Service]
Type=simple
Environment=OVS_RUNDIR=%t/openvswitch
+Environment=OVN_DB=unix:%t/openvswitch/db.sock
+Environment=VTEP_DB=unix:%t/openvswitch/db.sock
ExecStart=/usr/bin/ovn-controller-vtep -vconsole:emer -vsyslog:err -vfile:info
\
--log-file=/var/log/openvswitch/ovn-controller-vtep.log \
- --no-chdir --pidfile=${OVS_RUNDIR}/ovn-controller-vtep.pid
+ --no-chdir --pidfile=${OVS_RUNDIR}/ovn-controller-vtep.pid \
+ --ovnsb-db=${OVN_DB} --vtep-db=${VTEP_DB}
diff --git a/rhel/usr_lib_systemd_system_ovn-controller.service
b/rhel/usr_lib_systemd_system_ovn-controller.service
index 7637fe7..48dd194 100644
--- a/rhel/usr_lib_systemd_system_ovn-controller.service
+++ b/rhel/usr_lib_systemd_system_ovn-controller.service
@@ -1,3 +1,11 @@
+#
+# You may override the following variables to customize ovn-controller
behavior:
+#
+# OVN_DB - Set this variable to the location of the ovsdb server that is
+# serving the OVN_Southbound database. See the manpage for
+# ovn-controller for more details on the format for the db location.
+#
+
[Unit]
Description=OVN controller daemon
After=syslog.target
@@ -7,7 +15,7 @@ After=openvswitch.service
[Service]
Type=simple
Environment=OVS_RUNDIR=%t/openvswitch
+Environment=OVN_DB=unix:%t/openvswitch/db.sock
ExecStart=/usr/bin/ovn-controller -vconsole:emer -vsyslog:err -vfile:info \
--log-file=/var/log/openvswitch/ovn-controller.log \
- --no-chdir --pidfile=${OVS_RUNDIR}/ovn-controller.pid \
- unix:${OVS_RUNDIR}/db.sock
+ --no-chdir --pidfile=${OVS_RUNDIR}/ovn-controller.pid ${OVN_DB}
--
2.4.3
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
