Merge "neutron: remove deprecated allow_duplicate_networks config option"

doc/common/tables/nova-conf-changes.xml

@@ -706,9 +706,5 @@
       <td>[neutron] url_timeout</td>
       <td>[neutron] timeout</td>
     </tr>
-    <tr>
-      <td>[neutron] allow_duplicate_networks</td>
-      <td>None</td>
-    </tr>
   </table>
 </section>

doc/common/tables/nova-neutron.xml

@@ -48,10 +48,6 @@
         <td><option>admin_username</option> = <replaceable>None</replaceable></td>
         <td>(StrOpt) Username for connecting to neutron in admin context DEPRECATED: specify an auth_plugin and appropriate credentials instead.</td>
       </tr>
-      <tr>
-        <td><option>allow_duplicate_networks</option> = <replaceable>False</replaceable></td>
-        <td>(BoolOpt) DEPRECATED: Allow an instance to have multiple vNICs attached to the same Neutron network. This option is deprecated in the 2015.1 release and will be removed in the 2015.2 release where the default behavior will be to always allow multiple ports from the same network to be attached to an instance.</td>
-      </tr>
       <tr>
         <td><option>auth_plugin</option> = <replaceable>None</replaceable></td>
         <td>(StrOpt) Name of the plugin to load</td>

tools/autogenerate-config-flagmappings/nova.flagmappings

@@ -609,7 +609,6 @@ neutron/admin_tenant_id neutron
 neutron/admin_tenant_name neutron
 neutron/admin_user_id neutron
 neutron/admin_username neutron
-neutron/allow_duplicate_networks neutron
 neutron/auth_plugin neutron
 neutron/auth_section neutron
 neutron/auth_strategy neutron