summaryrefslogtreecommitdiff
path: root/rhel
diff options
context:
space:
mode:
authorRussell Bryant <rbryant@redhat.com>2015-09-09 08:37:14 -0400
committerBen Pfaff <blp@nicira.com>2015-09-09 08:37:57 -0700
commiteec634b9c9dd970fc00a3147942809269f089557 (patch)
treeec71ec7da96006a9f6e41ba743a4bb788e7dc16d /rhel
parentb8644508405998733a0d47d59af2652125725a88 (diff)
downloadopenvswitch-eec634b9c9dd970fc00a3147942809269f089557.tar.gz
rhel: s/OVN_DB/OVS_DB/ in ovn-controller unit.
I added a variable called OVN_DB, but had mixed up what this parameter to ovn-controller was for. This parameter is the location of the db for the local ovs-vswitchd. It then gets the OVN database location from *that* db. It seems fine to keep the env var in case someone needs to override it for some reason, but correct the name and description of what it is. Signed-off-by: Russell Bryant <rbryant@redhat.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'rhel')
-rw-r--r--rhel/usr_lib_systemd_system_ovn-controller.service11
1 files changed, 6 insertions, 5 deletions
diff --git a/rhel/usr_lib_systemd_system_ovn-controller.service b/rhel/usr_lib_systemd_system_ovn-controller.service
index 48dd194ce..6b53ced9d 100644
--- a/rhel/usr_lib_systemd_system_ovn-controller.service
+++ b/rhel/usr_lib_systemd_system_ovn-controller.service
@@ -1,9 +1,10 @@
#
# 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.
+# 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.
#
[Unit]
@@ -15,7 +16,7 @@ After=openvswitch.service
[Service]
Type=simple
Environment=OVS_RUNDIR=%t/openvswitch
-Environment=OVN_DB=unix:%t/openvswitch/db.sock
+Environment=OVS_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 ${OVN_DB}
+ --no-chdir --pidfile=${OVS_RUNDIR}/ovn-controller.pid ${OVS_DB}