9c21bb5ad2
With the new DevStack plugin for neutron-vpnaas, the method names for various stacking actions were renamed. One is used by the functional test setup script tools/configure_for_vpn_func_testing.sh. The change wasn't noticed, because the neutron-vpnaas repo still was using DevStack's existing VPN setup, where the old method name is still in use. But, when removing the VPN setup in DevStack, then the function tests will fail. This commit renames the method to match the name of the DevStack plugin method, instead of the older DevStack repo method. It'll be needed, before upstreaming Iffa9901e24adbacb581425c4b38c7e8cff0da9e8. In addition, it makes sure that VPN environment variables are available for use by the configuration script, and reuses more plugin.sh code, to remove duplication. Change-Id: Ib22a4b9abdc82c2b14d933b02329c6483c075ea8 |
||
|---|---|---|
| .. | ||
| plugin.sh | ||
| README.md | ||
| settings | ||
This directory contains the neutron-vpnaas devstack plugin. To configure VPNaaS, in the local section, you will need to enable the neutron-vpnaas devstack plugin.
Add a line of the form:
enable_plugin neutron-vpnaas <GITURL> [GITREF]
where
<GITURL> is the URL of a neutron-vpnaas repository
[GITREF] is an optional git ref (branch/ref/tag). The default is
master.
For example
enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas stable/kilo
Note: Since the VPN agent process, is a subclass of the L3 agent, which is a subclass of the FW agent, the DevStack plugin will check for the FW service being enabled, and if so, will include the config file specified in Q_FWAAS_CONF_FILE (default is fwaas_driver.ini).
For more information, see the "Externally Hosted Plugins" section of http://docs.openstack.org/developer/devstack/plugins.html.