openstack/tap-as-a-service
Code Issues Proposed changes

Squash tass.ini and taas_plugin.ini

Browse Source 
Both of these files contain options loaded by neutron-server. This
follows how the config files are generated in the other plugins such
as neutron-vpnaas.

Also create a separate config file to capture agent options.

Change-Id: I0a6a28c1200d00a35ab2a8d23abfe14b0247f140
This commit is contained in:
Takashi Kajinami
2024-09-19 00:03:15 +09:00
parent 4fd17b7229
commit e71d2419ad
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
etc/oslo-config-generator/taas_agent.ini Normal file
View File

@@ -0,0 +1,5 @@
[DEFAULT]
output_file = etc/taas_agent.ini.sample
wrap_width = 79
namespace = neutron.taas.agent

2
etc/oslo-config-generator/taas.ini → etc/oslo-config-generator/taas_plugin.ini
View File

@@ -1,5 +1,5 @@
[DEFAULT] [DEFAULT]
output_file = etc/taas.ini.sample output_file = etc/taas_plugin.ini.sample
wrap_width = 79 wrap_width = 79
namespace = neutron.taas namespace = neutron.taas

7
etc/taas_plugin.ini
View File

@@ -1,7 +0,0 @@
[DEFAULT]
[service_providers]
# Defines providers for advanced services using the format:
# <service_type>:<name>:<driver>[:default] (multi valued)
service_provider = TAAS:TAAS:neutron_taas.services.taas.service_drivers.taas_rpc.TaasRpcDriver:default

8
neutron_taas/opts.py
View File

@@ -10,18 +10,22 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import neutron.services.provider_configuration
import neutron_taas.common.config import neutron_taas.common.config
import neutron_taas.services.taas.agents.extensions import neutron_taas.services.taas.agents.extensions.taas
def list_agent_opts(): def list_agent_opts():
return [ return [
('DEFAULT', neutron_taas.services.taas.agents.extensions.OPTS) ('DEFAULT', neutron_taas.services.taas.agents.extensions.taas.OPTS)
] ]
def list_opts(): def list_opts():
return [ return [
('service_providers',
neutron.services.provider_configuration.serviceprovider_opts),
('quotas', neutron_taas.common.config.taas_quota_opts), ('quotas', neutron_taas.common.config.taas_quota_opts),
('taas', neutron_taas.common.config.taas_opts) ('taas', neutron_taas.common.config.taas_opts)
] ]