Brush up Quantum part of basic install guide

* Controller node
  * Add Horizon (Dashboard) URL in Dashboard Installation section
  * Correct the output of "glance image-list"
  * Remove Open vSwitch installation since OVS is not required on the
    controller node.
  * Remove dhcp_agent.ini configuration (fix bug 1091846)

* Network node
  * Fix parameter name 'gateway_external_network_id'
    in /etc/quantum/l3_agent.ini
  * Add auth_url setting to /etc/quantum/l3_agent.ini (fix bug 1091892)
  * Add rabbit_host setting to quantum.conf on the network node.
  * Correct sql_connection in ovs_quantum_plugin.ini to point to MySQL
    on the controller node (fix bug 1091888)

* Compute node
  * Move nova-api-metadata service to the controller node since metadata
    service is usually running on the controller node
  * Move Open vSwitch configuration into a separate section

* Common
  * Remove unnecessary 'ip_forward = 1' from controller and compute nodes
  * Remove unnecessasry /etc/quantum/api-paste.ini configurations
    from the network and compute nodes (fix bug 1091878)

Fix bug 1091846
Fix bug 1091878
Fix bug 1091888
Fix bug 1091892

Change-Id: Ifc0e70183b1cd28400346eb7606e993de74dcbc3

doc/src/docbkx/basic-install/src/basic-install_compute-common.xml

@@ -37,7 +37,7 @@
                 </itemizedlist><screen><userinput># Management Network
 auto eth0
     iface eth0 inet static
-    address 192.168.0.2
+    address 192.168.0.3
     netmask 255.255.255.0
     gateway 192.168.0.254
     dns-nameservers 8.8.8.8
@@ -56,8 +56,7 @@ auto eth1
                             </emphasis>:</para>
                             </listitem>
                         </itemizedlist>
-                        <programlisting>net.ipv4.ip_forward=1
+                        <programlisting>net.ipv4.conf.all.rp_filter = 0
-net.ipv4.conf.all.rp_filter = 0
 net.ipv4.conf.default.rp_filter = 0  </programlisting>
                         <itemizedlist>
                             <listitem>

doc/src/docbkx/basic-install/src/basic-install_compute-hypervisor.xml

@@ -19,7 +19,7 @@
     "/dev/null", "/dev/full", "/dev/zero",
     "/dev/random", "/dev/urandom",
     "/dev/ptmx", "/dev/kvm", "/dev/kqemu",
-    "/dev/rtc", "/dev/hpet","/dev/net/tun"]</userinput></screen></para>
+    "/dev/rtc", "/dev/hpet", "/dev/net/tun"]</userinput></screen></para>
                             </listitem>
                             <listitem>
                                 <para>Disable <emphasis role="bold">KVM default virtual bridge</emphasis> to avoid any confusion :<screen><userinput>virsh net-destroy default

doc/src/docbkx/basic-install/src/basic-install_compute-intro.xml

@@ -12,9 +12,6 @@
                     <listitem>
                         <para>nova-compute</para>
                     </listitem>
-                    <listitem>
-                        <para>nova-api-metadata</para>
-                    </listitem>
                     <listitem>
                         <para>Quantum OVS Agent</para>
                     </listitem>

doc/src/docbkx/basic-install/src/basic-install_compute-nova.xml

@@ -7,7 +7,7 @@
             <para>
                 <orderedlist>
                     <listitem>
-                        <para>Install the packages :<screen><userinput>apt-get install nova-api-metadata nova-compute-kvm</userinput></screen></para>
+                        <para>Install the packages :<screen><userinput>apt-get install nova-compute-kvm</userinput></screen></para>
                     </listitem>
                     <listitem>
                         <para>Configure Nova :</para>
@@ -54,7 +54,7 @@ use_deprecated_auth=false
 ec2_private_dns_show_ip=True
 dmz_cidr=169.254.169.254/32
 ec2_dmz_host=192.168.0.1
-metadata_host=192.168.0.3
+metadata_host=192.168.0.1
 metadata_listen=0.0.0.0
 enabled_apis=metadata
 

doc/src/docbkx/basic-install/src/basic-install_compute-quantum.xml

@@ -3,6 +3,24 @@
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="basic-install_compute-quantum">
+    <title>Quantum</title>
+        <section xml:id="compute-ovs">
+            <title>Open vSwitch</title>
+            <para>
+                <orderedlist>
+                    <listitem>
+                        <para>Install the packages:<screen><userinput>apt-get install -y openvswitch-switch</userinput></screen></para>
+                    </listitem>
+                    <listitem>
+                        <para>Start Open vSwitch service<screen><userinput>service openvswitch-switch start</userinput></screen></para>
+                    </listitem>
+                    <listitem>
+                        <para>Configure Virtual Bridging<screen><userinput>ovs-vsctl add-br br-int</userinput></screen></para>
+                    </listitem>
+                </orderedlist>
+            </para>
+        </section>
+        <section xml:id="compute-quantum">
             <title>Quantum</title>
             <para>
                 <orderedlist>
@@ -17,13 +35,6 @@ fake_rabbit = False
 rabbit_host = 192.168.0.1
 rabbit_password = password</userinput></screen></para>
                     </listitem>
-                    <listitem>
-                        <para>Start Open-vSwitch service &amp; restart the agent :<screen><userinput>/etc/init.d/openvswitch-switch start
-restart quantum-plugin-openvswitch-agent</userinput></screen></para>
-                    </listitem>
-                    <listitem>
-                        <para>Configure virtual bridging :<screen><userinput>ovs-vsctl add-br br-int</userinput></screen></para>
-                    </listitem>
                     <listitem>
                         <para>Edit <emphasis role="bold"
                         >/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini</emphasis> file and
@@ -38,15 +49,11 @@ tunnel_bridge = br-tun
 local_ip = 10.0.0.2
 enable_tunneling = True</userinput></screen></para>
                     </listitem>
-                    <listitem>
-                       <para>Edit <emphasis role="bold">/etc/quantum/api-paste.ini</emphasis> file and modify :<screen><userinput>admin_tenant_name = service
-admin_user = quantum 
-admin_password = password</userinput></screen></para>
-                     </listitem>
                     <listitem>
                         <para>Start the Agent :<screen><userinput>service quantum-plugin-openvswitch-agent restart</userinput></screen></para>
                     </listitem>
                 </orderedlist>
             </para>
+         </section>
 </section>
 

doc/src/docbkx/basic-install/src/basic-install_controller-common.xml

@@ -61,8 +61,7 @@ auto eth0
                                 </emphasis>:</para>
                             </listitem>
                         </itemizedlist>
-                        <programlisting>net.ipv4.ip_forward=1
+                        <programlisting>net.ipv4.conf.all.rp_filter = 0
-net.ipv4.conf.all.rp_filter = 0
 net.ipv4.conf.default.rp_filter = 0  </programlisting>
                         <itemizedlist>
                             <listitem>

doc/src/docbkx/basic-install/src/basic-install_controller-dashboard.xml

@@ -6,8 +6,9 @@
     <title>Dashboard (Horizon)</title>
 <para>Install the packages
         :<screen><userinput>apt-get install apache2 libapache2-mod-wsgi openstack-dashboard \
-    memcached python-memcache</userinput></screen>We
+    memcached python-memcache</userinput></screen>
-        can now login with <emphasis role="bold">admin</emphasis> / <emphasis role="bold"
+    OpenStack Dashboard is now available at <emphasis role="bold">http://&lt;controller_node&gt;/horizon</emphasis>.
+    We can login with <emphasis role="bold">admin</emphasis> / <emphasis role="bold"
             >password</emphasis> credentials or <emphasis role="bold">demo</emphasis> / <emphasis
             role="bold">password</emphasis>.</para>
 </section>

doc/src/docbkx/basic-install/src/basic-install_controller-glance.xml

@@ -37,11 +37,11 @@ rabbit_password = password</userinput></screen></para>
                                 <para>Check if the image has been introduced in the index
                                     :<screen><userinput>glance image-list
 
-+--------+---------+-------------+------------------+------------+--------+
++--------------------------------------+--------+-------------+------------------+-----------+--------+
 | ID                                   | Name   | Disk Format | Container Format | Size      | Status |
-+--------+---------+-------------+------------------+------------+--------+
++--------------------------------------+--------+-------------+------------------+-----------+--------+
-| 9a17961| Ubuntu  | qcow2       | ovf              | 1476395008 | active |
+| 0d2664d3-cda9-4937-95b2-909ecf8ea362 | Ubuntu | qcow2       | bare             | 233701376 | active |
-+--------+---------+-------------+------------------+------------+--------+</userinput></screen></para>
++--------------------------------------+--------+-------------+------------------+-----------+--------+</userinput></screen></para>
                             </listitem>
                             <listitem>
                                 <para>You can also install <link xlink:href="https://review.openstack.org/#/c/7615/">Glance Replicator</link> (new in Folsom).

doc/src/docbkx/basic-install/src/basic-install_controller-keystone.xml

@@ -72,7 +72,8 @@ echo "source novarc">>.bashrc</userinput></screen></para>
             </listitem>
             <listitem>
                 <para>Download the <link
-                    xlink:href="https://github.com/EmilienM/openstack-folsom-guide/raw/master/scripts/keystone-endpoints.sh">endpoint script</link> and create the endpoints (for projects) :<screen><userinput>./keystone-endpoints.sh</userinput></screen></para>
+                    xlink:href="https://github.com/EmilienM/openstack-folsom-guide/raw/master/scripts/keystone-endpoints.sh">endpoint script</link> and create the endpoints (for projects) :<screen><userinput>./keystone-endpoints.sh</userinput></screen>
+                If an IP address of the management network on the controller node is different from this example, please use the following:<screen><userinput>./keystone-endpoints.sh -K &lt;ip address of the management network&gt;</userinput></screen></para>
             </listitem>
         </orderedlist>
     </para>

doc/src/docbkx/basic-install/src/basic-install_controller-quantum.xml

@@ -3,29 +3,12 @@
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
     xml:id="basic-install_controller-quantum">
-    <title>Quantum</title>
-              	<section xml:id="controller-ovs">
-              	<title>Open-vSwitch</title>
-              	            <para>
-                <orderedlist>
-                    <listitem>
-                        <para>Install the packages :<screen><userinput>apt-get install -y openvswitch-switch</userinput></screen></para>
-                    </listitem>
-                    <listitem>
-                        <para>Start Open-vSwitch service &amp; restart the agent :<screen><userinput>/etc/init.d/openvswitch-switch start</userinput></screen></para>
-                    </listitem>
-                </orderedlist>
-            </para>
-		</section>
-		<section xml:id="controller-quantum">
     <title>Quantum</title>
         <para>
             <orderedlist>
                 <listitem>
                     <para>Install the packages
-                        :<screen><userinput>apt-get install quantum-server python-cliff \
+                    :<screen><userinput>apt-get install quantum-server</userinput></screen></para>
-    quantum-plugin-openvswitch-agent \
-    python-pyparsing</userinput></screen></para>
                 </listitem>
                 <listitem>
                     <para>Configure Quantum services :</para>
@@ -54,9 +37,6 @@ enable_tunneling = True</userinput></screen>
                                switches for VLANs.</db:para>
                             </db:note></para>
                         </listitem>
-                            <listitem>
-                                <para>Edit <emphasis role="bold">/etc/quantum/dhcp_agent.ini</emphasis> file and add :<screen><userinput>use_namespaces = False</userinput></screen></para>
-                            </listitem>
                         <listitem>
                             <para>Edit <emphasis role="bold">/etc/quantum/api-paste.ini</emphasis> file and modify :<screen><userinput>admin_tenant_name = service
 admin_user = quantum 
@@ -66,10 +46,8 @@ admin_password = password</userinput></screen></para>
                 </listitem>
                 <listitem>
                     <para>Start the services
-                        :<screen><userinput>service quantum-server restart
+                    :<screen><userinput>service quantum-server restart</userinput></screen></para>
-service quantum-plugin-openvswitch-agent restart</userinput></screen></para>
                 </listitem>
             </orderedlist>
         </para>
-	</section>
 </section>

doc/src/docbkx/basic-install/src/basic-install_network-intro.xml

@@ -6,14 +6,14 @@
     <title>Introduction</title>
     <para>The Network node will provide :
         <itemizedlist>
-            <listitem>
-                <para>Virtual Routing (Quantum L3 Agent)</para>
-            </listitem>
             <listitem>
                 <para>Virtual Bridging (Open-vSwitch + Quantum Agent) with tunneling</para>
             </listitem>
             <listitem>
                 <para>DHCP Server (Quantum DHCP Agent)</para>
             </listitem>
+            <listitem>
+                <para>Virtual Routing (Quantum L3 Agent)</para>
+            </listitem>
         </itemizedlist></para>
 </section>

doc/src/docbkx/basic-install/src/basic-install_network-operating.xml

@@ -28,7 +28,7 @@
                 <para>Copy the external network ID :<screen>quantum net-list</screen></para>
             </listitem>
             <listitem>
-                <para>Edit /etc/quantum/l3_agent.ini and paste the ID :<screen>gateway_external_net_id = ID</screen></para>
+                <para>Edit /etc/quantum/l3_agent.ini and paste the ID :<screen>gateway_external_network_id = ID</screen></para>
             </listitem>
             <listitem>
                 <para>Copy the provider router ID :<screen>quantum router-list</screen></para>

doc/src/docbkx/basic-install/src/basic-install_network-services.xml

@@ -12,6 +12,10 @@
                 <para>Install the packages :<screen><userinput>apt-get install quantum-plugin-openvswitch-agent \
 quantum-dhcp-agent quantum-l3-agent</userinput></screen></para>
             </listitem>
+            <listitem>
+                <para>Start Open vSwitch:
+                     <screen>service openvswitch-switch start</screen></para>
+            </listitem>
             <listitem>
                 <para>Create Virtual Bridging
                         :<screen>ovs-vsctl add-br br-int
@@ -27,29 +31,26 @@ ip link set up br-ex </screen></para>
             <para>Configure Quantum services :</para>
             <itemizedlist>
                 <listitem>
-                    <para>Edit <emphasis role="bold">/etc/quantum/api-paste.ini</emphasis> file and modify :<screen><userinput>admin_tenant_name = service
+                    <para>Edit <emphasis role="bold">/etc/quantum/l3_agent.ini</emphasis> file and modify :<screen><userinput>auth_url = http://192.168.0.1:35357/v2.0
-admin_user = quantum 
+admin_tenant_name = service
-admin_password = password</userinput></screen></para>
-                </listitem>
-                <listitem>
-                    <para>Edit <emphasis role="bold">/etc/quantum/l3_agent.ini</emphasis> file and modify :<screen><userinput>admin_tenant_name = service
 admin_user = quantum 
 admin_password = password
 metadata_ip = 192.168.0.1
-use_namespaces=False</userinput></screen></para>
+use_namespaces = False</userinput></screen></para>
                 </listitem>
                 <listitem>
                     <para>Edit <emphasis role="bold">/etc/quantum/quantum.conf</emphasis> file and modify :<screen><userinput>core_plugin = \
     quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2
 auth_strategy = keystone
 fake_rabbit = False
+rabbit_host = 192.168.0.1
 rabbit_password = password</userinput></screen></para>
                 </listitem>
                 <listitem>
                     <para>Edit <emphasis role="bold"
                         >/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini</emphasis> file and
                     modify :<screen>[DATABASE]
-sql_connection = mysql://quantum:password@localhost:3306/quantum
+sql_connection = mysql://quantum:password@192.168.0.1:3306/quantum
 [OVS]
 tenant_network_type = gre 
 tunnel_id_ranges = 1:1000
@@ -67,15 +68,10 @@ local_ip = 10.10.10.1</screen>
                 <listitem>
                     <para>Edit <emphasis role="bold">/etc/quantum/dhcp_agent.ini</emphasis> file and add :<screen><userinput>use_namespaces = False</userinput></screen></para>
                 </listitem>
-                <listitem>
-                    <para>Edit <emphasis role="bold">/etc/quantum/api-paste.ini</emphasis> file and modify :<screen><userinput>admin_tenant_name = service
-admin_user = quantum 
-admin_password = password</userinput></screen></para>
-                </listitem>
             </itemizedlist>
 
             <para>Start the services
-                :<screen>service quantum-plugin-openvswitch-agent restart
+                :<screen>service quantum-plugin-openvswitch-agent start
 service quantum-dhcp-agent restart
 service quantum-l3-agent restart</screen></para>
         

doc/src/docbkx/basic-install/src/basic-install_operate.xml

@@ -19,18 +19,18 @@
                         <para>Create a personal keypair.</para>
                 </listitem>
                 <listitem>
-    			<para>In the Dashboard, go to "Instances and Images" for
+                        <para>In the Dashboard, go to "Instances" and click "Launch Instance" for
                                 spawning a new VM.</para>
                 </listitem>
                 <listitem>
                         <para>Since Horizon does not manage L3 in Folsom release, we have to configure floating IP from Quantum CLI (using demo tenant).
                         To do that, you need to get the ext_net ID and the port_id of your VM :
-    			<screen>quantum net-list
+                        <screen>quantum net-list -- --router:external True
-quantum port-list</screen></para>
+quantum port-list -- --device_id &lt;vm-uuid&gt;</screen></para>
                 </listitem>
                 <listitem>
                         <para>Now, we are going to create a floating-IP attached to the virtual port of our VM and routed to the external network :
-    			<screen>quantum floatingip-create --port_id port_id ext_net_id</screen></para>
+                        <screen>quantum floatingip-create --port_id &lt;port_id&gt; &lt;ext_net_id&gt;</screen></para>
                 </listitem>
                 <listitem>
                         <para>That's it! You should be able to ping your VM using

doc/src/docbkx/basic-install/src/basic-install_requirements.xml

@@ -30,9 +30,9 @@
                 <td>
                     <para>Services</para></td>
                 <td><para>MySQL, RabbitMQ, Nova, Cinder, Glance,
-                        Keystone, Quantum, Open-vSwitch</para></td>
+                        Keystone, Quantum</para></td>
                 <td><para>Quantum-L3-agent, Quantum-DHCP-agent,
-                        Open-vSwitch</para></td>
+                        Quantum Agent with Open-vSwitch</para></td>
                 <td><para>nova-compute, KVM, nova-api, Quantum Agent
                         with Open-vSwitch</para>
                 </td>