openstack/openstack-manuals
Code Issues Proposed changes

Merge "Fix the Debian Heat install procedure"

Browse Source
This commit is contained in:
Jenkins 2014-06-04 18:19:04 +00:00 committed by Gerrit Code Review
commit 0da3f08acf
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doc/install-guide/section_heat-install.xml
View File

@ -29,7 +29,7 @@
<screen os="opensuse;sles"><prompt>#</prompt> <userinput>zypper install openstack-heat-api openstack-heat-api-cfn \
openstack-heat-engine</userinput></screen>
</step>
<step>
<step os="rhel;centos;fedora;opensuse;sles;ubuntu">
<para>In the configuration file, specify the location of the
database where the Orchestration service stores data. These
examples use a MySQL database with a
@ -38,10 +38,10 @@
the database user:</para>
<screen os="rhel;centos;fedora;opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/heat/heat.conf \
database connection mysql://heat:<replaceable>HEAT_DBPASS</replaceable>@<replaceable>controller</replaceable>/heat</userinput></screen>
<para os="ubuntu;debian">Edit
<para os="ubuntu">Edit
<filename>/etc/heat/heat.conf</filename> and modify the
<literal>[database]</literal> section:</para>
<programlisting os="ubuntu;debian" language="ini">[database]
<programlisting os="ubuntu" language="ini">[database]
# The SQLAlchemy connection string used to connect to the database
connection = mysql://heat:<replaceable>HEAT_DBPASS</replaceable>@<replaceable>controller</replaceable>/heat</programlisting>
</step>
@ -52,7 +52,7 @@ connection = mysql://heat:<replaceable>HEAT_DBPASS</replaceable>@<replaceable>co
does not get used by mistake:</para>
<screen><prompt>#</prompt> <userinput>rm /var/lib/heat/heat.sqlite</userinput></screen>
</step>
<step>
<step os="rhel;centos;fedora;opensuse;sles;ubuntu">
<para>Use the password that you set previously to log in as <literal>root</literal> and
create a <literal>heat</literal> database user:</para>
<screen><prompt>$</prompt> <userinput>mysql -u root -p</userinput>
@ -95,7 +95,7 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
<screen os="opensuse;sles"><prompt>#</prompt> <userinput>openstack-config --set /etc/heat/heat.conf DEFAULT rabbit_host <replaceable>controller</replaceable></userinput>
<prompt>#</prompt> <userinput>openstack-config --set /etc/heat/heat.conf DEFAULT rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput></screen>
</step>
<step>
<step os="rhel;centos;fedora;opensuse;sles;ubuntu">
<para>Create a <literal>heat</literal> user that the
Orchestration service can use to authenticate with the
Identity Service. Use the <literal>service</literal> tenant
@ -104,7 +104,7 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
--email=<replaceable>heat@example.com</replaceable></userinput>
<prompt>$</prompt> <userinput>keystone user-role-add --user=heat --tenant=service --role=admin</userinput></screen>
</step>
<step>
<step os="rhel;centos;fedora;opensuse;sles;ubuntu">
<para>Edit the <filename>/etc/heat/heat.conf</filename> file to
change the <literal>[keystone_authtoken]</literal> and
<literal>[ec2authtoken]</literal> sections to add
@ -119,6 +119,12 @@ admin_user = heat
admin_password = <replaceable>HEAT_PASS</replaceable>
[ec2authtoken]
auth_uri = http://<replaceable>controller</replaceable>:5000/v2.0</programlisting>
</step>
<step os="debian">
<para>Edit the <filename>/etc/heat/heat.conf</filename> file to
change the <literal>[ec2authtoken]</literal> sections:</para>
<programlisting language="ini">[ec2authtoken]
auth_uri = http://<replaceable>controller</replaceable>:5000/v2.0</programlisting>
</step>
<step>