openstack/openstack-manuals
Code Issues Proposed changes

Merge "Add links to tables in Config Ref Guide"

Browse Source
This commit is contained in:
Jenkins 2015-08-20 05:52:32 +00:00 committed by Gerrit Code Review
commit 8b70fb2e7d
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/admin-guide-cloud-rst/source/compute-configuring-migrations.rst
View File

@ -231,13 +231,13 @@ Example Compute installation environment
the secure remote access TCP configuration you chose, be careful which
ports you open, and always understand who has access. For information
about ports that are used with libvirt,
see `the libvirt documentation <http://libvirt.org/remote.html#Remote_libvirtd_configuration>`_.
see the `libvirt documentation <http://libvirt.org/remote.html#Remote_libvirtd_configuration>`_.
#. You can now configure options for live migration. In most cases, you
will not need to configure any options. The following chart is for
advanced users only.
.. TODO :include :: /../../common/tables/nova-livemigration.xml/
will not need to configure any options. For advanced configuration options,
see the `OpenStack Configuration Reference Guide <http://docs.openstack.org/
kilo/config-reference/content/list-of-compute-config-options.html
#config_table_nova_livemigration>`_.
.. _true-live-migration-kvm-libvirt:

9
doc/admin-guide-cloud-rst/source/compute-service-groups.rst
View File

@ -60,11 +60,9 @@ guide (for more information, see `Apache Zookeeper <http://zookeeper.apache.org/
Python libraries must be installed on every compute node:
**python-zookeeper**
The official Zookeeper Python binding
**evzookeeper**
This library makes the binding work with the eventlet threading model.
This example assumes the ZooKeeper server addresses and ports are
@ -81,10 +79,9 @@ node for the ZooKeeper driver:
[zookeeper]
address="192.168.2.1:2181,192.168.2.2:2181,192.168.2.3:2181"
To customize the Compute Service groups, use these configuration option
settings:
.. TODO ../../common/tables/nova-zookeeper.xml
For Compute Service groups customization options, see the `OpenStack
Configuration Reference Guide <http://docs.openstack.org/kilo/config-reference/
content/list-of-compute-config-options.html#config_table_nova_zookeeper>`_.
.. _memcache-servicegroup-driver: