Merge "Added admonition about .ini files"

This commit is contained in:
Jenkins 2013-11-18 13:15:50 +00:00 committed by Gerrit Code Review
commit 3ad5da001f
2 changed files with 11 additions and 2 deletions

View File

@ -181,8 +181,13 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
<step>
<para>Edit the <filename>/etc/nova/api-paste.ini</filename>
configuration file to add the credentials to the
file to add the credentials to the
<literal>[filter:authtoken]</literal> section:</para>
<note><title>Use of .ini files</title>
<para>Files with the extension <filename>.ini</filename>
sometimes need to be edited during initial setup. However,
they should not be used for general configuration tasks.</para>
</note>
<programlisting language="ini">[filter:authtoken]
paste.filter_factory=keystoneclient.middleware.auth_token:filter_factory
auth_host=controller

View File

@ -154,7 +154,11 @@ auth_strategy=keystone</programlisting>
<filename>/etc/nova/api-paste.ini</filename> file. Add these
options to the <literal>[filter:authtoken]</literal>
section:</para>
<note><title>Use of .ini files</title>
<para>Files with the extension <filename>.ini</filename>
sometimes need to be edited during initial setup. However,
they should not be used for general configuration tasks.</para>
</note>
<programlisting language="ini">[filter:authtoken]
paste.filter_factory=keystoneclient.middleware.auth_token:filter_factory
auth_host=<replaceable>controller</replaceable>