From 60f11cb7af5aba061429f4cb86a7ca4a175aadb2 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Mon, 25 Sep 2017 17:01:09 +0100
Subject: [PATCH] Remove deprecated compute.workload_partitioning

Change-Id: I9ba50ac8513afa4370f76921af05fbf5b86bd4a9
---
 ceilometer/compute/discovery.py                        | 10 ----------
 ...-workload-partitioning-option-26538bc1e80500e3.yaml |  5 +++++
 2 files changed, 5 insertions(+), 10 deletions(-)
 create mode 100644 releasenotes/notes/remove-compute-workload-partitioning-option-26538bc1e80500e3.yaml

diff --git a/ceilometer/compute/discovery.py b/ceilometer/compute/discovery.py
index 48e812fa11..3210b1e0c4 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
diff --git a/releasenotes/notes/remove-compute-workload-partitioning-option-26538bc1e80500e3.yaml b/releasenotes/notes/remove-compute-workload-partitioning-option-26538bc1e80500e3.yaml
new file mode 100644
index 0000000000..4310181ca5
--- /dev/null
+++ b/releasenotes/notes/remove-compute-workload-partitioning-option-26538bc1e80500e3.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The deprecated `compute.workload_partitioning` option has been removed in
+    favor of `compute.instance_discovery_method`.