From b81fbcc40e0cf7b4ba7be309ee78a554cfead000 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Sat, 11 Apr 2015 13:33:58 +0200
Subject: [PATCH] Install Guide: openSUSE: Update keystone install

With both openSUSE and SLES using systemd, we can merge instructions
- and merge with Fedora based distros as well.
Remove also now unneeded old openssl command.

Change-Id: Ia671a6122b49d7236c7511f04e652df9c69a7bf2
---
 doc/install-guide/section_keystone-install.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/doc/install-guide/section_keystone-install.xml b/doc/install-guide/section_keystone-install.xml
index cd459730dc..2e6fa5de9b 100644
--- a/doc/install-guide/section_keystone-install.xml
+++ b/doc/install-guide/section_keystone-install.xml
@@ -47,8 +47,7 @@
     <step>
       <para>Generate a random value to use as the administration token during
         initial configuration:</para>
-      <screen os="ubuntu;rhel;centos;fedora"><prompt>$</prompt> <userinput>openssl rand -hex 10</userinput></screen>
-      <screen os="sles;opensuse"><prompt>$</prompt> <userinput>openssl rand 10 | hexdump -e '1/1 "%.2x"'</userinput></screen>
+      <screen><prompt>$</prompt> <userinput>openssl rand -hex 10</userinput></screen>
     </step>
   </procedure>
   <procedure os="ubuntu;rhel;centos;fedora;sles;opensuse">
@@ -343,13 +342,7 @@ Listen 35357
     <step os="rhel;fedora;centos;opensuse;sles">
       <para>Start the Identity service and configure it to start when the
         system boots:</para>
-      <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>
+      <screen><prompt>#</prompt> <userinput>systemctl enable openstack-keystone.service</userinput>
 <prompt>#</prompt> <userinput>systemctl start openstack-keystone.service</userinput></screen>
     </step>
     <step os="ubuntu">