openstack/tripleo-image-elements
Code Issues Proposed changes

Merge "Configure neutron-ovs-cleanup to run after openvswitch"

Browse Source
This commit is contained in:
Jenkins 2014-07-02 07:39:59 +00:00 committed by Gerrit Code Review
commit 95cb67a28f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/neutron-ovs-cleanup/install.d/neutron-source-install/81-neutron-ovs-cleanup
View File

@ -9,4 +9,6 @@ ln -sf $NEUTRON_VENV_DIR/bin/neutron-ovs-cleanup /usr/local/bin/neutron-ovs-clea
DIB_INIT_SYSTEM=$(dib-init-system)
if [ "$DIB_INIT_SYSTEM" == "systemd" ]; then
install -D -g root -o root -m 0755 ${SCRIPTDIR}/neutron-ovs-cleanup.service /usr/lib/systemd/system/neutron-ovs-cleanup.service
elif [ "$DIB_INIT_SYSTEM" == "upstart" ]; then
install -D -g root -o root -m 0755 ${SCRIPTDIR}/neutron-ovs-cleanup.conf /etc/init/neutron-ovs-cleanup.conf
fi

12
elements/neutron-ovs-cleanup/install.d/neutron-source-install/neutron-ovs-cleanup.conf Normal file
View File

@ -0,0 +1,12 @@
# neutron-ovs-cleanup
#
start on started openvswitch-switch
stop on runlevel [!2345]
pre-start script
[ ! -e /etc/neutron/neutron.conf ] && exit 0
start-stop-daemon --start --chuid neutron --exec /usr/local/bin/neutron-ovs-cleanup -- \
--config-dir /etc/neutron
end script