From ff82fe57b4409084b5fb76e70e6e8a1539c55661 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Mon, 13 Apr 2015 10:12:33 +0200
Subject: [PATCH] Install Guide: Update Nova for openSUSE/SLES

With current OS versions, we can merge the descriptions.

Partially implements bp installguide-kilo

Change-Id: I64e5480e85bd2069e9e0b109ba723659638adbfb
---
 .../section_nova-compute-install.xml          | 10 +--------
 .../section_nova-controller-install.xml       | 22 +------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/doc/install-guide/section_nova-compute-install.xml b/doc/install-guide/section_nova-compute-install.xml
index ee0f17e922..a5cb9e794e 100644
--- a/doc/install-guide/section_nova-compute-install.xml
+++ b/doc/install-guide/section_nova-compute-install.xml
@@ -221,15 +221,7 @@ 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>
-      <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable libvirtd.service openstack-nova-compute.service</userinput>
-<prompt>#</prompt> <userinput>systemctl start libvirtd.service 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 openstack-nova-compute.service</userinput>
+      <screen><prompt>#</prompt> <userinput>systemctl enable libvirtd.service openstack-nova-compute.service</userinput>
 <prompt>#</prompt> <userinput>systemctl start libvirtd.service openstack-nova-compute.service</userinput></screen>
     </step>
     <step os="ubuntu">
diff --git a/doc/install-guide/section_nova-controller-install.xml b/doc/install-guide/section_nova-controller-install.xml
index 6015f190c7..17f9f018ce 100644
--- a/doc/install-guide/section_nova-controller-install.xml
+++ b/doc/install-guide/section_nova-controller-install.xml
@@ -273,27 +273,7 @@ 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 os="rhel;centos;fedora"><prompt>#</prompt> <userinput>systemctl enable openstack-nova-api.service openstack-nova-cert.service \
-  openstack-nova-consoleauth.service openstack-nova-scheduler.service \
-  openstack-nova-conductor.service openstack-nova-novncproxy.service</userinput>
-<prompt>#</prompt> <userinput>systemctl start openstack-nova-api.service openstack-nova-cert.service \
-  openstack-nova-consoleauth.service openstack-nova-scheduler.service \
-  openstack-nova-conductor.service 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>
-<prompt>#</prompt> <userinput>service openstack-nova-conductor start</userinput>
-<prompt>#</prompt> <userinput>service openstack-nova-novncproxy start</userinput>
-<prompt>#</prompt> <userinput>chkconfig openstack-nova-api on</userinput>
-<prompt>#</prompt> <userinput>chkconfig openstack-nova-cert on</userinput>
-<prompt>#</prompt> <userinput>chkconfig openstack-nova-consoleauth on</userinput>
-<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 openstack-nova-cert.service \
+      <screen><prompt>#</prompt> <userinput>systemctl enable openstack-nova-api.service openstack-nova-cert.service \
   openstack-nova-consoleauth.service openstack-nova-scheduler.service \
   openstack-nova-conductor.service openstack-nova-novncproxy.service</userinput>
 <prompt>#</prompt> <userinput>systemctl start openstack-nova-api.service openstack-nova-cert.service \