diff --git a/doc/install-guide/section_glance-install.xml b/doc/install-guide/section_glance-install.xml
index 77aae9c4ce..18ffcfc37e 100644
--- a/doc/install-guide/section_glance-install.xml
+++ b/doc/install-guide/section_glance-install.xml
@@ -261,10 +261,20 @@ verbose = True</programlisting>
     <step os="rhel;centos;fedora;sles;opensuse">
       <para>Start the Image Service services and configure them to start when
         the system boots:</para>
-      <screen><prompt>#</prompt> <userinput>service openstack-glance-api start</userinput>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable openstack-glance-api.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-glance-registry.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-glance-api.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-glance-registry.service</userinput></screen>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><prompt>#</prompt> <userinput>service openstack-glance-api start</userinput>
 <prompt>#</prompt> <userinput>service openstack-glance-registry start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-glance-api on</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-glance-registry on</userinput></screen>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable openstack-glance-api.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-glance-registry.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-glance-api.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-glance-registry.service</userinput></screen>
     </step>
     <step os="ubuntu">
       <para>By default, the Ubuntu packages create an SQLite database.</para>
diff --git a/doc/install-guide/section_keystone-install.xml b/doc/install-guide/section_keystone-install.xml
index e6e868491e..6b69f51d37 100644
--- a/doc/install-guide/section_keystone-install.xml
+++ b/doc/install-guide/section_keystone-install.xml
@@ -200,8 +200,14 @@ verbose = True</programlisting>
     <step os="rhel;fedora;centos;opensuse;sles">
       <para>Start the Identity service and configure it to start when the
         system boots:</para>
-      <screen><prompt>#</prompt> <userinput>service openstack-keystone start</userinput>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable openstack-keystone.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-keystone.service</userinput></screen>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><prompt>#</prompt> <userinput>service openstack-keystone start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-keystone on</userinput></screen>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable openstack-keystone.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-keystone.service</userinput></screen>
     </step>
     <step os="ubuntu">
       <para>By default, the Ubuntu packages create a SQLite database.</para>
diff --git a/doc/install-guide/section_neutron-compute-node.xml b/doc/install-guide/section_neutron-compute-node.xml
index 530964bf8a..9ff60d18fa 100644
--- a/doc/install-guide/section_neutron-compute-node.xml
+++ b/doc/install-guide/section_neutron-compute-node.xml
@@ -92,9 +92,14 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
             <application>RabbitMQ</application>.</para>
         </step>
         <step>
-          <para>In the <literal>[keystone_authtoken]</literal> section,
+          <para>In the <literal>[DEFAULT]</literal> and
+            <literal>[keystone_authtoken]</literal> sections,
             configure Identity service access:</para>
-          <programlisting language="ini">[keystone_authtoken]
+          <programlisting language="ini">[DEFAULT]
+...
+auth_strategy = keystone
+
+[keystone_authtoken]
 ...
 auth_uri = http://<replaceable>controller</replaceable>:5000/v2.0
 identity_uri = http://<replaceable>controller</replaceable>:35357
@@ -189,17 +194,17 @@ enable_tunneling = True</programlisting>
     <title>To configure the Open vSwitch (OVS) service</title>
     <para>The OVS service provides the underlying virtual networking framework
       for instances.</para>
-    <step os="rhel;centos;fedora">
+    <step os="rhel;centos;fedora;sles;opensuse">
       <para>Start the OVS service and configure it to start when the
         system boots:</para>
-      <screen><prompt>#</prompt> <userinput>service openvswitch start</userinput>
-<prompt>#</prompt> <userinput>chkconfig openvswitch on</userinput></screen>
-    </step>
-    <step os="sles;opensuse">
-      <para>Start the OVS service and configure it to start when the
-        system boots:</para>
-      <screen><prompt>#</prompt> <userinput>service openvswitch-switch start</userinput>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable openvswitch.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openvswitch.service</userinput></screen>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><prompt>#</prompt> <userinput>service openvswitch-switch start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openvswitch-switch on</userinput></screen>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable openvswitch.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openvswitch.service</userinput></screen>
     </step>
     <step os="debian;ubuntu">
       <para>Restart the OVS service:</para>
@@ -260,6 +265,14 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
         If this symbolic link does not exist, create it using the
         following command:</para>
       <screen><prompt>#</prompt> <userinput>ln -s /etc/neutron/plugins/ml2/ml2_conf.ini /etc/neutron/plugin.ini</userinput></screen>
+      <para>Due to a packaging bug, the Open vSwitch agent initialization
+        script explicitly looks for the Open vSwitch plug-in configuration
+        file rather than a symbolic link
+        <filename>/etc/neutron/plugin.ini</filename> pointing to the ML2
+        plug-in configuration file. Run the following commands to resolve this
+        issue:</para>
+      <screen><prompt>#</prompt> <userinput>cp /usr/lib/systemd/system/neutron-openvswitch-agent.service /usr/lib/systemd/system/neutron-openvswitch-agent.service.orig</userinput>
+<prompt>#</prompt> <userinput>sed -i 's,plugins/openvswitch/ovs_neutron_plugin.ini,plugin.ini,g' /usr/lib/systemd/system/neutron-openvswitch-agent.service</userinput></screen>
     </step>
     <step os="sles;opensuse">
       <para>The Networking service initialization scripts expect the
@@ -272,14 +285,24 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
     </step>
     <step>
       <para>Restart the Compute service:</para>
-      <screen os="rhel;centos;fedora;sles;opensuse"><prompt>#</prompt> <userinput>service openstack-nova-compute restart</userinput></screen>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl restart openstack-nova-compute.service</userinput></screen>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><prompt>#</prompt> <userinput>service openstack-nova-compute restart</userinput></screen>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl restart openstack-nova-compute.service</userinput></screen>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service nova-compute restart</userinput></screen>
     </step>
     <step os="rhel;centos;fedora;sles;opensuse">
       <para>Start the Open vSwitch (OVS) agent and configure it to
         start when the system boots:</para>
-      <screen os="rhel;centos;fedora;sles;opensuse"><prompt>#</prompt> <userinput>service openstack-neutron-openvswitch-agent start</userinput>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable openstack-neutron-openvswitch-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-neutron-openvswitch-agent.service</userinput></screen>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><prompt>#</prompt> <userinput>service openstack-neutron-openvswitch-agent start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-neutron-openvswitch-agent on</userinput></screen>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable openstack-neutron-openvswitch-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-neutron-openvswitch-agent.service</userinput></screen>
     </step>
     <step os="ubuntu;debian">
       <para>Restart the Open vSwitch (OVS) agent:</para>
diff --git a/doc/install-guide/section_neutron-controller-node.xml b/doc/install-guide/section_neutron-controller-node.xml
index 4d0f7223d0..46e3e0ac59 100644
--- a/doc/install-guide/section_neutron-controller-node.xml
+++ b/doc/install-guide/section_neutron-controller-node.xml
@@ -185,9 +185,14 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
             <application>RabbitMQ</application>.</para>
         </step>
         <step>
-          <para>In the <literal>[keystone_authtoken]</literal> section,
+          <para>In the <literal>[DEFAULT]</literal> and
+            <literal>[keystone_authtoken]</literal> sections,
             configure Identity service access:</para>
-          <programlisting language="ini">[keystone_authtoken]
+          <programlisting language="ini">[DEFAULT]
+...
+auth_strategy = keystone
+
+[keystone_authtoken]
 ...
 auth_uri = http://<replaceable>controller</replaceable>:5000/v2.0
 identity_uri = http://<replaceable>controller</replaceable>:35357
@@ -372,9 +377,17 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></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>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl restart openstack-nova-api.service</userinput>
+<prompt>#</prompt> <userinput>systemctl restart openstack-nova-scheduler.service</userinput>
+<prompt>#</prompt> <userinput>systemctl restart openstack-nova-conductor.service</userinput></screen>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><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>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl restart openstack-nova-api.service</userinput>
+<prompt>#</prompt> <userinput>systemctl restart openstack-nova-scheduler.service</userinput>
+<prompt>#</prompt> <userinput>systemctl restart openstack-nova-conductor.service</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>
@@ -382,10 +395,14 @@ admin_password = <replaceable>NEUTRON_PASS</replaceable></programlisting>
     <step os="rhel;centos;fedora;sles;opensuse">
       <para>Start the Networking service and configure it to start when the
         system boots:</para>
-      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>service neutron-server start</userinput>
-<prompt>#</prompt> <userinput>chkconfig neutron-server on</userinput></screen>
-      <screen os="sles;opensuse"><prompt>#</prompt> <userinput>service openstack-neutron start</userinput>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable neutron-server.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start neutron-server.service</userinput></screen>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><prompt>#</prompt> <userinput>service openstack-neutron start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-neutron on</userinput></screen>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable openstack-neutron.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack.neutron.service</userinput></screen>
     </step>
     <step os="ubuntu;debian">
       <para>Restart the Networking service:</para>
diff --git a/doc/install-guide/section_neutron-network-node.xml b/doc/install-guide/section_neutron-network-node.xml
index 762e16040c..c0b5c5ffb2 100644
--- a/doc/install-guide/section_neutron-network-node.xml
+++ b/doc/install-guide/section_neutron-network-node.xml
@@ -96,9 +96,14 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
             <application>RabbitMQ</application>.</para>
         </step>
         <step>
-          <para>In the <literal>[keystone_authtoken]</literal> section,
+          <para>In the <literal>[DEFAULT]</literal> and
+            <literal>[keystone_authtoken]</literal> sections,
             configure Identity service access:</para>
-          <programlisting language="ini">[keystone_authtoken]
+          <programlisting language="ini">[DEFAULT]
+...
+auth_strategy = keystone
+
+[keystone_authtoken]
 ...
 auth_uri = http://<replaceable>controller</replaceable>:5000/v2.0
 identity_uri = http://<replaceable>controller</replaceable>:35357
@@ -389,7 +394,11 @@ metadata_proxy_shared_secret = <replaceable>METADATA_SECRET</replaceable></progr
     <step>
       <para>On the <emphasis>controller</emphasis> node, restart the
         Compute <glossterm>API</glossterm> service:</para>
-      <screen os="rhel;centos;fedora;sles;opensuse"><prompt>#</prompt> <userinput>service openstack-nova-api restart</userinput></screen>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl restart openstack-nova-api.service</userinput></screen>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><prompt>#</prompt> <userinput>service openstack-nova-api restart</userinput></screen>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl restart openstack-nova-api.service</userinput></screen>
       <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>service nova-api restart</userinput></screen>
     </step>
   </procedure>
@@ -404,17 +413,17 @@ metadata_proxy_shared_secret = <replaceable>METADATA_SECRET</replaceable></progr
       interface to provide instances with external network access. In
       essence, this port connects the virtual and physical external
       networks in your environment.</para>
-    <step os="rhel;centos;fedora">
+    <step os="rhel;centos;fedora;sles;opensuse">
       <para>Start the OVS service and configure it to start when the
         system boots:</para>
-      <screen><prompt>#</prompt> <userinput>service openvswitch start</userinput>
-<prompt>#</prompt> <userinput>chkconfig openvswitch on</userinput></screen>
-    </step>
-    <step os="sles;opensuse">
-      <para>Start the OVS service and configure it to start when the
-        system boots:</para>
-      <screen><prompt>#</prompt> <userinput>service openvswitch-switch start</userinput>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable openvswitch.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openvswitch.service</userinput></screen>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><prompt>#</prompt> <userinput>service openvswitch-switch start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openvswitch-switch on</userinput></screen>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable openvswitch.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openvswitch.service</userinput></screen>
     </step>
     <step os="debian;ubuntu">
       <para>Restart the OVS service:</para>
@@ -451,7 +460,16 @@ metadata_proxy_shared_secret = <replaceable>METADATA_SECRET</replaceable></progr
         <filename>/etc/neutron/plugins/ml2/ml2_conf.ini</filename>.
         If this symbolic link does not exist, create it using the
         following command:</para>
-      <screen><prompt>#</prompt> <userinput>ln -s /etc/neutron/plugins/ml2/ml2_conf.ini /etc/neutron/plugin.ini</userinput></screen></step>
+      <screen><prompt>#</prompt> <userinput>ln -s /etc/neutron/plugins/ml2/ml2_conf.ini /etc/neutron/plugin.ini</userinput></screen>
+      <para>Due to a packaging bug, the Open vSwitch agent initialization
+        script explicitly looks for the Open vSwitch plug-in configuration
+        file rather than a symbolic link
+        <filename>/etc/neutron/plugin.ini</filename> pointing to the ML2
+        plug-in configuration file. Run the following commands to resolve this
+        issue:</para>
+      <screen><prompt>#</prompt> <userinput>cp /usr/lib/systemd/system/neutron-openvswitch-agent.service /usr/lib/systemd/system/neutron-openvswitch-agent.service.orig</userinput>
+<prompt>#</prompt> <userinput>sed -i 's,plugins/openvswitch/ovs_neutron_plugin.ini,plugin.ini,g' /usr/lib/systemd/system/neutron-openvswitch-agent.service</userinput></screen>
+    </step>
     <step os="sles;opensuse">
       <para>The Networking service initialization scripts expect the
         variable <literal>NEUTRON_PLUGIN_CONF</literal> in the
@@ -464,16 +482,22 @@ metadata_proxy_shared_secret = <replaceable>METADATA_SECRET</replaceable></progr
     <step os="rhel;centos;fedora;sles;opensuse">
       <para>Start the Networking services and configure them to start
         when the system boots:</para>
-      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>service neutron-openvswitch-agent start</userinput>
-<prompt>#</prompt> <userinput>service neutron-l3-agent start</userinput>
-<prompt>#</prompt> <userinput>service neutron-dhcp-agent start</userinput>
-<prompt>#</prompt> <userinput>service neutron-metadata-agent start</userinput>
-<prompt>#</prompt> <userinput>chkconfig neutron-openvswitch-agent on</userinput>
-<prompt>#</prompt> <userinput>chkconfig neutron-l3-agent on</userinput>
-<prompt>#</prompt> <userinput>chkconfig neutron-dhcp-agent on</userinput>
-<prompt>#</prompt> <userinput>chkconfig neutron-metadata-agent on</userinput>
-<prompt>#</prompt> <userinput>chkconfig neutron-ovs-cleanup on</userinput></screen>
-      <screen os="sles;opensuse"><prompt>#</prompt> <userinput>service openstack-neutron-openvswitch-agent start</userinput>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable neutron-openvswitch-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable neutron-l3-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable neutron-dhcp-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable neutron-metadata-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable neutron-ovs-cleanup.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start neutron-openvswitch-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start neutron-l3-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start neutron-dhcp-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start neutron-metadata-agent.service</userinput></screen>
+      <note os="rhel;centos;fedora">
+        <para>Do not explictly start the
+          <systemitem class="service">neutron-ovs-cleanup</systemitem>
+          service.</para>
+      </note>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><prompt>#</prompt> <userinput>service openstack-neutron-openvswitch-agent start</userinput>
 <prompt>#</prompt> <userinput>service openstack-neutron-l3-agent start</userinput>
 <prompt>#</prompt> <userinput>service openstack-neutron-dhcp-agent start</userinput>
 <prompt>#</prompt> <userinput>service openstack-neutron-metadata-agent start</userinput>
@@ -482,6 +506,21 @@ metadata_proxy_shared_secret = <replaceable>METADATA_SECRET</replaceable></progr
 <prompt>#</prompt> <userinput>chkconfig openstack-neutron-dhcp-agent on</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-neutron-metadata-agent on</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-neutron-ovs-cleanup on</userinput></screen>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable openstack-neutron-openvswitch-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-neutron-l3-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-neutron-dhcp-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-neutron-metadata-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-neutron-ovs-cleanup.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-neutron-openvswitch-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-neutron-l3-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-neutron-dhcp-agent.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-neutron-metadata-agent.service</userinput></screen>
+      <note os="sles;opensuse">
+        <para>Do not explictly start the
+          <systemitem class="service">openstack-neutron-ovs-cleanup</systemitem>
+          service.</para>
+      </note>
     </step>
     <step os="ubuntu;debian">
       <para>Restart the Networking services:</para>
diff --git a/doc/install-guide/section_nova-compute-install.xml b/doc/install-guide/section_nova-compute-install.xml
index d0ba04af82..66c1362691 100644
--- a/doc/install-guide/section_nova-compute-install.xml
+++ b/doc/install-guide/section_nova-compute-install.xml
@@ -30,15 +30,6 @@
       <para>Edit the <filename>/etc/nova/nova.conf</filename> file and
         complete the following actions:</para>
       <substeps>
-        <step>
-          <para>In the <literal>[database]</literal> section, configure
-            database access:</para>
-          <programlisting language="ini">[database]
-...
-connection = mysql://nova:<replaceable>NOVA_DBPASS</replaceable>@<replaceable>controller</replaceable>/nova</programlisting>
-          <para>Replace <replaceable>NOVA_DBPASS</replaceable> with the password
-            you chose for the Compute database.</para>
-        </step>
         <step>
           <para>In the <literal>[DEFAULT]</literal> section, configure
             <application>RabbitMQ</application> message broker access:</para>
@@ -180,30 +171,20 @@ virt_type = qemu</programlisting>
     <step os="rhel;centos;fedora;sles;opensuse">
       <para>Start the Compute service including its dependencies and configure
         them to start automatically when the system boots:</para>
-      <stepalternatives os="rhel;centos;fedora">
-        <step>
-          <para>For RHEL, CentOS, and compatible derivatives:</para>
-          <screen><prompt>#</prompt> <userinput>service libvirtd start</userinput>
-<prompt>#</prompt> <userinput>service messagebus start</userinput>
-<prompt>#</prompt> <userinput>service openstack-nova-compute start</userinput>
-<prompt>#</prompt> <userinput>chkconfig libvirtd on</userinput>
-<prompt>#</prompt> <userinput>chkconfig messagebus on</userinput>
-<prompt>#</prompt> <userinput>chkconfig openstack-nova-compute on</userinput></screen>
-        </step>
-        <step>
-          <para>For Fedora:</para>
-          <screen><prompt>#</prompt> <userinput>service libvirtd start</userinput>
-<prompt>#</prompt> <userinput>service dbus start</userinput>
-<prompt>#</prompt> <userinput>service openstack-nova-compute start</userinput>
-<prompt>#</prompt> <userinput>chkconfig libvirtd on</userinput>
-<prompt>#</prompt> <userinput>chkconfig dbus on</userinput>
-<prompt>#</prompt> <userinput>chkconfig openstack-nova-compute on</userinput></screen>
-        </step>
-      </stepalternatives>
-      <screen os="opensuse;sles"><prompt>#</prompt> <userinput>service libvirtd start</userinput>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable libvirtd.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start libvirtd.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-nova-compute.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-compute.service</userinput></screen>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><prompt>#</prompt> <userinput>service libvirtd start</userinput>
 <prompt>#</prompt> <userinput>chkconfig libvirtd on</userinput>
 <prompt>#</prompt> <userinput>service openstack-nova-compute start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-nova-compute on</userinput></screen>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable libvirtd.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start libvirtd.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-nova-compute.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-compute.service</userinput></screen>
     </step>
     <step os="ubuntu">
       <para>By default, the Ubuntu packages create an SQLite database.</para>
diff --git a/doc/install-guide/section_nova-controller-install.xml b/doc/install-guide/section_nova-controller-install.xml
index 8d1320a9e6..0bd4f6711c 100644
--- a/doc/install-guide/section_nova-controller-install.xml
+++ b/doc/install-guide/section_nova-controller-install.xml
@@ -250,7 +250,20 @@ vncserver_proxyclient_address = 10.0.0.11</programlisting>
     <step os="rhel;centos;fedora;sles;opensuse">
       <para>Start the Compute services and configure them to start when the
         system boots:</para>
-      <screen><prompt>#</prompt> <userinput>service openstack-nova-api start</userinput>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable openstack-nova-api.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-nova-cert.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-nova-consoleauth.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-nova-scheduler.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-nova-conductor.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-nova-novncproxy.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-api.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-cert.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-consoleauth.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-scheduler.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-conductor.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-novncproxy.service</userinput></screen>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><prompt>#</prompt> <userinput>service openstack-nova-api start</userinput>
 <prompt>#</prompt> <userinput>service openstack-nova-cert start</userinput>
 <prompt>#</prompt> <userinput>service openstack-nova-consoleauth start</userinput>
 <prompt>#</prompt> <userinput>service openstack-nova-scheduler start</userinput>
@@ -262,6 +275,19 @@ vncserver_proxyclient_address = 10.0.0.11</programlisting>
 <prompt>#</prompt> <userinput>chkconfig openstack-nova-scheduler on</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-nova-conductor on</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-nova-novncproxy on</userinput></screen>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable openstack-nova-api.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-nova-cert.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-nova-consoleauth.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-nova-scheduler.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-nova-conductor.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-nova-novncproxy.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-api.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-cert.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-consoleauth.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-scheduler.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-conductor.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-novncproxy.service</userinput></screen>
     </step>
     <step os="ubuntu">
       <para>By default, the Ubuntu packages create an SQLite database.</para>
diff --git a/doc/install-guide/section_nova-networking-compute-node.xml b/doc/install-guide/section_nova-networking-compute-node.xml
index 4c490d0a7d..91ea21fe8c 100644
--- a/doc/install-guide/section_nova-networking-compute-node.xml
+++ b/doc/install-guide/section_nova-networking-compute-node.xml
@@ -22,45 +22,14 @@
   </procedure>
   <procedure>
     <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 \
-  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_network_bridge br100</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/nova/nova.conf DEFAULT \
-  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]
+    <step>
+      <para>Edit the <filename>/etc/nova/nova.conf</filename> file and
+        complete the following actions:</para>
+      <substeps>
+        <step>
+          <para>In the <literal>[DEFAULT]</literal> section, configure
+            the network parameters:</para>
+          <programlisting language="ini">[DEFAULT]
 ...
 network_api_class = nova.network.api.API
 security_group_api = nova
@@ -75,6 +44,11 @@ force_dhcp_release = True
 flat_network_bridge = br100
 flat_interface = <replaceable>INTERFACE_NAME</replaceable>
 public_interface = <replaceable>INTERFACE_NAME</replaceable></programlisting>
+          <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>
+        </step>
+      </substeps>
     </step>
     <step>
       <para os="ubuntu;debian">Restart the services:</para>
@@ -82,14 +56,20 @@ public_interface = <replaceable>INTERFACE_NAME</replaceable></programlisting>
 <prompt>#</prompt> <userinput>service nova-api-metadata restart</userinput></screen>
       <para os="rhel;centos;fedora;sles;opensuse">Start the services and
         configure them to start when the system boots:</para>
-      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>service openstack-nova-network start</userinput>
-<prompt>#</prompt> <userinput>service openstack-nova-metadata-api start</userinput>
-<prompt>#</prompt> <userinput>chkconfig openstack-nova-network on</userinput>
-<prompt>#</prompt> <userinput>chkconfig openstack-nova-metadata-api on</userinput></screen>
-      <screen os="sles;opensuse"><prompt>#</prompt> <userinput>service openstack-nova-network start</userinput>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable openstack-nova-network.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-nova-metadata-api.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-network.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-metadata-api.service</userinput></screen>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><prompt>#</prompt> <userinput>service openstack-nova-network start</userinput>
 <prompt>#</prompt> <userinput>service openstack-nova-api-metadata start</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-nova-network on</userinput>
 <prompt>#</prompt> <userinput>chkconfig openstack-nova-api-metadata on</userinput></screen>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable openstack-nova-network.service</userinput>
+<prompt>#</prompt> <userinput>systemctl enable openstack-nova-metadata-api.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-network.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start openstack-nova-metadata-api.service</userinput></screen>
     </step>
   </procedure>
 </section>
diff --git a/doc/install-guide/section_nova-networking-controller-node.xml b/doc/install-guide/section_nova-networking-controller-node.xml
index dec59801be..d0cd1ba1cd 100644
--- a/doc/install-guide/section_nova-networking-controller-node.xml
+++ b/doc/install-guide/section_nova-networking-controller-node.xml
@@ -10,26 +10,33 @@
     networking.</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]
+    <step>
+      <para>Edit the <filename>/etc/nova/nova.conf</filename> file and
+        complete the following actions:</para>
+      <substeps>
+        <step>
+          <para>In the <literal>[DEFAULT]</literal> section, configure
+            the network and security group APIs:</para>
+          <programlisting language="ini">[DEFAULT]
 ...
 network_api_class = nova.network.api.API
 security_group_api = nova</programlisting>
+        </step>
+      </substeps>
     </step>
     <step>
       <para>Restart the Compute services:</para>
-      <screen os="rhel;centos;fedora;sles;opensuse"><prompt>#</prompt> <userinput>service openstack-nova-api restart</userinput>
+      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl restart openstack-nova-api.service</userinput>
+<prompt>#</prompt> <userinput>systemctl restart openstack-nova-scheduler.service</userinput>
+<prompt>#</prompt> <userinput>systemctl restart openstack-nova-conductor.service</userinput></screen>
+      <para os="sles">On SLES:</para>
+      <screen os="sles"><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>
+      <para os="opensuse">On openSUSE:</para>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl restart openstack-nova-api.service</userinput>
+<prompt>#</prompt> <userinput>systemctl restart openstack-nova-scheduler.service</userinput>
+<prompt>#</prompt> <userinput>systemctl restart openstack-nova-conductor.service</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>