openstack/neutron-vpnaas
Code Issues Proposed changes

Fix grenade plugin

Browse Source 
Adds settings file is necessary to register the service.
Fixes undefined reference in shutdown by copy-paste. :/

Change-Id: I1c2129d581c00719766f80b802031f04b4a07a2a
Closes-Bug: #1579235
This commit is contained in:
Kevin Benton 2016-05-11 00:38:40 -07:00
parent a65310b7bb
commit 8cddec3bf4
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/upgrade/settings Executable file
View File

@ -0,0 +1 @@
register_project_for_upgrade neutron-vpnaas

17
devstack/upgrade/shutdown.sh
View File

@ -13,7 +13,24 @@
# under the License. # under the License.
# #
# ``upgrade-neutron-vpnaas`` # ``upgrade-neutron-vpnaas``
set -o errexit
source $GRENADE_DIR/grenaderc source $GRENADE_DIR/grenaderc
source $GRENADE_DIR/functions source $GRENADE_DIR/functions
source $BASE_DEVSTACK_DIR/functions
source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
# TODO(kevinbenton): figure out best way to source this from devstack plugin
function neutron_vpnaas_stop {
local ipsec_data_dir=$DATA_DIR/neutron/ipsec
local pids
if [ -d $ipsec_data_dir ]; then
pids=$(find $ipsec_data_dir -name 'pluto.pid' -exec cat {} \;)
fi
if [ -n "$pids" ]; then
sudo kill $pids
fi
stop_process neutron-vpnaas
}
ENABLED_SERVICES+=,neutron-vpnaas
set -o xtrace set -o xtrace
neutron_vpnaas_stop neutron_vpnaas_stop