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
This commit is contained in:
ZhiQiang Fan 2014-02-19 19:30:44 +08:00
parent a4da0e82c1
commit df8be3e0f6

View File

@ -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>