openstack/openstack-manuals
Code Issues Proposed changes

Merge "modificaitons in admin guide cloud"

Browse Source
This commit is contained in:
Jenkins 2015-05-17 22:05:06 +00:00 committed by Gerrit Code Review
commit 3142efef68
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/admin-guide-cloud/compute/section_compute-system-admin.xml
View File

@ -117,7 +117,7 @@
<simplesect>
<title>Password injection on libvirt-based hypervisors</title>
<para>For hypervisors that use the libvirt backend (such as KVM, QEMU,
<para>For hypervisors that use the libvirt back end (such as KVM, QEMU,
and LXC), admin password injection is disabled by default. To enable
it, set this option in <filename>/etc/nova/nova.conf</filename>:</para>
<programlisting language="ini">[libvirt]
@ -137,7 +137,7 @@ inject_password=true</programlisting>
</simplesect>
<simplesect>
<title>Password injection and XenAPI (XenServer/XCP)</title>
<para>when using the XenAPI hypervisor backend, Compute uses the XenAPI
<para>when using the XenAPI hypervisor back end, Compute uses the XenAPI
agent to inject passwords into guests. The virtual machine image must
be configured with the agent for password injection to work.</para>
</simplesect>

14
doc/admin-guide-cloud/identity/section_caching-layer.xml
View File

@ -10,11 +10,11 @@
configurable subsystems (for example, token, assignment). OpenStack Identity
uses the <link xlink:href="http://dogpilecache.readthedocs.org/en/latest/">
<literal>dogpile.cache</literal></link> library which allows flexible
cache backends. The majority of the caching configuration options are set in
cache back ends. The majority of the caching configuration options are set in
the <literal>[cache]</literal> section of the <filename>keystone.conf</filename>
file. However, each section that has the capability to be cached usually
has a caching boolean value that toggles caching.</para>
<para>So to enable only the token backend caching, set the values as follows:</para>
<para>So to enable only the token back end caching, set the values as follows:</para>
<programlisting language="ini">[cache]
enabled=true
@ -83,20 +83,20 @@ caching=true</programlisting>
the <literal>[assignment]</literal> section of the configuration file)
or the global <literal>expiration_time</literal> (set in the <literal>[cache]</literal>
section of the configuration file) before it is reflected. If this type
of delay (when using a read-only <literal>assignment</literal> backend)
of delay (when using a read-only <literal>assignment</literal> back end)
is an issue, it is recommended that caching be disabled on
<literal>assignment</literal>. To disable caching specifically on
<literal>assignment</literal>, in the <literal>[assignment]</literal>
section of the configuration set <literal>caching</literal> to
<literal>False</literal>.</para>
</note>
<para>For more information about the different backends (and configuration options), see:</para>
<para>For more information about the different back ends (and configuration options), see:</para>
<itemizedlist>
<listitem><para><link xlink:href="http://dogpilecache.readthedocs.org/en/latest/api.html#memory-backend">
<literal>dogpile.cache.backends.memory</literal></link></para></listitem>
<listitem><para><link xlink:href="http://dogpilecache.readthedocs.org/en/latest/api.html#memcached-backends">
<literal>dogpile.cache.backends.memcached</literal></link></para>
<note><para>The memory backend is not suitable for use in a production environment.</para></note></listitem>
<note><para>The memory back end is not suitable for use in a production environment.</para></note></listitem>
<listitem><para><link xlink:href="http://dogpilecache.readthedocs.org/en/latest/api.html#redis-backends">
<literal>dogpile.cache.backends.redis</literal></link></para></listitem>
<listitem><para><link xlink:href="http://dogpilecache.readthedocs.org/en/latest/api.html#file-backends">
@ -104,8 +104,8 @@ caching=true</programlisting>
<listitem><para><literal>keystone.common.cache.backends.mongo</literal></para></listitem>
</itemizedlist>
<example>
<title>Configure the Memcached backend</title>
<para>The following example shows how to configure the memcached backend:</para>
<title>Configure the Memcached back end</title>
<para>The following example shows how to configure the memcached back end:</para>
<programlisting language="ini">[cache]
enabled = true