diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-10-13 14:57:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-10-13 14:57:21 +0000 |
| commit | 4df3607c80f46ee04ec2a63b1d5ac06be1bb1c7c (patch) | |
| tree | 75b27df8a0cdd838605f0af33df0a3c6c500b644 /ceilometer/compute | |
| parent | bca9d45ea439220305539f85a653cb31e501be25 (diff) | |
| parent | 60f11cb7af5aba061429f4cb86a7ca4a175aadb2 (diff) | |
| download | ceilometer-4df3607c80f46ee04ec2a63b1d5ac06be1bb1c7c.tar.gz | |
Merge "Remove deprecated compute.workload_partitioning"
Diffstat (limited to 'ceilometer/compute')
| -rw-r--r-- | ceilometer/compute/discovery.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/ceilometer/compute/discovery.py b/ceilometer/compute/discovery.py index 48e812fa..3210b1e0 100644 --- a/ceilometer/compute/discovery.py +++ b/ceilometer/compute/discovery.py @@ -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 |