x/packstack
Code Issues Proposed changes

Remove nova compute manager option

Browse Source 
The option was removed in Nova:
d9a7c16c30

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

Change-Id: I079e239aa7ea8a1e849cd95f4297878e1b70f87b
Related-Bug: #1674375
This commit is contained in:
Emilien Macchi 2017-03-20 11:03:18 -04:00 committed by Javier Peña
parent 5dee1c4879
commit 88200b5f75
4 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/packstack.rst
View File

@ -757,9 +757,6 @@ Nova Options
**CONFIG_NOVA_COMPUTE_MIGRATE_PROTOCOL** **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'] 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** **CONFIG_NOVA_PCI_ALIAS**
Enter the PCI passthrough array of hash in JSON style for controller eg. Enter the PCI passthrough array of hash in JSON style for controller eg.
[{"vendor_id":"1234", "product_id":"5678", "name":"default"}, {...}] [{"vendor_id":"1234", "product_id":"5678", "name":"default"}, {...}]

17
packstack/plugins/nova_300.py
View File

@ -142,19 +142,6 @@ def initConfig(controller):
"NEED_CONFIRM": False, "NEED_CONFIRM": False,
"CONDITION": 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", {"CMD_OPTION": "nova-ssl-cert",
"PROMPT": ("Enter the path to a PEM encoded certificate to be used " "PROMPT": ("Enter the path to a PEM encoded certificate to be used "
"on the https server, leave blank if one should be " "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 config['CONFIG_VCENTER_CLUSTERS'] = vmware_clusters
for host in compute_hosts: 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() fw_details = dict()
cf_fw_qemu_mig_key = "FIREWALL_NOVA_QEMU_MIG_RULES_%s" % host cf_fw_qemu_mig_key = "FIREWALL_NOVA_QEMU_MIG_RULES_%s" % host
for c_host in compute_hosts: for c_host in compute_hosts:

1
packstack/puppet/modules/packstack/manifests/nova/compute.pp
View File

@ -53,7 +53,6 @@ class packstack::nova::compute ()
vncproxy_host => hiera('CONFIG_KEYSTONE_HOST_URL'), vncproxy_host => hiera('CONFIG_KEYSTONE_HOST_URL'),
vncproxy_protocol => hiera('CONFIG_VNCPROXY_PROTOCOL'), vncproxy_protocol => hiera('CONFIG_VNCPROXY_PROTOCOL'),
vncserver_proxyclient_address => $vncproxy_server, vncserver_proxyclient_address => $vncproxy_server,
compute_manager => hiera('CONFIG_NOVA_COMPUTE_MANAGER'),
pci_passthrough => hiera('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST'), pci_passthrough => hiera('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST'),
instance_usage_audit => $instance_usage_audit, instance_usage_audit => $instance_usage_audit,
instance_usage_audit_period => $instance_usage_audit_period, instance_usage_audit_period => $instance_usage_audit_period,

4
releasenotes/notes/nova-cpu-manager-8440f026c4a0165e.yaml Normal file
View File

@ -0,0 +1,4 @@
---
other:
- Remove nova compute manager option, removed in Nova
and puppet-nova.