|
1 In-house patch to further adjust Neutron's oslo-config-generator files |
|
2 to account for which modules are actually imported for each service and |
|
3 to include the Solaris Neutron options in the corresponding |
|
4 configuration files. This patch potentially can be sent upstream. |
|
5 |
|
6 --- neutron-8.1.2/etc/oslo-config-generator/dhcp_agent.ini.~1~ 2016-06-09 18:45:29.000000000 -0700 |
|
7 +++ neutron-8.1.2/etc/oslo-config-generator/dhcp_agent.ini 2016-07-20 13:31:54.054132810 -0700 |
|
8 @@ -5,3 +5,6 @@ wrap_width = 79 |
|
9 namespace = neutron.base.agent |
|
10 namespace = neutron.dhcp.agent |
|
11 namespace = oslo.log |
|
12 +namespace = oslo.concurrency |
|
13 +namespace = oslo.messaging |
|
14 +namespace = oslo.service.service |
|
15 --- neutron-8.1.2/etc/oslo-config-generator/l3_agent.ini.~1~ 2016-06-09 18:45:29.000000000 -0700 |
|
16 +++ neutron-8.1.2/etc/oslo-config-generator/l3_agent.ini 2016-07-20 13:32:06.220585515 -0700 |
|
17 @@ -5,3 +5,7 @@ wrap_width = 79 |
|
18 namespace = neutron.base.agent |
|
19 namespace = neutron.l3.agent |
|
20 namespace = oslo.log |
|
21 +namespace = oslo.concurrency |
|
22 +namespace = oslo.messaging |
|
23 +namespace = oslo.service.periodic_task |
|
24 +namespace = oslo.service.service |
|
25 --- neutron-8.1.2/etc/oslo-config-generator/metadata_agent.ini.~1~ 2016-06-09 18:45:36.000000000 -0700 |
|
26 +++ neutron-8.1.2/etc/oslo-config-generator/metadata_agent.ini 2016-07-20 17:21:11.247524910 -0700 |
|
27 @@ -4,3 +4,5 @@ wrap_width = 79 |
|
28 |
|
29 namespace = neutron.metadata.agent |
|
30 namespace = oslo.log |
|
31 +namespace = oslo.concurrency |
|
32 +namespace = oslo.messaging |
|
33 --- neutron-8.1.2/etc/oslo-config-generator/neutron.conf.~1~ 2016-06-09 18:45:29.000000000 -0700 |
|
34 +++ neutron-8.1.2/etc/oslo-config-generator/neutron.conf 2016-07-20 00:31:17.805667675 -0700 |
|
35 @@ -13,7 +13,11 @@ namespace = oslo.db |
|
36 namespace = oslo.policy |
|
37 namespace = oslo.concurrency |
|
38 namespace = oslo.messaging |
|
39 -namespace = oslo.middleware.cors |
|
40 +namespace = oslo.middleware |
|
41 namespace = oslo.service.sslutils |
|
42 namespace = oslo.service.wsgi |
|
43 namespace = keystonemiddleware.auth_token |
|
44 +namespace = oslo.reports |
|
45 +namespace = oslo.service.periodic_task |
|
46 +namespace = oslo.service.service |
|
47 +namespace = oslo.versionedobjects |
|
48 --- neutron-8.1.2/neutron/opts.py.~1~ 2016-06-09 18:45:36.000000000 -0700 |
|
49 +++ neutron-8.1.2/neutron/opts.py 2016-07-19 15:10:18.760175240 -0700 |
|
50 @@ -23,12 +23,15 @@ import neutron.agent.dhcp.config |
|
51 import neutron.agent.l2.extensions.manager |
|
52 import neutron.agent.l3.config |
|
53 import neutron.agent.l3.ha |
|
54 +import neutron.agent.l3.solaris_agent |
|
55 import neutron.agent.linux.interface |
|
56 import neutron.agent.linux.pd |
|
57 import neutron.agent.linux.ra |
|
58 import neutron.agent.metadata.config |
|
59 import neutron.agent.ovsdb.api |
|
60 import neutron.agent.securitygroups_rpc |
|
61 +import neutron.agent.solaris.interface |
|
62 +import neutron.agent.solaris.ra |
|
63 import neutron.db.agents_db |
|
64 import neutron.db.agentschedulers_db |
|
65 import neutron.db.dvr_mac_db |
|
66 @@ -195,7 +198,10 @@ def list_l3_agent_opts(): |
|
67 neutron.service.service_opts, |
|
68 neutron.agent.l3.ha.OPTS, |
|
69 neutron.agent.linux.pd.OPTS, |
|
70 - neutron.agent.linux.ra.OPTS) |
|
71 + neutron.agent.linux.ra.OPTS, |
|
72 + neutron.agent.l3.solaris_agent.L3NATAgent.OPTS, |
|
73 + neutron.agent.solaris.interface.OPTS, |
|
74 + neutron.agent.solaris.ra.OPTS) |
|
75 ) |
|
76 ] |
|
77 |