Install Guide: service fixes for ubuntu on neutron installation

* Open vSwitch needs a restart after the datapath module installation
* Debian/Ubuntu don't use chkconfig

Change-Id: I08519e60bcc301d49a3e3f2a33e1980f763cecdf
backport: havana

doc/install-guide/section_neutron-install.xml

@@ -497,8 +497,7 @@ firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewal
 <prompt>#</prompt> <userinput>chkconfig neutron-openvswitch-agent on</userinput></screen>
             <screen os="opensuse;sles"><prompt>#</prompt> <userinput>service openstack-neutron-openvswitch-agent restart</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-neutron-openvswitch-agent on</userinput></screen>
-            <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service neutron-plugin-openvswitch-agent restart</userinput>
-<prompt>#</prompt> <userinput>chkconfig neutron-plugin-openvswitch-agent on</userinput></screen>
+            <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service neutron-plugin-openvswitch-agent restart</userinput></screen>
           </step>
           <step>
             <para>Now, return to the general <acronym>OVS</acronym>
@@ -814,12 +813,16 @@ admin_password=<replaceable>NEUTRON_PASS</replaceable></programlisting>
             <screen os="rhel;fedora;centos"><prompt>#</prompt> <userinput>yum install openstack-neutron-openvswitch</userinput></screen>
             <screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-neutron-openvswitch-agent</userinput></screen>
           </step>
-          <step>
+          <step os="ubuntu;debian">
+            <para>Restart Open vSwitch:</para>
+            <screen><prompt>#</prompt> <userinput>service openvswitch-switch restart</userinput></screen>
+          </step>
+          <step os="rhel;fedora;centos;opensuse;sles">
             <para>Start Open vSwitch and configure it to start when
               the system boots:</para>
             <screen os="rhel;fedora;centos"><prompt>#</prompt> <userinput>service openvswitch start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openvswitch on</userinput></screen>
-            <screen os="opensuse;sles;ubuntu;debian"><prompt>#</prompt> <userinput>service openvswitch-switch start</userinput>
+            <screen os="opensuse;sles"><prompt>#</prompt> <userinput>service openvswitch-switch start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openvswitch-switch on</userinput></screen>
           </step>
           <step>
@@ -870,13 +873,13 @@ firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewal
             <para>After you complete OVS configuration <emphasis>and
                 the core Neutron configuration after this
                 section</emphasis>, restart the Neutron Open vSwitch
-              agent, and set it to start at boot:</para>
-            <screen os="opensuse;sles;fedora;centos;rhel"><prompt>#</prompt> <userinput>service neutron-openvswitch-agent restart</userinput>
+              agent<phrase os="opensuse;sles;fedora;centos;rhel">, and set it
+              to start at boot</phrase>:</para>
+            <screen os="fedora;centos;rhel"><prompt>#</prompt> <userinput>service neutron-openvswitch-agent restart</userinput>
 <prompt>#</prompt> <userinput>chkconfig neutron-openvswitch-agent on</userinput></screen>
             <screen os="opensuse;sles"><prompt>#</prompt> <userinput>service openstack-neutron-openvswitch-agent restart</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-neutron-openvswitch-agent on</userinput></screen>
-            <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service neutron-plugin-openvswitch-agent restart</userinput>
-<prompt>#</prompt> <userinput>chkconfig neutron-plugin-openvswitch-agent on</userinput></screen>
+            <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service neutron-plugin-openvswitch-agent restart</userinput></screen>
           </step>
           <step>
             <para>Now, return to the general <acronym>OVS</acronym>
@@ -1037,7 +1040,7 @@ security_group_api=neutron</programlisting>
             one.</para>
         </note>
       </step>
-      <step>
+      <step os="fedora;rhel;centos;opensuse;sles">
         <para>Start neutron-server and set it to start at boot:</para>
         <screen><prompt>#</prompt> <userinput>service neutron-server start</userinput>
 <prompt>#</prompt> <userinput>chkconfig neutron-server on</userinput></screen>
@@ -1051,6 +1054,10 @@ security_group_api=neutron</programlisting>
               <filename>/etc/neutron/plugins.ini</filename>.</para>
         </note>
       </step>
+      <step os="ubuntu;debian">
+        <para>Restart neutron-server:</para>
+        <screen><prompt>#</prompt> <userinput>service neutron-server restart</userinput></screen>
+      </step>
     </procedure>
     <section xml:id="install-neutron.install-plug-in-controller">
       <title>Install and configure the Neutron plug-ins on a dedicated

doc/install-guide/section_neutron-provider-router-with-private_networks.xml

@@ -163,7 +163,7 @@ openstack-neutron openstack-neutron-dhcp-agent openstack-neutron-l3-agent</useri
                     <screen os="debian;ubuntu"><prompt>#</prompt> <userinput>service openvswitch-switch start</userinput></screen>
                     <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>service openvswitch start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openvswitch on</userinput></screen>
-                    <screen os="opensuse;sles;ubuntu"><prompt>#</prompt> <userinput>service openvswitch-switch start</userinput>
+                    <screen os="opensuse;sles"><prompt>#</prompt> <userinput>service openvswitch-switch start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openvswitch-switch on</userinput></screen>
                 </step>
                 <step>
@@ -296,7 +296,7 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
                     <screen os="debian;ubuntu"><prompt>#</prompt> <userinput>service openvswitch-switch start</userinput></screen>
                     <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>service openvswitch start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openvswitch on</userinput></screen>
-                    <screen os="opensuse;sles;ubuntu"><prompt>#</prompt> <userinput>service openvswitch-switch start</userinput>
+                    <screen os="opensuse;sles"><prompt>#</prompt> <userinput>service openvswitch-switch start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openvswitch-switch on</userinput></screen>
                 </step>
                 <step>