| author | Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com> |
| Thu, 21 Jul 2016 09:32:01 -0700 | |
| branch | s11u3-sru |
| changeset 6444 | bf62eba2612a |
| permissions | -rw-r--r-- |
|
6444
bf62eba2612a
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to remove confusing namespace warning message in the log file. |
|
bf62eba2612a
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
2 |
|
|
bf62eba2612a
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
3 |
--- neutron-2015.1.2/neutron/agent/common/config.py.orig Tue Jul 12 13:31:47 2016 |
|
bf62eba2612a
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
4 |
+++ neutron-2015.1.2/neutron/agent/common/config.py Tue Jul 12 13:32:04 2016 |
|
bf62eba2612a
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
5 |
@@ -54,8 +54,7 @@ |
|
bf62eba2612a
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
6 |
USE_NAMESPACES_OPTS = [ |
|
bf62eba2612a
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
7 |
cfg.BoolOpt('use_namespaces', default=True,
|
|
bf62eba2612a
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
8 |
help=_("Allow overlapping IP. This option is deprecated and "
|
|
bf62eba2612a
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
9 |
- "will be removed in a future release."), |
|
bf62eba2612a
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
10 |
- deprecated_for_removal=True), |
|
bf62eba2612a
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
11 |
+ "will be removed in a future release.")), |
|
bf62eba2612a
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
12 |
] |
|
bf62eba2612a
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
13 |
|
|
bf62eba2612a
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff
changeset
|
14 |
IPTABLES_OPTS = [ |