Improved network interface configuration

Changed network interface configuration to use more generic naming
which improves compatibility with more distributions. For example,
RHEL 7 uses "ens#" rather than "eth#" for interface names. These
changes also required updating various diagrams. This patch also
removes redundant configuration instructions from the "Configure a
compute node" section covered by architecture and basic environment
configuration sections.

Change-Id: Ia3c895d938c341398a9544f5eb10bb7346a29a06
Closes-Bug: #1312273

doc/install-guide/figures/installguide_arch-neutron.svg

@@ -26,8 +26,8 @@
      inkscape:pageshadow="2"
      inkscape:zoom="1"
      inkscape:cx="469.99999"
-     inkscape:cy="307.83151"
+     inkscape:cy="269.75908"
-     inkscape:current-layer="g3567"
+     inkscape:current-layer="layer1"
      id="namedview4400"
      showgrid="true"
      inkscape:snap-bbox="true"
@@ -50,7 +50,8 @@
        enabled="true"
        snapvisiblegridlinesonly="true"
        originx="-20.000007px"
-       originy="-399.98715px" />
+       originy="-399.98715px"
+       dotted="false" />
   </sodipodi:namedview>
   <metadata
      id="metadata4402">
@@ -176,7 +177,7 @@
          rx="5.0000005"
          y="373.34317"
          x="20.980988"
-         height="71.287132"
+         height="68.025177"
          width="298.03802"
          id="rect9004"
          style="fill:#606060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.96200013;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
@@ -205,7 +206,7 @@
            id="tspan7731-2-8-7"
            y="428.22711"
            x="89.999985"
-           sodipodi:role="line">MySQL</tspan></text>
+           sodipodi:role="line">MySQL or MariaDB</tspan></text>
       <rect
          ry="5"
          rx="5.0000005"
@@ -226,7 +227,7 @@
            id="tspan7731-2-8-7-8"
            y="412.36218"
            x="249.99997"
-           sodipodi:role="line">AMQP</tspan><tspan
+           sodipodi:role="line">Message Broker</tspan><tspan
            id="tspan9002"
            style="font-size:12px;font-style:oblique;-inkscape-font-specification:Sans Oblique"
            y="428.22711"
@@ -575,16 +576,18 @@
          x="170"
          style="font-size:12px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
          xml:space="preserve"><tspan
-           style="font-size:14px;fill:#ffffff"
-           y="812.36218"
-           x="170"
-           id="tspan7729-1-9-6-8-9"
-           sodipodi:role="line">Management</tspan><tspan
            style="font-size:12px;font-style:oblique;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
            id="tspan7731-2-4-2-1-8"
+           y="812.36218"
+           x="171.94141"
+           sodipodi:role="line"><tspan
+             id="tspan3127"
+             style="font-size:14px;font-style:normal;fill:#ffffff">1: Management </tspan></tspan><tspan
+           style="font-size:12px;font-style:oblique;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
            y="828.22711"
            x="170"
-           sodipodi:role="line">eth0: 10.0.0.11/24</tspan></text>
+           sodipodi:role="line"
+           id="tspan3129">10.0.0.11/24</tspan></text>
       <text
          sodipodi:linespacing="125%"
          id="text8526"
@@ -692,16 +695,18 @@
          x="429.99997"
          style="font-size:12px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
          xml:space="preserve"><tspan
-           style="font-size:14px;fill:#ffffff"
-           y="712.36212"
-           x="429.99997"
-           id="tspan7729-1-9-6-8-9-9"
-           sodipodi:role="line">Management</tspan><tspan
            style="font-size:12px;font-style:oblique;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
            id="tspan7731-2-4-2-1-8-0"
+           y="712.36212"
+           x="429.99997"
+           sodipodi:role="line"><tspan
+   id="tspan3131"
+   style="font-size:14px;font-style:normal;fill:#ffffff">1: Management</tspan></tspan><tspan
+           style="font-size:12px;font-style:oblique;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
            y="728.22705"
            x="429.99997"
-           sodipodi:role="line">eth0: 10.0.0.21/24</tspan></text>
+           sodipodi:role="line"
+           id="tspan3133">10.0.0.21/24</tspan></text>
       <text
          sodipodi:linespacing="125%"
          id="text8526-3"
@@ -739,16 +744,18 @@
          x="429.99997"
          style="font-size:12px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
          xml:space="preserve"><tspan
-           style="font-size:14px;fill:#ffffff;fill-opacity:1"
-           y="812.36212"
-           x="429.99997"
-           id="tspan7729-1-9-6-8-9-9-4"
-           sodipodi:role="line">External</tspan><tspan
            style="font-size:12px;font-style:oblique;fill:#ffffff;fill-opacity:1;-inkscape-font-specification:Sans Oblique"
            id="tspan7731-2-4-2-1-8-0-4"
+           y="812.36212"
+           x="429.99997"
+           sodipodi:role="line"><tspan
+   id="tspan3139"
+   style="font-size:14px;font-style:normal;fill:#ffffff;fill-opacity:1">3: External</tspan></tspan><tspan
+           style="font-size:12px;font-style:oblique;fill:#ffffff;fill-opacity:1;-inkscape-font-specification:Sans Oblique"
            y="828.22705"
            x="429.99997"
-           sodipodi:role="line">eth2: (unnumbered)</tspan></text>
+           sodipodi:role="line"
+           id="tspan3141">(unnumbered)</tspan></text>
       <text
          sodipodi:linespacing="125%"
          id="text7727-7-4-3-8-4-9-7"
@@ -756,16 +763,16 @@
          x="429.99997"
          style="font-size:12px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
          xml:space="preserve"><tspan
-           style="font-size:14px;fill:#ffffff"
+           style="font-size:13px;font-style:normal;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
+           id="tspan7731-2-4-2-1-8-0-3"
            y="762.36212"
            x="429.99997"
-           id="tspan7729-1-9-6-8-9-9-8"
+           sodipodi:role="line">2: Instance Tunnels</tspan><tspan
-           sodipodi:role="line">Instance Tunnels</tspan><tspan
            style="font-size:12px;font-style:oblique;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
-           id="tspan7731-2-4-2-1-8-0-3"
            y="778.22705"
            x="429.99997"
-           sodipodi:role="line">eth1: 10.0.1.21/24</tspan></text>
+           sodipodi:role="line"
+           id="tspan3137">10.0.1.21/24</tspan></text>
     </g>
     <g
        transform="translate(1.2516975e-5,-308.26769)"
@@ -846,16 +853,18 @@
          x="610"
          style="font-size:12px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
          xml:space="preserve"><tspan
-           style="font-size:14px;fill:#ffffff"
-           y="762.36218"
-           x="610"
-           id="tspan7729-1-9-6-8-9-9-1"
-           sodipodi:role="line">Management</tspan><tspan
            style="font-size:12px;font-style:oblique;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
            id="tspan7731-2-4-2-1-8-0-9"
+           y="762.36218"
+           x="610"
+           sodipodi:role="line"><tspan
+   id="tspan3143"
+   style="font-size:14px;font-style:normal;fill:#ffffff">1: Management</tspan></tspan><tspan
+           style="font-size:12px;font-style:oblique;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
            y="778.22711"
            x="610"
-           sodipodi:role="line">eth0: 10.0.0.31/24</tspan></text>
+           sodipodi:role="line"
+           id="tspan3145">10.0.0.31/24</tspan></text>
       <rect
          ry="5"
          rx="5"
@@ -872,16 +881,16 @@
          x="610"
          style="font-size:12px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
          xml:space="preserve"><tspan
-           style="font-size:14px;fill:#ffffff"
+           style="font-size:13px;font-style:normal;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
+           id="tspan7731-2-4-2-1-8-0-3-0"
            y="812.36218"
            x="610"
-           id="tspan7729-1-9-6-8-9-9-8-6"
+           sodipodi:role="line">2: Instance Tunnels</tspan><tspan
-           sodipodi:role="line">Instance Tunnels</tspan><tspan
            style="font-size:12px;font-style:oblique;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
-           id="tspan7731-2-4-2-1-8-0-3-0"
            y="828.22711"
            x="610"
-           sodipodi:role="line">eth1: 10.0.1.31/24</tspan></text>
+           sodipodi:role="line"
+           id="tspan3149">10.0.1.31/24</tspan></text>
       <text
          sodipodi:linespacing="125%"
          id="text8526-3-9"

doc/install-guide/figures/installguide_arch-nova.svg

@@ -28,12 +28,12 @@
      inkscape:cx="292.46304"
      inkscape:cy="269.03294"
      inkscape:document-units="px"
-     inkscape:current-layer="g3722"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:snap-global="true"
      showguides="true"
      inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-bbox-midpoints="false"
      inkscape:window-width="1366"
      inkscape:window-height="746"
      inkscape:window-x="-8"
@@ -270,16 +270,18 @@
          x="430"
          style="font-size:12px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
          xml:space="preserve"><tspan
-           style="font-size:14px;fill:#ffffff"
-           y="763.52716"
-           x="430"
-           id="tspan7729-1-9-6-8-9-9-1"
-           sodipodi:role="line">Management</tspan><tspan
            style="font-size:12px;font-style:oblique;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
            id="tspan7731-2-4-2-1-8-0-9"
+           y="763.52716"
+           x="430"
+           sodipodi:role="line"><tspan
+             id="tspan3207"
+             style="font-size:14px;font-style:normal;fill:#ffffff">1: Management</tspan></tspan><tspan
+           style="font-size:12px;font-style:oblique;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
            y="779.39209"
            x="430"
-           sodipodi:role="line">eth0: 10.0.0.31/24</tspan></text>
+           sodipodi:role="line"
+           id="tspan3209">10.0.0.31/24</tspan></text>
       <rect
          ry="5"
          rx="5"
@@ -296,16 +298,18 @@
          x="430"
          style="font-size:12px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
          xml:space="preserve"><tspan
-           style="font-size:14px;fill:#ffffff;fill-opacity:1"
-           y="813.52716"
-           x="430"
-           id="tspan7729-1-9-6-8-9-9-8-6"
-           sodipodi:role="line">External</tspan><tspan
            style="font-size:12px;font-style:oblique;fill:#ffffff;fill-opacity:1;-inkscape-font-specification:Sans Oblique"
            id="tspan7731-2-4-2-1-8-0-3-0"
+           y="813.52716"
+           x="430"
+           sodipodi:role="line"><tspan
+             id="tspan3199"
+             style="font-size:14px;font-style:normal;fill:#ffffff;fill-opacity:1">2: External</tspan></tspan><tspan
+           style="font-size:12px;font-style:oblique;fill:#ffffff;fill-opacity:1;-inkscape-font-specification:Sans Oblique"
            y="829.39209"
            x="430"
-           sodipodi:role="line">eth1: (unnumbered)</tspan></text>
+           sodipodi:role="line"
+           id="tspan3201">(unnumbered)</tspan></text>
       <text
          sodipodi:linespacing="125%"
          id="text8526-3-9"
@@ -606,12 +610,12 @@
       <rect
          ry="4.9999995"
          rx="5.0000005"
-         y="374.50818"
+         y="374.50815"
          x="20.980988"
-         height="71.287132"
+         height="66.873001"
          width="298.03802"
          id="rect9004"
-         style="fill:#606060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.96200013;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="fill:#606060;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.96200001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <rect
          ry="5"
          rx="5.0000005"
@@ -637,7 +641,7 @@
            id="tspan7731-2-8-7"
            y="429.39212"
            x="89.999985"
-           sodipodi:role="line">MySQL</tspan></text>
+           sodipodi:role="line">MySQL or MariaDB</tspan></text>
       <rect
          ry="5"
          rx="5.0000005"
@@ -658,7 +662,7 @@
            id="tspan7731-2-8-7-8"
            y="413.52719"
            x="249.99998"
-           sodipodi:role="line">AMQP</tspan><tspan
+           sodipodi:role="line">Message Broker</tspan><tspan
            id="tspan9002"
            style="font-size:12px;font-style:oblique;-inkscape-font-specification:Sans Oblique"
            y="429.39212"
@@ -704,16 +708,18 @@
          x="170"
          style="font-size:12px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
          xml:space="preserve"><tspan
-           style="font-size:14px;fill:#ffffff"
-           y="813.52722"
-           x="170"
-           id="tspan7729-1-9-6-8-9"
-           sodipodi:role="line">Management</tspan><tspan
            style="font-size:12px;font-style:oblique;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
            id="tspan7731-2-4-2-1-8"
+           y="813.52722"
+           x="170"
+           sodipodi:role="line"><tspan
+             id="tspan3203"
+             style="font-size:14px;font-style:normal;fill:#ffffff">1: Management</tspan></tspan><tspan
+           style="font-size:12px;font-style:oblique;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
            y="829.39215"
            x="170"
-           sodipodi:role="line">eth0: 10.0.0.11/24</tspan></text>
+           sodipodi:role="line"
+           id="tspan3205">10.0.0.11/24</tspan></text>
       <text
          sodipodi:linespacing="125%"
          id="text8526"

doc/install-guide/figures/installguide_neutron-initial-networks.svg

@@ -112,7 +112,7 @@
      inkscape:pageshadow="2"
      inkscape:zoom="1.16"
      inkscape:cx="132.16466"
-     inkscape:cy="745.8053"
+     inkscape:cy="507.88406"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -143,7 +143,8 @@
        spacingx="1px"
        spacingy="1px"
        originx="-29.999991px"
-       originy="-432.53907px" />
+       originy="-432.53907px"
+       dotted="false" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -153,7 +154,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -220,7 +221,7 @@
          style="font-size:12px;font-style:oblique;fill:#ffffff;fill-opacity:1;-inkscape-font-specification:Sans Oblique"
          id="tspan7731-2-4-2-1-8-0-4"
          y="604.12817"
-         x="179.74023">eth2: (unnumbered)</tspan></text>
+         x="179.74023">(unnumbered)</tspan></text>
     <rect
        style="fill:#e0e0e0;fill-opacity:1;stroke:#000000;stroke-width:1.96199977;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        id="rect7705-0-8"
@@ -344,11 +345,11 @@
          style="font-size:14px;fill:#ffffff"
          id="tspan7729-1-9-6-8-9-9-8-6"
          y="307.45267"
-         x="179.64111">Instance Tunnel Interface</tspan><tspan
+         x="179.64111">Instance Tunnels Interface</tspan><tspan
          style="font-size:12px;font-style:oblique;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
          id="tspan7731-2-4-2-1-8-0-3-0"
          y="323.3176"
-         x="179.64111">eth1: 10.0.1.21/24</tspan></text>
+         x="179.64111">10.0.1.21/24</tspan></text>
     <text
        style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
        xml:space="preserve"
@@ -415,11 +416,11 @@
          style="font-size:14px;fill:#ffffff"
          id="tspan7729-1-9-6-8-9-9-8-6-3"
          y="149.45267"
-         x="179.64111">Instance Tunnel Interface</tspan><tspan
+         x="179.64111">Instance Tunnels Interface</tspan><tspan
          style="font-size:12px;font-style:oblique;fill:#ffffff;-inkscape-font-specification:Sans Oblique"
          id="tspan7731-2-4-2-1-8-0-3-0-2"
          y="165.3176"
-         x="179.64111">eth1: 10.0.1.31/24</tspan></text>
+         x="179.64111">10.0.1.31/24</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:14px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"

doc/install-guide/section_basics-networking-neutron.xml

@@ -13,6 +13,14 @@
     <glossterm>external network</glossterm>. The compute node contains
     one network interface on the management network and one on the
     instance tunnels network.</para>
+  <note>
+    <para>Network interface names vary by distribution. Traditionally,
+      interfaces use "eth" followed by a sequential number. To cover all
+      variations, this guide simply refers to the first interface as the
+      interface with the lowest number, the second interface as the
+      interface with the middle number, and the third interface as the
+      interface with the highest number.</para>
+  </note>
   <figure>
     <title>Three-node architecture with OpenStack Networking (neutron)</title>
     <mediaobject>
@@ -39,7 +47,7 @@
     <procedure>
       <title>To configure networking:</title>
       <step>
-        <para>Configure the management interface:</para>
+        <para>Configure the first interface as the management interface:</para>
         <para>IP address: 10.0.0.11</para>
         <para>Network mask: 255.255.255.0 (or /24)</para>
         <para>Default gateway: 10.0.0.1</para>
@@ -70,43 +78,48 @@
     <procedure>
       <title>To configure networking:</title>
       <step>
-        <para>Configure the management interface:</para>
+        <para>Configure the first interface as the management interface:</para>
         <para>IP address: 10.0.0.21</para>
         <para>Network mask: 255.255.255.0 (or /24)</para>
         <para>Default gateway: 10.0.0.1</para>
       </step>
       <step>
-        <para>Configure the instance tunnels interface:</para>
+        <para>Configure the second interface as the instance tunnels
+          interface:</para>
         <para>IP address: 10.0.1.21</para>
         <para>Network mask: 255.255.255.0 (or /24)</para>
       </step>
       <step>
         <para>The external interface uses a special configuration without an
-          IP address assigned to it. Configure the external interface:</para>
+          IP address assigned to it. Configure the third interface as the
+          external interface:</para>
+        <para>Replace <replaceable>INTERFACE_NAME</replaceable> with the
+          actual interface name. For example, <emphasis>eth2</emphasis> or
+          <emphasis>ens256</emphasis>.</para>
         <substeps>
           <step os="ubuntu;debian">
             <para>Edit the <filename>/etc/network/interfaces</filename> file
               to contain the following:</para>
             <programlisting># The external network interface
-auto eth2
+auto <replaceable>INTERFACE_NAME</replaceable>
-iface eth2 inet manual
+iface <replaceable>INTERFACE_NAME</replaceable> inet manual
         up ip link set dev $IFACE up
         down ip link set dev $IFACE down</programlisting>
           </step>
           <step os="rhel;centos;fedora">
             <para>Edit the
-              <filename>/etc/sysconfig/network-scripts/ifcfg-eth2</filename>
+              <filename>/etc/sysconfig/network-scripts/ifcfg-<replaceable>INTERFACE_NAME</replaceable></filename>
               file to contain the following:</para>
             <para>Do not change the <literal>HWADDR</literal> and
               <literal>UUID</literal> keys.</para>
-            <programlisting>DEVICE=eth2
+            <programlisting>DEVICE=<replaceable>INTERFACE_NAME</replaceable>
 TYPE=Ethernet
 ONBOOT="yes"
 BOOTPROTO="none"</programlisting>
           </step>
           <step os="sles;opensuse">
             <para>Edit the
-              <filename>/etc/sysconfig/network/ifcfg-eth2</filename> file to
+              <filename>/etc/sysconfig/network/ifcfg-<replaceable>INTERFACE_NAME</replaceable></filename> file to
               contain the following:</para>
             <programlisting>STARTMODE='auto'
 BOOTPROTO='static'</programlisting>
@@ -144,7 +157,7 @@ BOOTPROTO='static'</programlisting>
     <procedure>
       <title>To configure networking:</title>
       <step>
-        <para>Configure the management interface:</para>
+        <para>Configure the first interface as the management interface:</para>
         <para>IP address: 10.0.0.31</para>
         <para>Network mask: 255.255.255.0 (or /24)</para>
         <para>Default gateway: 10.0.0.1</para>
@@ -154,7 +167,8 @@ BOOTPROTO='static'</programlisting>
         </note>
       </step>
       <step>
-        <para>Configure the instance tunnels interface:</para>
+        <para>Configure the second interface as the instance tunnels
+          interface:</para>
         <para>IP address: 10.0.1.31</para>
         <para>Network mask: 255.255.255.0 (or /24)</para>
         <note>

doc/install-guide/section_basics-networking-nova.xml

@@ -10,6 +10,13 @@
     <glossterm>management network</glossterm>. The compute node contains
     one network interface on the management network and one on the
     <glossterm>external network</glossterm>.</para>
+  <note>
+    <para>Network interface names vary by distribution. Traditionally,
+      interfaces use "eth" followed by a sequential number. To cover all
+      variations, this guide simply refers to the first interface as the
+      interface with the lowest number and the second interface as the
+      interface with the highest number.</para>
+  </note>
   <figure>
     <title>Two-node architecture with legacy networking (nova-network)</title>
     <mediaobject>
@@ -36,7 +43,7 @@
     <procedure>
       <title>To configure networking:</title>
       <step>
-        <para>Configure the management interface:</para>
+        <para>Configure the first interface as the management interface:</para>
         <para>IP address: 10.0.0.11</para>
         <para>Network mask: 255.255.255.0 (or /24)</para>
         <para>Default gateway: 10.0.0.1</para>
@@ -64,7 +71,7 @@
     <procedure>
       <title>To configure networking:</title>
       <step>
-        <para>Configure the management interface:</para>
+        <para>Configure the first interface as the management interface:</para>
         <para>IP address: 10.0.0.31</para>
         <para>Network mask: 255.255.255.0 (or /24)</para>
         <para>Default gateway: 10.0.0.1</para>
@@ -75,32 +82,36 @@
       </step>
       <step>
         <para>The external interface uses a special configuration without an
-          IP address assigned to it. Configure the external interface:</para>
+          IP address assigned to it. Configure the second interface as the
+          external interface:</para>
+        <para>Replace <replaceable>INTERFACE_NAME</replaceable> with the
+          actual interface name. For example, <emphasis>eth1</emphasis> or
+          <emphasis>ens224</emphasis>.</para>
         <substeps>
           <step os="ubuntu;debian">
             <para>Edit the <filename>/etc/network/interfaces</filename> file
               to contain the following:</para>
             <programlisting># The external network interface
-auto eth1
+auto <replaceable>INTERFACE_NAME</replaceable>
-iface eth1 inet manual
+iface <replaceable>INTERFACE_NAME</replaceable> inet manual
         up ip link set dev $IFACE up
         down ip link set dev $IFACE down</programlisting>
           </step>
           <step os="rhel;centos;fedora">
             <para>Edit the
-              <filename>/etc/sysconfig/network-scripts/ifcfg-eth1</filename>
+              <filename>/etc/sysconfig/network-scripts/ifcfg-<replaceable>INTERFACE_NAME</replaceable></filename>
               file to contain the following:</para>
             <para>Do not change the <literal>HWADDR</literal> and
               <literal>UUID</literal> keys.</para>
-            <programlisting>DEVICE=eth1
+            <programlisting>DEVICE=<replaceable>INTERFACE_NAME</replaceable>
 TYPE=Ethernet
 ONBOOT="yes"
 BOOTPROTO="none"</programlisting>
           </step>
           <step os="sles;opensuse">
             <para>Edit the
-              <filename>/etc/sysconfig/network/ifcfg-eth1</filename> file to
+              <filename>/etc/sysconfig/network/ifcfg-<replaceable>INTERFACE_NAME</replaceable></filename>
-              contain the following:</para>
+              file to contain the following:</para>
             <programlisting>STARTMODE='auto'
 BOOTPROTO='static'</programlisting>
               </step>

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

@@ -456,8 +456,11 @@ enable_security_group = True</programlisting>
     </step>
     <step>
       <para>Add a port to the external bridge that connects to the physical
-        external network interface (eth2):</para>
+        external network interface:</para>
-      <screen><prompt>#</prompt> <userinput>ovs-vsctl add-port br-ex eth2</userinput></screen>
+      <para>Replace <replaceable>INTERFACE_NAME</replaceable> with the
+        actual interface name. For example, <emphasis>eth2</emphasis> or
+        <emphasis>ens256</emphasis>.</para>
+      <screen><prompt>#</prompt> <userinput>ovs-vsctl add-port br-ex <replaceable>INTERFACE_NAME</replaceable></userinput></screen>
       <note>
         <para>Depending on your network interface driver, you may need to
           disable <glossterm>Generic Receive Offload (GRO)</glossterm> to
@@ -465,7 +468,7 @@ enable_security_group = True</programlisting>
           network.</para>
         <para>To temporarily disable GRO on the external network interface
           while testing your environment:</para>
-        <screen><prompt>#</prompt> <userinput>ethtool -K eth2 gro off</userinput></screen>
+        <screen><prompt>#</prompt> <userinput>ethtool -K <replaceable>INTERFACE_NAME</replaceable> gro off</userinput></screen>
       </note>
     </step>
   </procedure>

doc/install-guide/section_nova-compute.xml

@@ -15,60 +15,7 @@
     guide uses KVM.</para>
   <procedure>
     <step>
-      <para>
+      <para>Install the Compute packages:</para>
-        Configure the system.  Use the instructions in <xref
-        linkend="ch_basics"/>, but note the following differences from
-        the controller node:</para>
-      <itemizedlist>
-        <listitem>
-          <para>Use different IP addresses when you configure
-              <filename>eth0</filename>. This guide uses
-              <literal>10.0.0.31</literal> for the management
-            network of the first compute node.
-            </para>
-            <para>
-              If you run OpenStack Networking (neutron), configure
-              <literal>eth1</literal> as instance tunnels interface
-              with IP address <literal>10.0.1.31</literal> for the
-              first compute node. For details, see the instructions in
-              <xref linkend="basics-neutron-networking-compute-node"/>
-          </para>
-            <para>
-              If you run legacy networking (nova-network), do not
-              configure <literal>eth1</literal> with a static IP
-              address. The networking component of OpenStack assigns
-              and configures an IP address. For details, see the
-              instructions in <xref
-              linkend="basics-networking-node-compute-node"/>.
-            </para>
-        </listitem>
-        <listitem>
-          <para>Set the host name to <literal>compute1</literal>. To
-            verify, use the <code>uname -n</code> parameter. Ensure
-            that the IP addresses and host names for both nodes are
-            listed in the <filename>/etc/hosts</filename> file on each
-            system.</para>
-        </listitem>
-        <listitem>
-          <para>Synchronize from the controller node. Follow the
-            instructions in <xref linkend="basics-ntp"/>.</para>
-        </listitem>
-        <listitem>
-          <para>Install the MySQL client libraries. You do not need to
-            install the MySQL database server or start the MySQL
-            service.</para>
-        </listitem>
-        <listitem>
-          <para>Enable the OpenStack packages for the distribution
-            that you are using. See <xref linkend="basics-packages"
-            />.</para>
-        </listitem>
-      </itemizedlist>
-    </step>
-    <step>
-      <para>After you configure the operating system, install the
-        appropriate packages for the Compute service.</para>
-      <para os="ubuntu;debian">Run this command:</para>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install nova-compute-kvm python-guestfs</userinput></screen>
       <para os="ubuntu;debian">When prompted to create a
           <literal>supermin</literal> appliance, respond

doc/install-guide/section_nova-networking-compute-node.xml

@@ -21,6 +21,9 @@
     <title>To configure legacy networking</title>
     <step os="rhel;centos;fedora;sles;opensuse">
       <para>Run the following commands:</para>
+      <para>Replace <replaceable>INTERFACE_NAME</replaceable> with the
+        actual interface name for the external network. For example,
+        <emphasis>eth1</emphasis> or <emphasis>ens224</emphasis>.</para>
       <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
   network_api_class nova.network.api.API</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
@@ -41,16 +44,19 @@
   share_dhcp_address True</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
   force_dhcp_release True</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
-  flat_interface eth1</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
   flat_network_bridge br100</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
-  public_interface eth1</userinput></screen>
+  flat_interface <replaceable>INTERFACE_NAME</replaceable></userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
+  public_interface <replaceable>INTERFACE_NAME</replaceable></userinput></screen>
     </step>
     <step os="ubuntu;debian">
       <para>Edit the <filename>/etc/nova/nova.conf</filename> file and add the
         following keys to the <literal>[DEFAULT]</literal> section:</para>
+      <para>Replace <replaceable>INTERFACE_NAME</replaceable> with the
+        actual interface name for the external network. For example,
+        <emphasis>eth1</emphasis> or <emphasis>ens224</emphasis>.</para>
       <programlisting language="ini">[DEFAULT]
 ...
 network_api_class = nova.network.api.API
@@ -64,8 +70,8 @@ send_arp_for_ha = True
 share_dhcp_address = True
 force_dhcp_release = True
 flat_network_bridge = br100
-flat_interface = eth1
+flat_interface = <replaceable>INTERFACE_NAME</replaceable>
-public_interface = eth1</programlisting>
+public_interface = <replaceable>INTERFACE_NAME</replaceable></programlisting>
     </step>
     <step>
       <para os="ubuntu;debian">Restart the services:</para>