openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "nova: support setting scheduler_host_manager"

This commit is contained in:
Jenkins 2014-09-12 17:09:21 +00:00 committed by Gerrit Code Review
parent 42ffac22e1 9445345257
commit a3a4118bcd
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elements/nova/README.md
View File

@ -32,6 +32,11 @@ nova:
e.g. 'linux-ext4=mkfs -t ext4 -F -L %(fs_label)s %(target)s'
compute_manager: "ironic.nova.compute.manager.ClusterComputeManager"
- set to override the compute manager class used by Nova-Compute.
scheduler_host_manager: "nova.scheduler.ironic_host_manager.IronicHostManager"
- set to override the scheduler host manager used by Nova. If no
scheduler_host_manager is configured it is automatically set to
the deprecated Nova baremetal and/or the old in-tree Ironic
compute driver for Nova.
public_ip:
- public IP address (if any) assigned to this node. Used for VNC proxy
connections so this is typically only required on controller nodes.

13
elements/nova/os-apply-config/etc/nova/nova.conf
View File

@ -158,13 +158,18 @@ ram_allocation_ratio = {{ram_allocation_ratio}}
reserved_host_memory_mb = {{reserved_host_memory_mb}}
{{/nova.tuning}}
{{#nova.baremetal}}
scheduler_host_manager = nova.scheduler.baremetal_host_manager.BaremetalHostManager
{{/nova.baremetal}}
{{#nova.scheduler_host_manager}}
scheduler_host_manager = {{.}}
{{/nova.scheduler_host_manager}}
{{^nova.scheduler_host_manager}}
# scheduler_host_manager isn't explicitly set so we set it accordingly
{{#ironic}}
scheduler_host_manager = ironic.nova.scheduler.ironic_host_manager.IronicHostManager
{{/ironic}}
{{#nova.baremetal}}
scheduler_host_manager = nova.scheduler.baremetal_host_manager.BaremetalHostManager
{{/nova.baremetal}}
{{/nova.scheduler_host_manager}}
# TODO : remove this, we should be able to support the default
# workaround for bug 1293782