aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-07-05 09:17:17 +0000
committerGerrit Code Review <review@openstack.org>2019-07-05 09:17:17 +0000
commitb4244916d72e99b3be0766eb40ef6a20acfea390 (patch)
tree74d1cb21e13b704689b578f32cbe9ae0cc2e432b /docker
parent4884203a9ed8e1a2e67d3877e195359d4e3ad726 (diff)
parent0ec7017f7a358553158dc927285ab9f4af1a641a (diff)
downloadkolla-b4244916d72e99b3be0766eb40ef6a20acfea390.tar.gz
kolla-b4244916d72e99b3be0766eb40ef6a20acfea390.zip
Merge "Fix ovs-appctl by adding --pidfile to ovsdb command."
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/openvswitch/openvswitch-db-server/start_ovsdb_server.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/openvswitch/openvswitch-db-server/start_ovsdb_server.sh b/docker/openvswitch/openvswitch-db-server/start_ovsdb_server.sh
index 5c92fba78..bb8bba65e 100755
--- a/docker/openvswitch/openvswitch-db-server/start_ovsdb_server.sh
+++ b/docker/openvswitch/openvswitch-db-server/start_ovsdb_server.sh
@@ -26,5 +26,5 @@ if [ ! -e $ovs_bridge ] && [ ! -e $ovs_ext_intf ]; then
/usr/sbin/ovsdb-server /var/lib/openvswitch/conf.db -vconsole:emer -vsyslog:err -vfile:info --remote=punix:/var/run/openvswitch/db.sock --remote=ptcp:6640 --log-file=/var/log/kolla/openvswitch/ovsdb-server.log
else
# NOTE: (sbezverk) This part is executed only by kolla-ansible deployment.
- /usr/sbin/ovsdb-server /var/lib/openvswitch/conf.db -vconsole:emer -vsyslog:err -vfile:info --remote=punix:/run/openvswitch/db.sock --remote=ptcp:6640:$ovsdb_ip --log-file=/var/log/kolla/openvswitch/ovsdb-server.log
+ /usr/sbin/ovsdb-server /var/lib/openvswitch/conf.db -vconsole:emer -vsyslog:err -vfile:info --pidfile=/var/run/openvswitch/ovs-vswitchd.pid --remote=punix:/run/openvswitch/db.sock --remote=ptcp:6640:$ovsdb_ip --log-file=/var/log/kolla/openvswitch/ovsdb-server.log
fi