From c2938c62fbfa3b15e45af0372651117bb948edaa Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Sun, 13 Apr 2014 19:20:05 +0200
Subject: [PATCH] Install Guide edits

Edits while testing for openSUSE and SUSE Linux Enterprise:
* Remove wrong line wrapping for screen in section_cinder-controller.xml
* indent second lines of commands in section_cinder-controller.xml
* Remove wrong line wrapping for screen in section_cinder-node.xml

Change-Id: I2d6e1aeff2725f8461e5410b0d2e2b75e61d8d85
---
 .../section_cinder-controller.xml             | 21 ++++++++--------
 doc/install-guide/section_cinder-node.xml     | 25 ++++++++++++-------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/doc/install-guide/section_cinder-controller.xml b/doc/install-guide/section_cinder-controller.xml
index 0b4b32eecb..bcd0cecc92 100644
--- a/doc/install-guide/section_cinder-controller.xml
+++ b/doc/install-guide/section_cinder-controller.xml
@@ -73,23 +73,22 @@ connection = mysql://cinder:<replaceable>CINDER_DBPASS</replaceable>@<replaceabl
     <step>
       <para os="fedora;rhel;centos;opensuse;sles">Edit the
         <filename>/etc/cinder/cinder.conf</filename> configuration file:</para>
-      <screen os="fedora;rhel;centos;opensuse;sles"><prompt>#</prompt>
-      <userinput>openstack-config --set /etc/cinder/cinder.conf DEFAULT \
-auth_strategy keystone</userinput>
+      <screen os="fedora;rhel;centos;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf DEFAULT \
+  auth_strategy keystone</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken \
-auth_uri http://<replaceable>controller</replaceable>:5000</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.confkeystone_authtoken \
-auth_host <replaceable>controller</replaceable></userinput>
+  auth_uri http://<replaceable>controller</replaceable>:5000</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken \
- auth_protocol http</userinput>
+  auth_host <replaceable>controller</replaceable></userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken \
-auth_port 35357</userinput>
+  auth_protocol http</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken \
-admin_user cinder</userinput>
+  auth_port 35357</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken \
-admin_tenant_name service</userinput>
+  admin_user cinder</userinput>
 <prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken \
-admin_password <replaceable>CINDER_PASS</replaceable></userinput></screen>
+  admin_tenant_name service</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken \
+  admin_password <replaceable>CINDER_PASS</replaceable></userinput></screen>
     <para os="ubuntu;debian">Edit the
           <filename>/etc/cinder/cinder.conf</filename> configuration
         file and add this section for keystone credentials:</para>
diff --git a/doc/install-guide/section_cinder-node.xml b/doc/install-guide/section_cinder-node.xml
index 2720742bc7..6734486182 100644
--- a/doc/install-guide/section_cinder-node.xml
+++ b/doc/install-guide/section_cinder-node.xml
@@ -105,15 +105,22 @@ filter = [ "a/sda1/", "a/sdb/", "r/.*/"]
           <filename>/etc/cinder/cinder.conf</filename> configuration
         file from the controller, or perform the following steps to
         set the keystone credentials:</para>
-      <screen os="fedora;rhel;centos;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf DEFAULT auth_strategy keystone</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken auth_uri http://<replaceable>controller</replaceable>:5000</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken auth_host <replaceable>controller</replaceable></userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken auth_protocol http</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken auth_port 35357</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken admin_user cinder</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken admin_tenant_name service</userinput>
-<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken admin_password
-<replaceable>CINDER_PASS</replaceable></userinput></screen>
+      <screen os="fedora;rhel;centos;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf DEFAULT \
+  auth_strategy keystone</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken \
+  auth_uri http://<replaceable>controller</replaceable>:5000</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken \
+  auth_host <replaceable>controller</replaceable></userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken \
+  auth_protocol http</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken \
+  auth_port 35357</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken \
+  admin_user cinder</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken \
+  admin_tenant_name service</userinput>
+<prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf keystone_authtoken \
+  admin_password <replaceable>CINDER_PASS</replaceable></userinput></screen>
       <para os="ubuntu;debian">Edit the
           <filename>/etc/cinder/cinder.conf</filename> configuration
         file and add this section for keystone credentials:</para>