From 50aa59cfff004c9da7de8daff186269f5dcd7ef1 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Sun, 13 Oct 2013 11:51:45 +0200
Subject: [PATCH] Update information for openSUSE

Based on testing the setup

Add a note that NetworkManager should not be used

Remove setence about asking for password since we pass the password
on the command line.

Change-Id: I73bde10c7df96d1502021f989da624586bb94a3f
---
 doc/install-guide/ch_basics.xml               | 22 ++++++++++++++-----
 .../section_keystone-install.xml              |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/doc/install-guide/ch_basics.xml b/doc/install-guide/ch_basics.xml
index 9bfa0bb802..c8dee4fcc0 100644
--- a/doc/install-guide/ch_basics.xml
+++ b/doc/install-guide/ch_basics.xml
@@ -51,15 +51,21 @@
           <literal>iptables</literal> as the default firewall system. You can configure
           <literal>firewalld</literal> successfully, but this guide
           currently recommends and demonstrates the use of <literal>iptables</literal>.
-	  For Fedora 19 systems, run the following commands to disable
-	  <literal>firewalld</literal> and enable <literal>iptables</literal>.</para>
+          For Fedora 19 systems, run the following commands to disable
+          <literal>firewalld</literal> and enable <literal>iptables</literal>.</para>
 <screen><prompt>#</prompt> <userinput>service firewalld stop</userinput>
 <prompt>#</prompt> <userinput>service iptables start</userinput>
 <prompt>#</prompt> <userinput>chkconfig firewalld off</userinput>
 <prompt>#</prompt> <userinput>chkconfig iptables on</userinput></screen>
     </note>
 
-    <para>Next, create the configuration files for both <literal>eth0</literal>
+    <para os="opensuse">When you setup your system, use the
+    traditional network scripts and do not use the
+    <literal>NetworkManager</literal>. You can change the settings also after
+    installation with the YaST network module:</para>
+    <screen os="opensuse"><prompt>#</prompt> <userinput>yast2 network</userinput></screen>
+
+    <para>Next, create the configuration for both <literal>eth0</literal>
       and <literal>eth1</literal>. This guide uses
         <literal>192.168.0.x</literal> address for the internal network and
         <literal>10.0.0.x</literal> addresses for the external network. Make
@@ -131,6 +137,11 @@ ONBOOT=yes</programlisting>
             </programlisting>
           </para>
         </listitem>
+        <listitem>
+          <para>
+            Setup a default route on the external network.
+          </para>
+        </listitem>
       </itemizedlist>
     </para>
 
@@ -262,15 +273,14 @@ hwclock -w</programlisting>
       the system boots.</para>
     <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>service mysqld start</userinput>
 <prompt>#</prompt> <userinput>chkconfig mysqld on</userinput></screen>
-    <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable mysqld.service</userinput>
-<prompt>#</prompt> <userinput>systemctl start mysqld.service</userinput></screen>
+    <screen os="opensuse"><prompt>#</prompt> <userinput>systemctl enable mysql.service</userinput>
+<prompt>#</prompt> <userinput>systemctl start mysql.service</userinput></screen>
 
     <para os="rhel;centos;fedora;opensuse">Finally, it's a good idea to set a root password for your MySQL
       database. The OpenStack programs that set up databases and tables will
       prompt you for this password if it's set.</para>
 
     <screen os="rhel;centos;fedora;opensuse"><prompt>#</prompt> <userinput>mysqladmin password <replaceable>newPassword</replaceable></userinput></screen>
-    <para os="rhel;centos;fedora;opensuse">Enter your desired password when prompted.</para>
   </section>
   <section xml:id="basics-queue">
     <title>Messaging Server</title>
diff --git a/doc/install-guide/section_keystone-install.xml b/doc/install-guide/section_keystone-install.xml
index 45560aa07c..f5e57c7d33 100644
--- a/doc/install-guide/section_keystone-install.xml
+++ b/doc/install-guide/section_keystone-install.xml
@@ -9,7 +9,7 @@
       <para>Install the Identity Service on the controller node:</para>
       <screen os="ubuntu;deb"><prompt>#</prompt> <userinput>apt-get install keystone python-keystone python-keystoneclient</userinput></screen>
       <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install openstack-keystone python-keystoneclient</userinput></screen>
-      <screen os="opensuse"><prompt>#</prompt> <userinput>zypper install openstack-keystone python-keystoneclient</userinput></screen>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>zypper install openstack-keystone python-keystoneclient openstack-utils</userinput></screen>
     </step>
 
     <step>