scottk/openstack-helm
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/openstack-helm.git synced 2025-12-27 02:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "openvswitch: use pidfile option"

Browse Source
This commit is contained in:
Zuul
2018-04-12 20:27:11 +00:00
committed by Gerrit Code Review
parent 4e31d428e3 18d85dbf7f
commit 02d053bc22
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openvswitch/templates/bin/_openvswitch-db-server.sh.tpl
View File

@@ -22,6 +22,7 @@ COMMAND="${@:-start}"
OVS_DB=/run/openvswitch/conf.db
OVS_SOCKET=/run/openvswitch/db.sock
OVS_SCHEMA=/usr/share/openvswitch/vswitch.ovsschema
OVS_PID=/run/openvswitch/ovsdb-server.pid
function start () {
mkdir -p "$(dirname ${OVS_DB})"
@@ -38,11 +39,13 @@ function start () {
-vconsole:emer \
-vconsole:err \
-vconsole:info \
--pidfile=${OVS_PID} \
--remote=punix:${OVS_SOCKET}
}
function stop () {
ovs-appctl -T1 -t /run/openvswitch/ovsdb-server.1.ctl exit
PID=$(cat $OVS_PID)
ovs-appctl -T1 -t /run/openvswitch/ovsdb-server.${PID}.ctl exit
}
$COMMAND

5
openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl
View File

@@ -20,6 +20,7 @@ set -ex
COMMAND="${@:-start}"
OVS_SOCKET=/run/openvswitch/db.sock
OVS_PID=/run/openvswitch/ovs-vswitchd.pid
function start () {
t=0
@@ -63,11 +64,13 @@ function start () {
-vconsole:emer \
-vconsole:err \
-vconsole:info \
--pidfile=${OVS_PID} \
--mlockall
}
function stop () {
ovs-appctl -T1 -t /run/openvswitch/ovs-vswitchd.1.ctl exit
PID=$(cat $OVS_PID)
ovs-appctl -T1 -t /run/openvswitch/ovs-vswitchd.${PID}.ctl exit
}
$COMMAND