From 3dd4a18dd93feadcd869ceecce8228e56aca8c92 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger <aj@suse.de> Date: Wed, 30 Oct 2013 19:18:35 +0100 Subject: [PATCH] Install Guide: Change order of cinder setup First update the configuration file, then run openstack-db Change-Id: I69aad78243238c31aa47306ebdcf7d5ab33f6873 backport: havana Closes-Bug: #1246391 --- .../section_cinder-controller.xml | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/doc/install-guide/section_cinder-controller.xml b/doc/install-guide/section_cinder-controller.xml index 9e3745668e..9308932ebb 100644 --- a/doc/install-guide/section_cinder-controller.xml +++ b/doc/install-guide/section_cinder-controller.xml @@ -35,29 +35,13 @@ </note> </step> - <step os="rhel;centos;fedora;opensuse;sles"><para>The Block Storage Service stores volume information in a database. + <step> + <para>The Block Storage Service stores volume information in a database. The examples in this section use the same MySQL database that is used by other OpenStack services.</para> - <para> -To create the Block Storage Service database and tables and a <literal>cinder</literal> database user, run the <command>openstack-db</command> command. + <para>Configure the Block Storage Service to use the database. Replace <literal><replaceable>CINDER_DBPASS</replaceable></literal> with a password of your choosing.</para> - <screen><prompt>#</prompt> <userinput>openstack-db --init --service cinder --password <replaceable>CINDER_DBPASS</replaceable></userinput></screen></step> - - <step os="ubuntu;debian"> - <para>The Block Storage Service stores volume information in a database. - The examples in this section use the same MySQL database that is used by other OpenStack services.</para> - <para>Using the password that you set in the previous example, log in as root to create a <literal>cinder</literal> database.</para> - <screen><prompt>#</prompt> <userinput>mysql -u root -p</userinput> -<prompt>mysql></prompt> <userinput>CREATE DATABASE cinder;</userinput> -<prompt>mysql></prompt> <userinput>GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'localhost' \ -IDENTIFIED BY '<replaceable>CINDER_DBPASS</replaceable>';</userinput> -<prompt>mysql></prompt> <userinput>GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'%' \ -IDENTIFIED BY '<replaceable>CINDER_DBPASS</replaceable>';</userinput></screen> - </step> - - - <step><para>Configure the Block Storage Service to use the created database.</para> <screen os="rhel;centos;fedora;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/cinder/cinder.conf \ database connection mysql://cinder:<replaceable>CINDER_DBPASS</replaceable>@<replaceable>controller</replaceable>/cinder</userinput></screen> <para os="ubuntu;debian">Edit <filename>/etc/cinder/cinder.conf</filename> @@ -69,7 +53,25 @@ IDENTIFIED BY '<replaceable>CINDER_DBPASS</replaceable>';</userinput></screen> connection = mysql://cinder:CINDER_DBPASS@localhost/cinder ...</programlisting> -</step> + </step> + + <step os="rhel;centos;fedora;opensuse;sles"> + <para> + To create the Block Storage Service database and tables and a + <literal>cinder</literal> database user, run the + <command>openstack-db</command> command. + </para> + <screen><prompt>#</prompt> <userinput>openstack-db --init --service cinder --password <replaceable>CINDER_DBPASS</replaceable></userinput></screen></step> + + <step os="ubuntu;debian"> + <para>Using the password that you set in the previous example, log in as root to create a <literal>cinder</literal> database.</para> + <screen><prompt>#</prompt> <userinput>mysql -u root -p</userinput> +<prompt>mysql></prompt> <userinput>CREATE DATABASE cinder;</userinput> +<prompt>mysql></prompt> <userinput>GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'localhost' \ +IDENTIFIED BY '<replaceable>CINDER_DBPASS</replaceable>';</userinput> +<prompt>mysql></prompt> <userinput>GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'%' \ +IDENTIFIED BY '<replaceable>CINDER_DBPASS</replaceable>';</userinput></screen> + </step> <step os="ubuntu;debian"> <para>Create the database tables for the Block Storage Service.</para>