From 9ba9d8a3a1c4137748ee56f223ebf5a0c354a91f Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Sun, 31 Mar 2019 01:46:39 +0900 Subject: [PATCH] devstack: Enable q-fwaas-v2 by default We dropped FWaaS v1 support in Stein and FWaaS v2 is the only choice. Let's enable q-fwaas-v2 by default in devstack plugin. We no longer need to specify q-fwaas-v2 explicitly in local.conf. I believe it simplifies local.conf. Change-Id: I84fbf6d0ec47f9d47ae2068abb3c981b4572aafa --- devstack/README.rst | 2 -- devstack/settings | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devstack/README.rst b/devstack/README.rst index c6bd89ad4..3d76f196b 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -19,7 +19,6 @@ FWaaS v2. [[local|localrc]] enable_plugin neutron-fwaas https://git.openstack.org/openstack/neutron-fwaas - enable_service q-fwaas-v2 To check a specific patchset that is currently under development, use a form like the below example, which is checking out change 214350 patch set 14 for @@ -29,4 +28,3 @@ testing. [[local|localrc]] enable_plugin neutron-fwaas https://review.openstack.org/p/openstack/neutron-fwaas refs/changes/50/214350/14 - enable_service q-fwaas-v2 diff --git a/devstack/settings b/devstack/settings index ca5c98ff5..e3b3b58fa 100644 --- a/devstack/settings +++ b/devstack/settings @@ -8,3 +8,5 @@ NEUTRON_FWAAS_CONF_FILE=neutron_fwaas.conf NEUTRON_FWAAS_CONF=$NEUTRON_CONF_DIR/$NEUTRON_FWAAS_CONF_FILE NEUTRON_FWAAS_SERVICE_PROVIDERV2=${NEUTRON_FWAAS_SERVICE_PROVIDERV2:-FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.service_drivers.agents.agents.FirewallAgentDriver:default} + +enable_service q-fwaas-v2