Remove nova compute manager option
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:
parent
5dee1c4879
commit
88200b5f75
@ -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"}, {...}]
|
||||
|
@ -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:
|
||||
|
@ -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,
|
||||
|
@ -0,0 +1,4 @@
|
||||
---
|
||||
other:
|
||||
- Remove nova compute manager option, removed in Nova
|
||||
and puppet-nova.
|
Loading…
x
Reference in New Issue
Block a user