Merge "Update neutron content for Juno"

doc/glossary/glossary-terms.xml

@@ -4548,6 +4548,20 @@
       </glossdef>
     </glossentry>
 
+    <glossentry>
+      <glossterm>ipset</glossterm>
+      <indexterm class="singular">
+          <primary>ipset</primary>
+        </indexterm>
+
+      <glossdef>
+        <para>Extension to iptables that allows creation of firewall rules
+          that match entire "sets" of IP addresses simultaneously. These
+          sets reside in indexed data structures to increase efficiency,
+          particularly on systems with a large quantity of rules.</para>
+      </glossdef>
+    </glossentry>
+
     <glossentry>
       <glossterm>iptables</glossterm>
       <indexterm class="singular">

doc/install-guide/section_neutron-compute-node.xml

@@ -26,9 +26,9 @@ net.ipv4.conf.default.rp_filter=0</programlisting>
   <procedure os="ubuntu;rhel;centos;fedora;sles;opensuse">
     <title>To install the Networking components</title>
     <step>
-      <screen os="ubuntu"><prompt>#</prompt> <userinput>apt-get install neutron-plugin-ml2 neutron-plugin-openvswitch-agent</userinput></screen>
+      <screen os="ubuntu"><prompt>#</prompt> <userinput>apt-get install neutron-plugin-ml2 neutron-plugin-openvswitch-agent ipset</userinput></screen>
-      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-neutron-ml2 openstack-neutron-openvswitch</userinput></screen>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-neutron-ml2 openstack-neutron-openvswitch ipset</userinput></screen>
-      <screen os="sles;opensuse"><prompt>#</prompt> <userinput>zypper install openstack-neutron-openvswitch-agent</userinput></screen>
+      <screen os="sles;opensuse"><prompt>#</prompt> <userinput>zypper install openstack-neutron-openvswitch-agent ipset</userinput></screen>
       <note os="sles;opensuse">
         <para>SUSE does not use a separate ML2 plug-in package.</para>
       </note>
@@ -167,11 +167,13 @@ tunnel_id_ranges = 1:1000</programlisting>
         </step>
         <step>
           <para>In the <literal>[securitygroup]</literal> section, enable
-            security groups and configure the OVS
+            security groups, enable <glossterm>ipset</glossterm>, and
-            <glossterm>iptables</glossterm> firewall driver:</para>
+            configure the OVS <glossterm>iptables</glossterm> firewall
+            driver:</para>
           <programlisting language="ini">[securitygroup]
 ...
 enable_security_group = True
+enable_ipset = True
 firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</programlisting>
         </step>
        <step>

doc/install-guide/section_neutron-controller-node.xml

@@ -301,11 +301,13 @@ tunnel_id_ranges = 1:1000</programlisting>
         </step>
         <step>
           <para>In the <literal>[securitygroup]</literal> section, enable
-            security groups and configure the OVS
+            security groups, enable <glossterm>ipset</glossterm>, and
-            <glossterm>iptables</glossterm> firewall driver:</para>
+            configure the OVS <glossterm>iptables</glossterm> firewall
+            driver:</para>
           <programlisting language="ini">[securitygroup]
 ...
 enable_security_group = True
+enable_ipset = True
 firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</programlisting>
         </step>
       </substeps>

doc/install-guide/section_neutron-network-node.xml

@@ -27,10 +27,10 @@ net.ipv4.conf.default.rp_filter=0</programlisting>
     <title>To install the Networking components</title>
     <step>
       <screen os="ubuntu"><prompt>#</prompt> <userinput>apt-get install neutron-plugin-ml2 neutron-plugin-openvswitch-agent \
-  neutron-l3-agent neutron-dhcp-agent</userinput></screen>
+  neutron-l3-agent neutron-dhcp-agent ipset</userinput></screen>
-      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-neutron openstack-neutron-ml2 openstack-neutron-openvswitch</userinput></screen>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-neutron openstack-neutron-ml2 openstack-neutron-openvswitch ipset</userinput></screen>
       <screen os="sles;opensuse"><prompt>#</prompt> <userinput>zypper install openstack-neutron-openvswitch-agent openstack-neutron-l3-agent \
-  openstack-neutron-dhcp-agent openstack-neutron-metadata-agent</userinput></screen>
+  openstack-neutron-dhcp-agent openstack-neutron-metadata-agent ipset</userinput></screen>
       <note os="sles;opensuse">
         <para>SUSE does not use a separate ML2 plug-in package.</para>
       </note>
@@ -180,11 +180,13 @@ tunnel_id_ranges = 1:1000</programlisting>
         </step>
         <step>
           <para>In the <literal>[securitygroup]</literal> section, enable
-            security groups and configure the OVS
+            security groups, enable <glossterm>ipset</glossterm>, and
-            <glossterm>iptables</glossterm> firewall driver:</para>
+            configure the OVS <glossterm>iptables</glossterm> firewall
+            driver:</para>
           <programlisting language="ini">[securitygroup]
 ...
 enable_security_group = True
+enable_ipset = True
 firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver</programlisting>
         </step>
         <step>