summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rhel/usr_lib_systemd_system_ovn-controller-vtep.service8
-rw-r--r--rhel/usr_lib_systemd_system_ovn-controller.service16
-rw-r--r--rhel/usr_lib_systemd_system_ovn-northd.service13
3 files changed, 29 insertions, 8 deletions
diff --git a/rhel/usr_lib_systemd_system_ovn-controller-vtep.service b/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
index 867a9061a..3bd433128 100644
--- a/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
+++ b/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
@@ -1,3 +1,4 @@
+# See ovn-controller-vtep(8) for details about ovn-controller-vtep.
#
# You may override the following variables to customize ovn-controller-vtep
# behavior:
@@ -12,6 +13,13 @@
# ovn-controller-vtep for more details on the format for the db
# location.
#
+# To override these variables, you may create a configuration file
+# in the /etc/systemd/system/ovn-controller-vtep.d/ directory. For example,
+# you could place the following contents in
+# /etc/systemd/system/ovn-controller-vtep.d/local.conf:
+#
+# [System]
+# Environment="OVN_DB=unix:/usr/local/var/run/openvswitch/db.sock" "VTEP_DB=unix:/usr/local/var/run/openvswitch/vtep.sock"
[Unit]
Description=OVN VTEP gateway controller daemon
diff --git a/rhel/usr_lib_systemd_system_ovn-controller.service b/rhel/usr_lib_systemd_system_ovn-controller.service
index 9bd2f6674..ad1b146c2 100644
--- a/rhel/usr_lib_systemd_system_ovn-controller.service
+++ b/rhel/usr_lib_systemd_system_ovn-controller.service
@@ -1,11 +1,13 @@
+# See ovn-controller(8) for details about ovn-controller.
#
-# You may override the following variables to customize ovn-controller behavior:
-#
-# OVS_DB - Set this variable to the location of the ovsdb server that is
-# serving the Open_vSwitch database for the local ovs-vswitchd.
-# See the manpage for ovn-controller for more details on the
-# format for the db location.
+# To customize the ovn-controller service, you may create a configuration file
+# in the /etc/systemd/system/ovn-controller.d/ directory. For example, to specify
+# additional options to be passed to the "ovn-ctl start_controller" command, you
+# could place the following contents in
+# /etc/systemd/system/ovn-controller.d/local.conf:
#
+# [System]
+# Environment="OVN_CONTROLLER_OPTS=--ovn-controller-log=-vconsole:emer -vsyslog:err -vfile:info"
[Unit]
Description=OVN controller daemon
@@ -16,5 +18,5 @@ After=openvswitch.service
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/usr/share/openvswitch/scripts/ovn-ctl start_controller
+ExecStart=/usr/share/openvswitch/scripts/ovn-ctl start_controller $OVN_CONTROLLER_OPTS
ExecStop=/usr/share/openvswitch/scripts/ovn-ctl stop_controller
diff --git a/rhel/usr_lib_systemd_system_ovn-northd.service b/rhel/usr_lib_systemd_system_ovn-northd.service
index 5b3b03aef..6e23eaa1e 100644
--- a/rhel/usr_lib_systemd_system_ovn-northd.service
+++ b/rhel/usr_lib_systemd_system_ovn-northd.service
@@ -1,3 +1,14 @@
+# See ovn-northd(8) for details about ovn-northd.
+#
+# To customize the ovn-northd service, you may create a configuration file
+# in the /etc/systemd/system/ovn-northd.d/ directory. For example, to specify
+# additional options to be passed to the "ovn-ctl start_northd" command, you
+# could place the following contents in
+# /etc/systemd/system/ovn-northd.d/local.conf:
+#
+# [System]
+# Environment="OVN_NORTHD_OPTS=--db-nb-sock=/usr/local/var/run/openvswitch/ovnnb_db.sock --db-sb-sock=/usr/local/var/run/openvswitch/ovnsb_db.sock"
+
[Unit]
Description=OVN northd management daemon
After=syslog.target
@@ -8,5 +19,5 @@ After=openvswitch.service
Type=oneshot
RemainAfterExit=yes
Environment=OVS_RUNDIR=%t/openvswitch OVS_DBDIR=/var/lib/openvswitch
-ExecStart=/usr/share/openvswitch/scripts/ovn-ctl start_northd
+ExecStart=/usr/share/openvswitch/scripts/ovn-ctl start_northd $OVN_NORTHD_OPTS
ExecStop=/usr/share/openvswitch/scripts/ovn-ctl stop_northd