diff options
| author | Zuul <zuul@review.openstack.org> | 2018-02-16 05:00:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-02-16 05:00:18 +0000 |
| commit | 3b974d309f5b30b66904784977917117705926e9 (patch) | |
| tree | 42d2b5bdc9c7d4f10655fd3d2b07248f9c279bd7 | |
| parent | bdc1aac37172b9ca2a221d853dd7e9cca6c64dfa (diff) | |
| parent | c1dfe464bbe2c1a5b0e306285a86c814ceff9e80 (diff) | |
| download | nova-3b974d309f5b30b66904784977917117705926e9.tar.gz | |
Merge "Fix docs for IsolatedHostsFilter" into stable/queens
| -rw-r--r-- | doc/source/admin/configuration/schedulers.rst | 1 | ||||
| -rw-r--r-- | doc/source/user/filter-scheduler.rst | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/source/admin/configuration/schedulers.rst b/doc/source/admin/configuration/schedulers.rst index b44cf68fcd..57f15763ea 100644 --- a/doc/source/admin/configuration/schedulers.rst +++ b/doc/source/admin/configuration/schedulers.rst @@ -514,6 +514,7 @@ configuration options. For example: .. code-block:: ini + [filter_scheduler] isolated_hosts = server1, server2 isolated_images = 342b492c-128f-4a42-8d3a-c5088cf27d13, ebd267a6-ca86-4d6c-9a0e-bd132d6b7d09 diff --git a/doc/source/user/filter-scheduler.rst b/doc/source/user/filter-scheduler.rst index 78f7757c33..6bf1c6e710 100644 --- a/doc/source/user/filter-scheduler.rst +++ b/doc/source/user/filter-scheduler.rst @@ -102,7 +102,7 @@ There are many standard filter classes which may be used fall back to the global default ``cpu_allocation_ratio``. If more than one value is found for a host (meaning the host is in two different aggregates with different ratio settings), the minimum value will be used. -* |IsolatedHostsFilter| - filter based on ``image_isolated``, ``host_isolated`` +* |IsolatedHostsFilter| - filter based on ``isolated_images``, ``isolated_hosts`` and ``restrict_isolated_hosts_to_isolated_images`` flags. * |JsonFilter| - allows simple JSON-based grammar for selecting hosts. * |RamFilter| - filters hosts by their RAM. Only hosts with sufficient RAM @@ -236,9 +236,9 @@ enabled and operational. Now we are going to |IsolatedHostsFilter|. There can be some special hosts reserved for specific images. These hosts are called **isolated**. So the images to run on the isolated hosts are also called isolated. The filter -checks if ``image_isolated`` flag named in instance specifications is the same -as the host. Isolated hosts can run non isolated images if the flag -``restrict_isolated_hosts_to_isolated_images`` is set to false. +checks if ``isolated_images`` flag named in instance specifications is the same +as the host specified in ``isolated_hosts``. Isolated hosts can run non-isolated +images if the flag ``restrict_isolated_hosts_to_isolated_images`` is set to false. |DifferentHostFilter| - method ``host_passes`` returns ``True`` if the host to place an instance on is different from all the hosts used by a set of instances. |