From 88200b5f7592336fbb3d9d6213a7175a92643f0d Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 20 Mar 2017 11:03:18 -0400
Subject: [PATCH] Remove nova compute manager option

The option was removed in Nova:
https://github.com/openstack/nova/commit/d9a7c16c305cd7016195cada883867411d3a5eb9

The option had no effect and we don't need it anymore, therefore we're
removing it everywhere.

Change-Id: I079e239aa7ea8a1e849cd95f4297878e1b70f87b
Related-Bug: #1674375
---
 docs/packstack.rst                              |  3 ---
 packstack/plugins/nova_300.py                   | 17 -----------------
 .../modules/packstack/manifests/nova/compute.pp |  1 -
 .../nova-cpu-manager-8440f026c4a0165e.yaml      |  4 ++++
 4 files changed, 4 insertions(+), 21 deletions(-)
 create mode 100644 releasenotes/notes/nova-cpu-manager-8440f026c4a0165e.yaml

diff --git a/docs/packstack.rst b/docs/packstack.rst
index 020b9ddd0..7b479b735 100755
--- a/docs/packstack.rst
+++ b/docs/packstack.rst
@@ -757,9 +757,6 @@ Nova Options
 **CONFIG_NOVA_COMPUTE_MIGRATE_PROTOCOL**
     Protocol used for instance migration. Valid options are: tcp and ssh. Note that by default, the Compute user is created with the /sbin/nologin shell so that the SSH protocol will not work. To make the SSH protocol work, you must configure the Compute user on compute hosts manually. ['tcp', 'ssh']
 
-**CONFIG_NOVA_COMPUTE_MANAGER**
-    Manager that runs the Compute service.
-
 **CONFIG_NOVA_PCI_ALIAS**
     Enter the PCI passthrough array of hash in JSON style for controller eg.
     [{"vendor_id":"1234", "product_id":"5678", "name":"default"}, {...}]
diff --git a/packstack/plugins/nova_300.py b/packstack/plugins/nova_300.py
index 2413203f8..34c2dde71 100644
--- a/packstack/plugins/nova_300.py
+++ b/packstack/plugins/nova_300.py
@@ -142,19 +142,6 @@ def initConfig(controller):
              "NEED_CONFIRM": False,
              "CONDITION": False},
 
-            {"CMD_OPTION": "nova-compute-manager",
-             "PROMPT": ("Enter the compute manager for nova "
-                        "migration"),
-             "OPTION_LIST": [],
-             "VALIDATORS": [validators.validate_not_empty],
-             "DEFAULT_VALUE": "nova.compute.manager.ComputeManager",
-             "MASK_INPUT": False,
-             "LOOSE_VALIDATION": True,
-             "CONF_NAME": "CONFIG_NOVA_COMPUTE_MANAGER",
-             "USE_DEFAULT": False,
-             "NEED_CONFIRM": False,
-             "CONDITION": False},
-
             {"CMD_OPTION": "nova-ssl-cert",
              "PROMPT": ("Enter the path to a PEM encoded certificate to be used "
                         "on the https server, leave blank if one should be "
@@ -397,10 +384,6 @@ def create_compute_manifest(config, messages):
         config['CONFIG_VCENTER_CLUSTERS'] = vmware_clusters
 
     for host in compute_hosts:
-        if config['CONFIG_IRONIC_INSTALL'] == 'y':
-            cm = 'ironic.nova.compute.manager.ClusteredComputeManager'
-            config['CONFIG_NOVA_COMPUTE_MANAGER'] = cm
-
         fw_details = dict()
         cf_fw_qemu_mig_key = "FIREWALL_NOVA_QEMU_MIG_RULES_%s" % host
         for c_host in compute_hosts:
diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute.pp b/packstack/puppet/modules/packstack/manifests/nova/compute.pp
index 8d7ef7e25..e3d4e7346 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/compute.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/compute.pp
@@ -53,7 +53,6 @@ class packstack::nova::compute ()
       vncproxy_host                 => hiera('CONFIG_KEYSTONE_HOST_URL'),
       vncproxy_protocol             => hiera('CONFIG_VNCPROXY_PROTOCOL'),
       vncserver_proxyclient_address => $vncproxy_server,
-      compute_manager               => hiera('CONFIG_NOVA_COMPUTE_MANAGER'),
       pci_passthrough               => hiera('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST'),
       instance_usage_audit          => $instance_usage_audit,
       instance_usage_audit_period   => $instance_usage_audit_period,
diff --git a/releasenotes/notes/nova-cpu-manager-8440f026c4a0165e.yaml b/releasenotes/notes/nova-cpu-manager-8440f026c4a0165e.yaml
new file mode 100644
index 000000000..bf68a77d1
--- /dev/null
+++ b/releasenotes/notes/nova-cpu-manager-8440f026c4a0165e.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - Remove nova compute manager option, removed in Nova
+    and puppet-nova.