Centralize Configuration Options

[Brian Stajkowski]

[Overview]
Refactor Neutron configuration options to be in one place 'neutron/conf' similar to the Nova implementation found here: http://specs.openstack.org/openstack/nova-specs/specs/mitaka/approved/centralize-config-options.html

This would allow for centralization of all configuration options and provide an easy way to import and gain access to the wide breadth of configuration options available to Neutron.

[Proposal]

1. Introduce a new package: neutron/conf

Neutron Quotas Example:

2. Group modules logically under new package:
  2a. Example: options from neutron/quotas
  2b. Move to neutron/conf/quotas/common.py
  2c. Aggregate quota options in __init__.py
4. Import neutron.conf.quotas for usage

Neutron DB Example /w Agent Options:

2. Group modules logically under new package:
  2a. Example: options from neutron/db/agents_db.py
  2b. Move to neutron/conf/db/agents.py
  2c. Aggregate db options in __init__.py
4. Import neutron.conf.db for usage

Neutron DB Example /w Migration CLI:

2. Group modules logically under new package:
  2a. Example: options from neutron/db/migrations/cli.py
  2b. Move to neutron/conf/db/migrations_cli.py
  2c. Migrations CLI does not get aggregated in __init__.py
4. Import neutron.conf.db.migrations_cli

** neutron.opts list options methods all get moved to neutron/conf as well in their respective modules and setup.cfg is modified for this adjustment.

[Benefits]

- As a developer I will find all config options in one place and will add further config options to that central place.
- End user is not affected by this change.

[Related information]
[1] Nova Implementation: http://specs.openstack.org/openstack/nova-specs/specs/mitaka/approved/centralize-config-options.html
[2] Cross Project Spec: https://review.openstack.org/#/c/295543

[Assaf Muller (amuller)]

Keep in mind that Neutron uses multiple configuration files (For example l3_agent.ini), and that some options are used by more than one agent, and that some common options go in neutron.conf. We also have a ton of out of tree configuration files and options. How do we adjust the Nova plan to suit the Neutron use cases?

[Assaf Muller (amuller)]

I don't know if this is fully baked. I added a comment to https://review.openstack.org/#/c/295543/2/specs/centralized-configuration-option-definition.rst.

I think we should definitely wait until the centralized spec is merged before we move ahead with this in Neutron.

[Brian Stajkowski (brian-stajkowski)]

@Assaf: This isn't for the end user configuration files. This is for centralizing the config options in Neutron codebase under neutron/conf to allow us to put everything in organized modules in one directory. This is instead of spreading out all of our options across our codebase, so we can ease maintainability of neutron code and improve upon how we are registering them/information we are going to present, in one spot.

[Assaf Muller (amuller)]

@Brian: I did the unthinkable and read the proposal before I commented ;-) I know we're not changing the contents of configuration files, but we are changing the way we register options. I don't want to hurt readability of the code with respect to understanding which options are used by which service. The global spec mentions that the free-text for each option would mention which services use the option. That still doesn't give me a systematic way to understand which options are used by a specific process (i.e. neutron-server, neutron-dhcp-agent, etc). We could structure neutron.conf in to something like:

neutron.conf.global
neutron.conf.agents.global
neutron.conf.agents.l3_agent
...

So that options that are used by all Neutron processes are put under conf.global, options used solely by agents are placed under conf.agents.global, and that options that a specific agent uses are placed in its own dir.

[Brian Stajkowski (brian-stajkowski)]

@Assaf: Actually when writing this I thought of this very problem. Brandon brought this up that we'd probably still like to maintain what is used where instead of rolling everything up into one import.

I do agree this is probably the best route for readability and understanding what goes where. If you haven't proposed this to the spec, it would be a great addition :)

[Armando Migliaccio (armando-migliaccio)]

I have mixed feelings on this proposal.

On one hand as an operator I would despise the idea of another churn having only recently switched to genconfig. On the other hand, I'd love the idea for consistency but I can't see how this could be preserved without style checking in place. I wonder if we're simply creating more disruptive work for ourselves when there is no real problem to address. A developer can quickly get familiar to where options are, especially now that we adopted automatic generation.

[Armando Migliaccio (armando-migliaccio)]

Status update:

http://eavesdrop.openstack.org/meetings/neutron_drivers/2016/neutron_drivers.2016-03-31-22.00.log.html#l-295

[Armando Migliaccio (armando-migliaccio)]

We'll have to talk about this a little more.

[Armando Migliaccio (armando-migliaccio)]

After giving this another look, I realize I didn't interpret this one correctly. If this is a mere code refactoring and you have someone in mind that can do the work, I think there is value in moving configs closer together, though I can also see the other side of the argument where cohesiveness (keep things related to each other closer together) is to be preferred. I think this boils to a matter of style, perhaps we can find a middle ground where we say that every top-level module neutron/<module> (eg. agent) must have a conf module with the various config files (l3, dhcp, metadata, etc).

[Brian Stajkowski (brian-stajkowski)]

@Armando: For sure, I think the spec could be modified supporting this to allow per project implementation of how the options are imported. Having everything roll up to one import may not provide better understand of what options relate to each neutron module. But the overall goal would be to move the options closer together for maintainability, and leave it up to the individual projects on how they import them into their modules.

[Brian Stajkowski (brian-stajkowski)]

@Armando:

"If this is a mere code refactoring and you have someone in mind that can do the work, I think there is value in moving configs closer together"

Forgot to address this. Yes, have two developers in mind that can assist in this effort. This stage of the spec is a code refactor. The other portion is revising the oslo option registration to expand on help text, related options, advanced usage, etc. But, in all, we have the people to accomplish this. Thanks!

[Akihiro Motoki (amotoki)]

As other folks already commented, my understanding is this is refactoring of the code and it sounds good for better readability of the code.

At the same time, we need to keep in my mind that neutron consists of multiple services (server and various agents) and loaded options should be limited to options which are actually needed for individual services. I like Assaf's idea.

This refactoring will indirectly helps genconfig.
I see some options are not listed in generated config files now, and this refactoring may help this situation.

[Brian Stajkowski (brian-stajkowski)]

@Akihiro: After re-reading Assaf's comments and updating the RFE, I think we are talking about the same thing now. I used common but we can use global for sure and allow breakdown after that.

The main difference I see is Assaf wants to be explicit about the imports and separation, where I suggested that we roll them up say neutron.conf.db or neutron.conf.agents. I think both are good it's just a matter of how specific we want to get on these imports.

But in all this is a refactor.

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.openstack.org/303791

[Armando Migliaccio (armando-migliaccio)]

If the intention of this bug report is to simply tracking the shuffling of conf options into a new 'conf' module and break down the conf module into submodules, for config registration, I am fine with that. Though, I personally don't believe it's gonna solve much and the key benefits I see is the the enhancements to oslo.config.

If this is plain refactoring, this is not an RFE. Just propose a patch and see if you can get enough people behind.

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.openstack.org/312800

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/303791
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=97372a1431d9f80bda7bdfd1cd494aeeecf3df53
Submitter: Jenkins
Branch: master

commit 97372a1431d9f80bda7bdfd1cd494aeeecf3df53
Author: Aradhana Singh <email address hidden>
Date: Tue Apr 19 22:03:27 2016 +0000

    Refactoring config options for quota

    Refactoring Neutron configuration options for quota to be in
    neutron/conf. This will allow centralization of all configuration
    options and provide an easy way to import.
    It is similar to the Nova implementation found here:
    http://specs.openstack.org/openstack/nova-specs/specs/mitaka/implemented/centralize-config-options.html

    Partial-Bug: #1563069

    Change-Id: I7723ba9b24dd5cf74b321bd0fc54df0666594bbc

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/312800
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=79fd5b4b17bface92d51d37bf8e1aad88aaafce8
Submitter: Jenkins
Branch: master

commit 79fd5b4b17bface92d51d37bf8e1aad88aaafce8
Author: Aradhana Singh <email address hidden>
Date: Tue Apr 19 22:03:27 2016 +0000

    Refactoring config options for service

    Refactoring neutron configuration options for service to be in
    neutron/conf. This would allow centralization of all configuration
    options and provide an easy way to import.

    Co-Authored-By: Dariusz Smigiel <email address hidden>

    Partial-Bug: #1563069

    Change-Id: Iff140c11765199536a8fd8066ad3063ed92355ae

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/323046

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/324191

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/338596

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/340177

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/340187

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/331348
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=607957ef3501a771a61cd3b82b32f5de83a6e117
Submitter: Jenkins
Branch: master

commit 607957ef3501a771a61cd3b82b32f5de83a6e117
Author: Aradhana Singh <email address hidden>
Date: Fri Jun 17 20:44:11 2016 +0000

    Refactoring config options for dhcp agent

    Refactoring neutron configuration options for dhcp agent to be in
    neutron/conf/agent. This would allow centralization of all configuration
    options and provide an easy way to import.

    Change-Id: Ia17d2d7223dd598e2d36a8320942fb03b61dffaf
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Change abandoned by Aradhana Singh (<email address hidden>) on branch: master
Review: https://review.openstack.org/324191
Reason: Size of this patch has increased considerably and doesn't include all changes for refactoring config options for agent.
Splitting this patch. Here are few of them
dhcp agent : https://review.openstack.org/#/c/331348/
agent - l3 config : https://review.openstack.org/#/c/338596
neutron-fwaas :
https://review.openstack.org/#/c/338559
l3 keepalived_state_change : https://review.openstack.org/#/c/338559

[OpenStack Infra (hudson-openstack)]

Change abandoned by Aradhana Singh (<email address hidden>) on branch: master
Review: https://review.openstack.org/320722
Reason: Size of this patch has increased considerably and doesn't include all changes for refactoring config options for plugins.
Splitting the patch, here are few of them
https://review.openstack.org/#/c/340177/
https://review.openstack.org/#/c/340187/
https://review.openstack.org/#/c/340228/

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/343045

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/344281

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/344877

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/345592

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/346162

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/338596
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=88fd2521c17926918432e3a701024dc642a64eb1
Submitter: Jenkins
Branch: master

commit 88fd2521c17926918432e3a701024dc642a64eb1
Author: Aradhana Singh <email address hidden>
Date: Wed Jul 6 23:07:31 2016 +0000

    Refactoring config options for l3 agent config

    Refactoring neutron configuration options for l3 agent to be in
    neutron/conf/agent/l3. This would allow centralization of all
    configuration options in neutron/conf and provide an easy way to import.

    Change-Id: Ie7533ea55eaa4d0f2c1919131a75f56e027c4d6e
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/347044

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/347867

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/348513

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/344281
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=414ceed4f3efb7c800f82ddec6cb54483a0f4249
Submitter: Jenkins
Branch: master

commit 414ceed4f3efb7c800f82ddec6cb54483a0f4249
Author: Anindita Das <email address hidden>
Date: Tue Jul 19 14:37:56 2016 +0000

    Refactoring config options for common config opts

    Refactoring neutron common config opts to be in neutron/conf/common so
    that all the configuration options reside in a centralized location.
    This simplifies the process of looking up the config opts and provides
    an easy way to import.

    Moved conf/common/config.py to conf/common.py as per review comments.

    Partial-Bug: #1563069

    Change-Id: Ib5fa294906549237630f87b9c848eebe0644088c

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/349074

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/323046
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=7f9610c591b209392bc4a169fc8321d834135255
Submitter: Jenkins
Branch: master

commit 7f9610c591b209392bc4a169fc8321d834135255
Author: Aradhana Singh <email address hidden>
Date: Tue May 31 00:45:44 2016 +0000

    Refactoring config options for cmd

    Refactoring neutron configuration options for cmd to be in
    neutron/conf. This would allow centralization of all configuration
    options and provide an easy way to import.

    Change-Id: I0bb7c88050aa5e931a53406d29b5b10c69c518bb
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.openstack.org/349341

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.openstack.org/349342

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/349342
Committed: https://git.openstack.org/cgit/openstack/neutron-vpnaas/commit/?id=06c8c0bbf9568dfcd518aacb3f12adcf4b4ef6cb
Submitter: Jenkins
Branch: master

commit 06c8c0bbf9568dfcd518aacb3f12adcf4b4ef6cb
Author: YAMAMOTO Takashi <email address hidden>
Date: Mon Aug 1 13:06:18 2016 +0900

    Update imports (common.config -> conf.common)

    Update after the recent refactoring. [1]

    [1] Ib5fa294906549237630f87b9c848eebe0644088c

    ----------------------------------------
    This commit also includes the following unrelated change to
    pass the gate.

    Fix a typo in ipsec_site_connection dpd specification

    Found by neutron-lib 0.3.0, which has a stricter validation
    than previous versions. [2]

    [2] Ia93ff849396c6e2a5a170d7c01629a38e412f037

    Closes-Bug: #1608314
    Partial-Bug: #1608346
    Related-Bug: #1563069
    Change-Id: I07430e3064d9900db94e6abcd6ab207030bd7c3d

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/350160

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/350734

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/340177
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=0810cbdad85fb06b1ece292e2a52b1a53c9359df
Submitter: Jenkins
Branch: master

commit 0810cbdad85fb06b1ece292e2a52b1a53c9359df
Author: Aradhana Singh <email address hidden>
Date: Sun Jul 10 22:31:06 2016 +0000

    Refactoring cfg opts for ml2 plugin linuxbridge

    Refactoring neutron ml2 linuxbridge drivers configuration options to
    be in neutron/conf/plugins/ml2/drivers/linuxbridge. This would allow
    centralization of all configuration options and provides an easy way
    to import.

    Change-Id: I4d86831978a18c96a9cf60df743246d46e7a8a05
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/352098

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/349341
Committed: https://git.openstack.org/cgit/openstack/neutron-fwaas/commit/?id=211e00d811876f5813ea0fabb74e919577f4a8dc
Submitter: Jenkins
Branch: master

commit 211e00d811876f5813ea0fabb74e919577f4a8dc
Author: YAMAMOTO Takashi <email address hidden>
Date: Mon Aug 1 13:02:00 2016 +0900

    Update imports (common.config -> conf.common)

    Update after the recent refactoring. [1]

    [1] Ib5fa294906549237630f87b9c848eebe0644088c

    Partial-Bug: #1608346
    Related-Bug: #1563069
    Change-Id: I68b6e7f50d39966ecec25e54377e1f208c821683

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/352471

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/352492

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/352565

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/352582

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/352591

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/352707

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/339177
Committed: https://git.openstack.org/cgit/openstack/neutron-fwaas/commit/?id=fc11d20ffe83b305855a5c45b38cd5529276b5f2
Submitter: Jenkins
Branch: master

commit fc11d20ffe83b305855a5c45b38cd5529276b5f2
Author: Aradhana Singh <email address hidden>
Date: Thu Jul 7 18:23:23 2016 +0000

    Updating imports as l3 agent config options

    neutron-fwaas imports neutron/agent/l3/config. This file is
    being refactored and moved to neutron/conf/agent/l3/config
    This patchset updates import statements.

    Change-Id: I62fd396ac9ccfbf99e84186f7f2b9c30e29dd707
    Partial-Bug: #1563069
    Depends-On: Ie7533ea55eaa4d0f2c1919131a75f56e027c4d6e

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/353220

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/347044
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=86bf29a45f383509325c0596856e299f8fc50fe2
Submitter: Jenkins
Branch: master

commit 86bf29a45f383509325c0596856e299f8fc50fe2
Author: Anindita Das <email address hidden>
Date: Mon Jul 25 21:58:37 2016 +0000

    Refactoring config options for services opts

    Refactoring neutron services config opts to be in neutron/conf/services
    so that all the configuration options for services reside in a
    centralized location. This simplifies the process of looking up the
    extension config opts and provides an easy way to import.

    Change-Id: Iad255b020910ee54bc6cce25f4f786376dfe3705
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/338559
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=b82b4c4d332cad0f926a50396d1b960a3732ca85
Submitter: Jenkins
Branch: master

commit b82b4c4d332cad0f926a50396d1b960a3732ca85
Author: Aradhana Singh <email address hidden>
Date: Wed Jul 6 21:22:03 2016 +0000

    Refactoring config options of l3 agent keepalived

    Refactoring configuration options for agent/l3/keepalived_state_change
    to be in neutron/conf/agent/l3. This would allow centralization of all
    configuration options under neutron/conf and provide an easy way to
    import.

    Change-Id: I18e5f683690cffd6e0ad5e35f459b86c5b3332ac
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/345486
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=38cdd93802a84c6a877d989f7f1dceb8eb67b278
Submitter: Jenkins
Branch: master

commit 38cdd93802a84c6a877d989f7f1dceb8eb67b278
Author: Anindita Das <email address hidden>
Date: Thu Jul 21 14:18:41 2016 +0000

    Refactoring config options for extension opts

    Refactoring neutron extension config allowedaddresspair opts to be in
    neutron/conf so that all the configuration options for extensions
    reside in a centralized location. This simplifies the process of
    looking up the extension config opts and provides an easy way to import.

    Partial-Bug: #1563069

    Change-Id: I0a3bf8e903d50513dbdc0734ff4c1a9637bf8c59

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/355635

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/355637

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/355664

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/350160
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=39aedaf745353935507d41fb3d04cd896e1b443b
Submitter: Jenkins
Branch: master

commit 39aedaf745353935507d41fb3d04cd896e1b443b
Author: sindhu devale <email address hidden>
Date: Tue Aug 2 16:46:35 2016 +0000

    Refactoring security group config options

    Refactoring neutron security grp config opts to be in
    neutron/conf/agent so that all the configuration options
    reside in a centralized location. This simplifies the
    process of looking up the config opts and provides an
    easy way to import.

    Change-Id: Ia9538f41dfd894ed55c1db1556b37aad09ad2ae1
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/352492
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=17f2df320c281f6f1ca71892e9fcf9e0376ac561
Submitter: Jenkins
Branch: master

commit 17f2df320c281f6f1ca71892e9fcf9e0376ac561
Author: Anindita Das <email address hidden>
Date: Mon Aug 8 15:56:20 2016 +0000

    Refactoring config options for plugin agent opts

    Refactoring neutron ml2 plugin agent driver config opts to be in
    neutron/conf/plugins/ml2/drivers/agent so that all the
    configuration options for agent drivers reside in a centralized
    location. This simplifies the process of looking up the agent driver
    config opts and provides an easy way to import.

    Change-Id: I673c10dfa35014fea129f7030139a89bfc20b272
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/349074
Committed: https://git.openstack.org/cgit/openstack/neutron-lbaas/commit/?id=60c1c945e4b25c42f771cc4cd697424c402a18af
Submitter: Jenkins
Branch: master

commit 60c1c945e4b25c42f771cc4cd697424c402a18af
Author: Anindita Das <email address hidden>
Date: Fri Jul 29 21:00:10 2016 +0000

    Updating imports for services prov_config options

    neutron-lbaas imports neutron/services/provider_configuration. This
    file is being refactored and moved to
    neutron/conf/services/provider_configuration. This patchset updates
    import statements.

    Change-Id: I5b5aaea65af0d82dd710da9c3efa0be68a7ff7d4
    Partial-Bug: #1563069
    Depends-On: Iad255b020910ee54bc6cce25f4f786376dfe3705

[OpenStack Infra (hudson-openstack)]

Change abandoned by Sindhu Devale (<email address hidden>) on branch: master
Review: https://review.openstack.org/355664

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.openstack.org/364472

[OpenStack Infra (hudson-openstack)]

Change abandoned by Sindhu Devale (<email address hidden>) on branch: master
Review: https://review.openstack.org/355635

[OpenStack Infra (hudson-openstack)]

Change abandoned by Sindhu Devale (<email address hidden>) on branch: master
Review: https://review.openstack.org/352582

[OpenStack Infra (hudson-openstack)]

Change abandoned by Sindhu Devale (<email address hidden>) on branch: master
Review: https://review.openstack.org/352707

[OpenStack Infra (hudson-openstack)]

Change abandoned by Sindhu Devale (<email address hidden>) on branch: master
Review: https://review.openstack.org/353220

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/364472
Committed: https://git.openstack.org/cgit/openstack/neutron-lbaas/commit/?id=d0f96c1c4f9d89eb92833810e5665eeb50fd3ad4
Submitter: Jenkins
Branch: master

commit d0f96c1c4f9d89eb92833810e5665eeb50fd3ad4
Author: John Perkins <email address hidden>
Date: Thu Sep 1 11:08:02 2016 -0600

    Temporarily support two INTERFACE_DRIVER_OPTS

    INTERFACE_DRIVER_OPTS is being moved out of neutron.agent.common.config
    into neutron.conf.agent.common [1]. This patch has neutron-lbaas looking
    for the values in the old location, and if they aren't found, gets
    them from the new location. This patchset is required for Jenkins+1
    in [1].

    [1] https://review.openstack.org/#/c/343045/

    Change-Id: I00e87e9c6f71a8a59e024a9795c48f7699387d85
    Related-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/355637
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=20bdfaa1c369d29c191b0ae5ba6e63f733f768fa
Submitter: Jenkins
Branch: master

commit 20bdfaa1c369d29c191b0ae5ba6e63f733f768fa
Author: Aradhana Singh <email address hidden>
Date: Mon Aug 15 20:39:09 2016 +0000

    Removing unused file neutron/agent/l3/config

    l3 agent config options has been refactored to
    neutron/conf/agent/l3/config.py.
    Following patches have been merged
    https://review.openstack.org/#/c/338596
    https://review.openstack.org/#/c/339177/
    This patchset removes unused file.

    Change-Id: I8235e275e20863f68d53628b5f9d71138c468629
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/346245
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=2823c2e569776b023f889af8d2bd22c2453950f1
Submitter: Jenkins
Branch: master

commit 2823c2e569776b023f889af8d2bd22c2453950f1
Author: Aradhana Singh <email address hidden>
Date: Fri Jul 22 21:35:23 2016 +0000

    Refactoring config options for l3 ha agent opts

    Refactoring l3 ha agent options to be in neutron/conf/agent/l3.
    This would allow centralization of all configuration options and
    provides an easy way to import.

    Partial-Bug: #1563069
    Change-Id: I2d6bd6beb0d1658baf88c49b954d2db3136e0c8d

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/340187
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=62fd09afc766d6a94a05efa27e0dc5b9772e85bf
Submitter: Jenkins
Branch: master

commit 62fd09afc766d6a94a05efa27e0dc5b9772e85bf
Author: Aradhana Singh <email address hidden>
Date: Mon Jul 11 00:53:33 2016 +0000

    Refactoring config options for ml2 plugin drivers

    Refactoring neutron ml2 drivers configuration options to be in
    neutron/conf/plugins/ml2/drivers. This would allow centralization of
    all configuration options and provides an easy way to import.

    Change-Id: I825bfed769bff92de010733b16f4a4b5171a052c
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/350734
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=d34bbf57cf5a8316944810e7309ac60383ad87eb
Submitter: Jenkins
Branch: master

commit d34bbf57cf5a8316944810e7309ac60383ad87eb
Author: Anindita Das <email address hidden>
Date: Wed Aug 3 18:45:10 2016 +0000

    Refactoring config options for cache_utils opts

    Refactoring neutron cache_utils config opts to be in neutron/conf so that all
    the configuration options for cache_utils reside in a centralized location.
    This simplifies the process of looking up the cache_utils config opts and
    provides an easy way to import.

    Change-Id: I722a2fa7d72c62e6d878d0137f899d09a9ad64ae
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/352565
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=5e1c3c705e4ab9ca52ae5cef1bdd79443808a27d
Submitter: Jenkins
Branch: master

commit 5e1c3c705e4ab9ca52ae5cef1bdd79443808a27d
Author: Anindita Das <email address hidden>
Date: Mon Aug 8 19:09:57 2016 +0000

    Refactoring config options for plugin macvtap opts

    Refactoring neutron ml2 plugin macvtap driver config opts to be in
    neutron/conf/plugins/ml2/drivers/macvtap so that all the
    configuration options for macvtap drivers reside in a centralized
    location. This simplifies the process of looking up the macvtap driver
    config opts and provides an easy way to import.

    Change-Id: I1768eefb9eadcea19bcb675cbd96a6cb728b4123
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/346162
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=fcc13b5f8fe3bf55b7ef2adc93eaa3b620c67e0d
Submitter: Jenkins
Branch: master

commit fcc13b5f8fe3bf55b7ef2adc93eaa3b620c67e0d
Author: sindhu devale <email address hidden>
Date: Fri Jul 22 18:04:56 2016 +0000

    Refactoring agent metadata config

    Refactoring neutron agent metadata config opts to be in
    neutron/conf/agent/metadata so that all the configurations options
    reside in a centralized location. This simplifies the process of looking
    up the config opts and provides an easy way to import.

    Change-Id: I8bae1facc58a4f9e21196f625478532403651545
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/348513
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=d7b40d172935df2bacd050012a12a05791dc4e4a
Submitter: Jenkins
Branch: master

commit d7b40d172935df2bacd050012a12a05791dc4e4a
Author: Anindita Das <email address hidden>
Date: Thu Jul 28 18:48:11 2016 +0000

    Refactoring config options for l2 agent ext opts

    Refactoring neutron l2 agent extension config agent_ext_manager
    and fdb_population opts to be in neutron/conf/agent so that all the
    configuration options for l2 agent extensions reside in a centralized
    location. This simplifies the process of looking up the l2 agent
    extension config opts and provides an easy way to import.

    Change-Id: I4ae842c6cfd62edad9a1d435ffad6bec760a2809
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/352591
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=1e91b6392ef73498a8873dbe30287ee8c2d6dbe3
Submitter: Jenkins
Branch: master

commit 1e91b6392ef73498a8873dbe30287ee8c2d6dbe3
Author: Anindita Das <email address hidden>
Date: Mon Aug 8 19:57:25 2016 +0000

    Refactoring config options for plugin l2pop opts

    Refactoring neutron ml2 plugin l2pop driver config opts to be in
    neutron/conf/plugins/ml2/drivers/l2pop so that all the
    configuration options for l2pop drivers reside in a centralized
    location. This simplifies the process of looking up the l2pop driver
    config opts and provides an easy way to import.

    Change-Id: Ia06c0c31ef40c691d67cfc5d514fdff907f5dca4
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/352098
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=78d5b240c09c326a1e3e4abdaa23111246e2b82b
Submitter: Jenkins
Branch: master

commit 78d5b240c09c326a1e3e4abdaa23111246e2b82b
Author: Anindita Das <email address hidden>
Date: Sun Aug 7 17:22:29 2016 +0000

    Refactoring config options for mech_sriov opts

    Refactoring neutron ml2 plugin mech_sriov config opts to be in
    neutron/conf/plugins/ml2/drivers/mech_sriov so that all the
    configuration options for mech_sriov reside in a centralized
    location. This simplifies the process of looking up the mech_sriov
    config opts and provides an easy way to import.

    Change-Id: I64b243f91f2e637279456b3b06c2998cd89dc076
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/345592
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=42031f75478e888b756a74a22bfa4672a93dd4d6
Submitter: Jenkins
Branch: master

commit 42031f75478e888b756a74a22bfa4672a93dd4d6
Author: Aradhana Singh <email address hidden>
Date: Thu Jul 21 18:01:15 2016 +0000

    Refactoring config opts for ml2 plugin openvswitch

    Refactoring ml2 plugin openvswitch driver configuration options to be
    in neutron/conf/plugins/ml2/drivers. This would allow centralization
    of all configuration options and provides an easy way to import.

    Change-Id: Ie8c6023b2d012eae7ecdb99d5d413956608f4294
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/343045
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=7f23ccce23066af3a977c3accb04d3927bb467fb
Submitter: Jenkins
Branch: master

commit 7f23ccce23066af3a977c3accb04d3927bb467fb
Author: John Perkins <email address hidden>
Date: Fri Jul 15 12:44:03 2016 -0600

    Agent common config

    Refactoring Neutron configuration options for agent common config to be
    in neutron/conf/agent/common. This will allow centralization of all
    configuration options and provide an easy way to import.

    Partial-Bug: #1563069
    Change-Id: Iebac0cdd3bcfd0135349128921b7ad7a1a939ab8
    Needed-By: Ib676003bbe909b5a9013a3178b12dbe291d936af

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/347867
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=51ca6837974a19369504f7cba7749d4e01d25a1f
Submitter: Jenkins
Branch: master

commit 51ca6837974a19369504f7cba7749d4e01d25a1f
Author: sindhu devale <email address hidden>
Date: Wed Jul 27 04:39:07 2016 +0000

    Refactoring agent linux&ovsdb config

    Refactoring neutron agent linux and ovsdb config opts
    to be in neutron/conf/agent so that all the config options
    reside in a centralized location. This simplifies the
    process of looking up the config opts and provides an easy
    way to import.

    NeutronLibImpact

    Change-Id: Ib1e0e63dec2985c417412d1ecc68e2a74ef87182
    Partial-Bug: #1563069

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/340228
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=d00a50aad11465d904663dea14b3814017bcff75
Submitter: Jenkins
Branch: master

commit d00a50aad11465d904663dea14b3814017bcff75
Author: Aradhana Singh <email address hidden>
Date: Mon Jul 11 06:44:43 2016 +0000

    Refactoring config options for ml2 config opts

    Refactoring neutron ml2 config opts to be in neutron/conf/plugins/ml2.
    This would allow centralization of all configuration options and
    provides an easy way to import.

    NeutronLibImpact

    Change-Id: Ibc5a9ab268578c243ef13f7e0041bacd6c0c410b
    Partial-Bug: #1563069
    Needed-By: Id0a97dda7718f06e33b2d30ce01cdcb3e9a46f7d

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/344877
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=3a098ea0e88e7dc42897c43d84e66962c9b4c4dd
Submitter: Zuul
Branch: master

commit 3a098ea0e88e7dc42897c43d84e66962c9b4c4dd
Author: sindhudevale <email address hidden>
Date: Wed Jul 20 06:13:17 2016 +0000

    Refactoring db config options

    Refactoring neutron db config opts to be in neutron/conf/db/ and
    neutron/conf/agent/database/ so that all the configuration options
    reside in a centralized location. This simplifies the process of
    looking up the config opts and provides an easy way to import.

    Change-Id: I4da9bb48d49b99e8c2b34a5c1b83e7eb95b70b82
    Partial-Bug: #1563069