From 677865def5816c233bbe6199e97eee8aaa3cdd7b Mon Sep 17 00:00:00 2001
From: Matt Kassawara <mkassawara@gmail.com>
Date: Sun, 13 Apr 2014 14:13:18 -0600
Subject: [PATCH] Updated nova networking sections

According to bug #1284633, the configuration included with nova
packages on SUSE apparently doesn't default to nova-networking. We
should avoid implicit configuration assumptions on all distributions
and explicitly configure the following keys in nova.conf on the
controller and compute nodes for nova-networking:

network_api_class = nova.network.api.API
security_group_api = nova

Prior to this issue, we only included compute node configuration for
nova-networking. I added a new section for the controller node to
resolve this issue.

This patch also includes some minor structural changes and
clarifications to conform with other portions of the guide.

Change-Id: I8224f32062f279b6032aa06ee0a72ea28f549a4d
Closes-Bug: #1284633
---
 doc/install-guide/ch_networking.xml           |  1 +
 .../section_nova-networking-compute-node.xml  | 77 ++++++++++---------
 ...ection_nova-networking-controller-node.xml | 35 +++++++++
 3 files changed, 76 insertions(+), 37 deletions(-)
 create mode 100644 doc/install-guide/section_nova-networking-controller-node.xml

diff --git a/doc/install-guide/ch_networking.xml b/doc/install-guide/ch_networking.xml
index 5f9f985657..7115c80236 100644
--- a/doc/install-guide/ch_networking.xml
+++ b/doc/install-guide/ch_networking.xml
@@ -58,6 +58,7 @@
   </section>
   <section xml:id="section_nova-networking">
     <title>Legacy networking</title>
+    <xi:include href="section_nova-networking-controller-node.xml"/>
     <xi:include href="section_nova-networking-compute-node.xml"/>
     <xi:include href="section_nova-networking-initial-network.xml"/>
   </section>
diff --git a/doc/install-guide/section_nova-networking-compute-node.xml b/doc/install-guide/section_nova-networking-compute-node.xml
index 2571a9516e..e1b613e20a 100644
--- a/doc/install-guide/section_nova-networking-compute-node.xml
+++ b/doc/install-guide/section_nova-networking-compute-node.xml
@@ -3,55 +3,60 @@
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
   xml:id="nova-networking-compute-node">
   <title>Configure compute node</title>
-  <para>Legacy networking only involves compute nodes. This section covers
-    deployment of a simple <glossterm>flat network</glossterm> that provides
-    IP addresses to your instances via <glossterm>DHCP</glossterm>. If your
-    environment includes multiple compute nodes, the
-    <glossterm>multi-host</glossterm> feature provides redundancy by spreading
-    network functions across compute nodes.</para>
+  <para>This section covers deployment of a simple
+    <glossterm>flat network</glossterm> that provides IP addresses to your
+    instances via <glossterm>DHCP</glossterm>. If your environment includes
+    multiple compute nodes, the <glossterm>multi-host</glossterm> feature
+    provides redundancy by spreading network functions across compute
+    nodes.</para>
   <procedure>
-    <title>To use legacy networking</title>
+    <title>To install legacy networking components</title>
     <step>
-      <para>Install the packages:</para>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install nova-network nova-api-metadata</userinput></screen>
       <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-nova-network openstack-nova-api</userinput></screen>
       <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-nova-network openstack-nova-api</userinput></screen>
     </step>
+  </procedure>
+  <procedure>
+    <title>To configure legacy networking</title>
     <step os="rhel;centos;fedora;sles;opensuse">
-      <para>Configure parameters in the
-        <filename>/etc/nova/nova.conf</filename> file:</para>
-      <substeps>
-        <step>
-          <para>Under the <literal>[DEFAULT]</literal> section:</para>
-          <screen><prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
+      <para>Run the following commands:</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 \
+  security_group_api nova</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
   network_manager nova.network.manager.FlatDHCPManager</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
   firewall_driver nova.virt.libvirt.firewall.IptablesFirewallDriver</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT network_size 254</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT allow_same_net_traffic False</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT multi_host True</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT send_arp_for_ha True</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT 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>
-          <screen os="opensuse;sles">
-<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 security_group_api nova</userinput></screen>
-        </step>
-      </substeps>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
+  network_size 254</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
+  allow_same_net_traffic False</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
+  multi_host True</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
+  send_arp_for_ha True</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
+  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>
     </step>
     <step os="ubuntu;debian">
-      <para>Edit the <filename>/etc/nova/nova.conf</filename> file:</para>
-      <substeps>
-        <step>
-          <para>Add the following keys under the <literal>[DEFAULT]</literal>
-            section:</para>
-          <programlisting language="ini">[DEFAULT]
+      <para>Edit the <filename>/etc/nova/nova.conf</filename> file and add the
+        following keys to the <literal>[DEFAULT]</literal> section:</para>
+      <programlisting language="ini">[DEFAULT]
 ...
-network_manager = nova.network.manager.FlatDHCPManager
+network_api_class = nova.network.api.API
+security_group_api = nova
 firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver
+network_manager = nova.network.manager.FlatDHCPManager
 network_size = 254
 allow_same_net_traffic = False
 multi_host = True
@@ -61,8 +66,6 @@ force_dhcp_release = True
 flat_network_bridge = br100
 flat_interface = eth1
 public_interface = eth1</programlisting>
-        </step>
-      </substeps>
     </step>
     <step>
       <para os="ubuntu;debian">Restart the services:</para>
diff --git a/doc/install-guide/section_nova-networking-controller-node.xml b/doc/install-guide/section_nova-networking-controller-node.xml
new file mode 100644
index 0000000000..a631f1c9a5
--- /dev/null
+++ b/doc/install-guide/section_nova-networking-controller-node.xml
@@ -0,0 +1,35 @@
+<section xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="nova-networking-controller-node">
+  <title>Configure controller node</title>
+  <para>Legacy networking primarily involves compute nodes. However, you must
+    configure the controller node to use it.</para>
+  <procedure>
+    <title>To configure legacy networking</title>
+    <step os="rhel;centos;fedora;sles;opensuse">
+      <para>Run the following commands:</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 \
+  security_group_api nova</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>
+      <programlisting language="ini">[DEFAULT]
+...
+network_api_class = nova.network.api.API
+security_group_api = nova</programlisting>
+    </step>
+    <step>
+      <para>Restart the Compute services:</para>
+      <screen os="rhel;centos;fedora;sles;opensuse"><prompt>#</prompt> <userinput>service openstack-nova-api restart</userinput>
+<prompt>#</prompt> <userinput>service openstack-nova-scheduler restart</userinput>
+<prompt>#</prompt> <userinput>service openstack-nova-conductor restart</userinput></screen>
+      <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service nova-api restart</userinput>
+<prompt>#</prompt> <userinput>service nova-scheduler restart</userinput>
+<prompt>#</prompt> <userinput>service nova-conductor restart</userinput></screen>
+    </step>
+  </procedure>
+</section>