From df8be3e0f64c21c975d4c3a5d11bf1fc56453a7f Mon Sep 17 00:00:00 2001
From: ZhiQiang Fan <zhiqiang.fan@huawei.com>
Date: Wed, 19 Feb 2014 19:30:44 +0800
Subject: [PATCH] Fix syntax error in controller node sql setup

The mysql shell command has redundant prompt which leads to incorrect
sql command, this patch simply removes the unnecessary characters.

Note, this patch also adds a single space after each prompt character
'>', this is same to the real mysql shell environment.

Change-Id: I3980d79dee88dcdf7add541bda59d97bf670be01
Closes-Bug: #1282039
---
 lab001-control-node.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lab001-control-node.xml b/lab001-control-node.xml
index ba81168e..e8b714da 100644
--- a/lab001-control-node.xml
+++ b/lab001-control-node.xml
@@ -143,17 +143,17 @@ iface eth2 inet dhcp</programlisting>
       <para>Create these databases:</para>
       <para>
           <screen><prompt>#</prompt> <userinput>mysql -u root -p</userinput></screen>
-          <screen><prompt>mysql></prompt><userinput>CREATE DATABASE keystone;</userinput></screen>
-          <screen><prompt>mysql></prompt><userinput>GRANT ALL ON keystone.* TO 'keystoneUser'@'%' IDENTIFIED BY 'keystonePass';</userinput></screen>
-          <screen><prompt>mysql></prompt><userinput>CREATE DATABASE glance;</userinput></screen>
-          <screen><prompt>mysql></prompt><userinput>mysql>GRANT ALL ON glance.* TO 'glanceUser'@'%' IDENTIFIED BY 'glancePass';</userinput></screen>
-          <screen><prompt>mysql></prompt><userinput>CREATE DATABASE neutron;</userinput></screen>
-          <screen><prompt>mysql></prompt><userinput>GRANT ALL ON neutron.* TO 'neutronUser'@'%' IDENTIFIED BY 'neutronPass';</userinput></screen>
-          <screen><prompt>mysql></prompt><userinput>CREATE DATABASE nova;</userinput></screen>
-          <screen><prompt>mysql></prompt><userinput>GRANT ALL ON nova.* TO 'novaUser'@'%' IDENTIFIED BY 'novaPass';</userinput></screen>
-          <screen><prompt>mysql></prompt><userinput>CREATE DATABASE cinder;</userinput></screen>
-          <screen><prompt>mysql></prompt><userinput>GRANT ALL ON cinder.* TO 'cinderUser'@'%' IDENTIFIED BY 'cinderPass';</userinput></screen>
-          <screen><prompt>mysql></prompt><userinput>quit;</userinput></screen>
+          <screen><prompt>mysql> </prompt><userinput>CREATE DATABASE keystone;</userinput></screen>
+          <screen><prompt>mysql> </prompt><userinput>GRANT ALL ON keystone.* TO 'keystoneUser'@'%' IDENTIFIED BY 'keystonePass';</userinput></screen>
+          <screen><prompt>mysql> </prompt><userinput>CREATE DATABASE glance;</userinput></screen>
+          <screen><prompt>mysql> </prompt><userinput>GRANT ALL ON glance.* TO 'glanceUser'@'%' IDENTIFIED BY 'glancePass';</userinput></screen>
+          <screen><prompt>mysql> </prompt><userinput>CREATE DATABASE neutron;</userinput></screen>
+          <screen><prompt>mysql> </prompt><userinput>GRANT ALL ON neutron.* TO 'neutronUser'@'%' IDENTIFIED BY 'neutronPass';</userinput></screen>
+          <screen><prompt>mysql> </prompt><userinput>CREATE DATABASE nova;</userinput></screen>
+          <screen><prompt>mysql> </prompt><userinput>GRANT ALL ON nova.* TO 'novaUser'@'%' IDENTIFIED BY 'novaPass';</userinput></screen>
+          <screen><prompt>mysql> </prompt><userinput>CREATE DATABASE cinder;</userinput></screen>
+          <screen><prompt>mysql> </prompt><userinput>GRANT ALL ON cinder.* TO 'cinderUser'@'%' IDENTIFIED BY 'cinderPass';</userinput></screen>
+          <screen><prompt>mysql> </prompt><userinput>quit;</userinput></screen>
       </para>
     </listitem>
     </itemizedlist>