openstack
/
ceilometer
Code Issues Proposed changes

Merge "Remove deprecated compute.workload_partitioning"

This commit is contained in:
Jenkins 2017-10-13 14:57:21 +00:00 committed by Gerrit Code Review
parent bca9d45ea4 60f11cb7af
commit 4df3607c80
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ceilometer/compute/discovery.py
View File

@ -35,12 +35,6 @@ from ceilometer.compute.virt.libvirt import utils as libvirt_utils
from ceilometer import nova_client
OPTS = [
cfg.BoolOpt('workload_partitioning',
default=False,
deprecated_for_removal=True,
help='Enable work-load partitioning, allowing multiple '
'compute agents to be run simultaneously. '
'(replaced by instance_discovery_method)'),
cfg.StrOpt('instance_discovery_method',
default='libvirt_metadata',
choices=['naive', 'workload_partitioning', 'libvirt_metadata'],
@ -102,10 +96,6 @@ class InstanceDiscovery(plugin_base.DiscoveryBase):
if not self.method:
self.method = conf.compute.instance_discovery_method
# For backward compatibility
if self.method == "naive" and conf.compute.workload_partitioning:
self.method = "workload_partitioning"
self.nova_cli = nova_client.Client(conf)
self.expiration_time = conf.compute.resource_update_interval
self.cache_expiry = conf.compute.resource_cache_expiry

5
releasenotes/notes/remove-compute-workload-partitioning-option-26538bc1e80500e3.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The deprecated `compute.workload_partitioning` option has been removed in
favor of `compute.instance_discovery_method`.