Squash tass.ini and taas_plugin.ini
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:
5
etc/oslo-config-generator/taas_agent.ini
Normal file
5
etc/oslo-config-generator/taas_agent.ini
Normal file
@@ -0,0 +1,5 @@
|
||||
[DEFAULT]
|
||||
output_file = etc/taas_agent.ini.sample
|
||||
wrap_width = 79
|
||||
|
||||
namespace = neutron.taas.agent
|
@@ -1,5 +1,5 @@
|
||||
[DEFAULT]
|
||||
output_file = etc/taas.ini.sample
|
||||
output_file = etc/taas_plugin.ini.sample
|
||||
wrap_width = 79
|
||||
|
||||
namespace = neutron.taas
|
@@ -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
|
@@ -10,18 +10,22 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import neutron.services.provider_configuration
|
||||
|
||||
import neutron_taas.common.config
|
||||
import neutron_taas.services.taas.agents.extensions
|
||||
import neutron_taas.services.taas.agents.extensions.taas
|
||||
|
||||
|
||||
def list_agent_opts():
|
||||
return [
|
||||
('DEFAULT', neutron_taas.services.taas.agents.extensions.OPTS)
|
||||
('DEFAULT', neutron_taas.services.taas.agents.extensions.taas.OPTS)
|
||||
]
|
||||
|
||||
|
||||
def list_opts():
|
||||
return [
|
||||
('service_providers',
|
||||
neutron.services.provider_configuration.serviceprovider_opts),
|
||||
('quotas', neutron_taas.common.config.taas_quota_opts),
|
||||
('taas', neutron_taas.common.config.taas_opts)
|
||||
]
|
||||
|
Reference in New Issue
Block a user