diff options
| author | mark mcclain <mmcclain@yahoo-inc.com> | 2014-09-02 20:02:06 +0000 |
|---|---|---|
| committer | Mark McClain <mmcclain@yahoo-inc.com> | 2014-09-02 18:05:06 -0400 |
| commit | 86b6442cac309534003e81df80a9efb1a96363d3 (patch) | |
| tree | e3e6d4821f7fab8b8da21d86395a332c51fd114c /etc | |
| parent | eab2a21f6257807fe4c4bb36e7e346e6e737646b (diff) | |
| download | neutron-86b6442cac309534003e81df80a9efb1a96363d3.tar.gz | |
Revert "Cisco DFA ML2 Mechanism Driver"
This reverts commit 3680fd61c9a1cceaa011b4d0d37d235abf490c50.
The reverted patch incorrectly ties with Keystone and should have never been
approved since the approved version only partially addressed review concerns.
This revert also ensure migration timeline integrity.
Change-Id: If5fbdade72c762b21a477676ded816ce5be97ca5
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/neutron/plugins/ml2/ml2_conf.ini | 1 | ||||
| -rw-r--r-- | etc/neutron/plugins/ml2/ml2_conf_cisco.ini | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/etc/neutron/plugins/ml2/ml2_conf.ini b/etc/neutron/plugins/ml2/ml2_conf.ini index f4c1d18877..6325e714ee 100644 --- a/etc/neutron/plugins/ml2/ml2_conf.ini +++ b/etc/neutron/plugins/ml2/ml2_conf.ini @@ -20,7 +20,6 @@ # Example: mechanism_drivers = cisco,logger # Example: mechanism_drivers = openvswitch,brocade # Example: mechanism_drivers = linuxbridge,brocade -# Example: mechanism_drivers = openvswitch,cisco_dfa # (ListOpt) Ordered list of extension driver entrypoints # to be loaded from the neutron.ml2.extension_drivers namespace. diff --git a/etc/neutron/plugins/ml2/ml2_conf_cisco.ini b/etc/neutron/plugins/ml2/ml2_conf_cisco.ini index c2582e0835..1b69100e77 100644 --- a/etc/neutron/plugins/ml2/ml2_conf_cisco.ini +++ b/etc/neutron/plugins/ml2/ml2_conf_cisco.ini @@ -116,17 +116,3 @@ # encap=vlan-100 # cidr_exposed=10.10.40.2/16 # gateway_ip=10.10.40.1 - -[ml2_cisco_dfa] -# (StrOpt) IP address of Cisco DCNM (Data Center Network Manager). -# dcnm_ip = 1.1.1.1 -# -# (StrOpt) User login name for DCNM. -# dcnm_user = username -# -# (StrOpt) Login password for DCNM. -# dcnm_password = password -# -# (StrOpt) Gateway MAC address when forwarding mode in created config profile -# is proxy mode. -# gateway_mac = 00:01:02:03:04:05 |