diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-12 14:48:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-12 14:48:34 +0000 |
| commit | b6f4796f8649ae656c098a624afbf9fed5261e72 (patch) | |
| tree | 20d7f1b096d4d7db4c542696be51b13b212dfac8 | |
| parent | 365c9f0e169ff6f44cee07b6cdc271780a4bc3c4 (diff) | |
| parent | ac658aa7d0671fb9b5a0a2c504f4b73dff514da9 (diff) | |
| download | nova-b6f4796f8649ae656c098a624afbf9fed5261e72.tar.gz nova-b6f4796f8649ae656c098a624afbf9fed5261e72.tar.xz nova-b6f4796f8649ae656c098a624afbf9fed5261e72.zip | |
Merge "Properly scope isolated hosts config opts"
| -rw-r--r-- | nova/config.py | 6 | ||||
| -rw-r--r-- | nova/scheduler/filters/isolated_hosts_filter.py | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/nova/config.py b/nova/config.py index 1acce772f..ec5ac3ba1 100644 --- a/nova/config.py +++ b/nova/config.py @@ -219,12 +219,6 @@ global_opts = [ cfg.IntOpt('service_down_time', default=60, help='maximum time since last check-in for up service'), - cfg.ListOpt('isolated_images', - default=[], - help='Images to run on isolated host'), - cfg.ListOpt('isolated_hosts', - default=[], - help='Host reserved for specific images'), cfg.BoolOpt('use_cow_images', default=True, help='Whether to use cow images'), diff --git a/nova/scheduler/filters/isolated_hosts_filter.py b/nova/scheduler/filters/isolated_hosts_filter.py index b2b97b3a7..37a8f440d 100644 --- a/nova/scheduler/filters/isolated_hosts_filter.py +++ b/nova/scheduler/filters/isolated_hosts_filter.py @@ -16,9 +16,16 @@ from nova.openstack.common import cfg from nova.scheduler import filters +isolated_opts = [ + cfg.ListOpt('isolated_images', + default=[], + help='Images to run on isolated host'), + cfg.ListOpt('isolated_hosts', + default=[], + help='Host reserved for specific images'), +] CONF = cfg.CONF -CONF.import_opt('isolated_hosts', 'nova.config') -CONF.import_opt('isolated_images', 'nova.config') +CONF.register_opts(isolated_opts) class IsolatedHostsFilter(filters.BaseHostFilter): |