Fix cinder Debian install procedure

This patch adds links to the "Respond to the prompts for" steps,
and removes the manual edition of cinder.conf for the
keystone_authtoken (as this is handled by Debconf).

Change-Id: Ia0db1dfd4ccd47845333acbc6000330c83c985fb
Backport: icehouse
This commit is contained in:
Thomas Goirand
2014-06-02 14:42:50 +08:00
parent 4c3383b192
commit 4a1ad2d7e8
2 changed files with 11 additions and 6 deletions

View File

@@ -24,8 +24,13 @@
<screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-cinder-api openstack-cinder-scheduler</userinput></screen>
</step>
<step os="debian">
<para>Respond to the prompts for database
management, <literal>[keystone_authtoken]</literal> settings, RabbitMQ credentials and API endpoint registration.</para>
<para>Respond to the prompts for <link
linkend="debconf-dbconfig-common">database
management</link>, <link linkend="debconf-keystone_authtoken"
><literal>[keystone_authtoken]</literal> settings</link>,
<link linkend="debconf-rabbitmq">RabbitMQ
credentials</link>, and <link linkend="debconf-api-endpoints"
>API endpoint</link> registration.</para>
</step>
<step os="ubuntu;rhel;centos;fedora;opensuse;sles">
<para>Configure Block Storage to use your database.</para>
@@ -93,7 +98,7 @@ connection = mysql://cinder:<replaceable>CINDER_DBPASS</replaceable>@<replaceabl
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
<para os="ubuntu">Edit the
<filename>/etc/cinder/cinder.conf</filename> configuration
file and add this section for keystone credentials:</para>
<programlisting os="ubuntu;debian" language="ini">...

View File

@@ -102,7 +102,7 @@ filter = [ "a/sda1/", "a/sdb/", "r/.*/"]
configure or re-configure <systemitem class="service"
>cinder-common</systemitem>.</para>
</step>
<step>
<step os="fedora;rhel;centos;opensuse;sles;ubuntu">
<para os="fedora;rhel;centos;opensuse;sles">Copy the
<filename>/etc/cinder/cinder.conf</filename> configuration
file from the controller, or perform the following steps to
@@ -123,10 +123,10 @@ filter = [ "a/sda1/", "a/sdb/", "r/.*/"]
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
<para os="ubuntu">Edit the
<filename>/etc/cinder/cinder.conf</filename> configuration
file and add this section for keystone credentials:</para>
<programlisting os="ubuntu;debian" language="ini">...
<programlisting os="ubuntu" language="ini">...
[keystone_authtoken]
auth_uri = http://<replaceable>controller</replaceable>:5000
auth_host = <replaceable>controller</replaceable>