summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-08-05 10:29:20 +0000
committerBaserock Gerrit <gerrit@baserock.org>2015-08-19 03:32:37 +0000
commit79803b299f71e5f92ad26c6c6c6eb16da8bbcc42 (patch)
treeefd85a14abd3eccd699011eb470bb4aaa17cb581
parentf1933ce91007adc01578383366270c0e5f12913e (diff)
downloaddefinitions-79803b299f71e5f92ad26c6c6c6eb16da8bbcc42.tar.gz
openstack: use baremetal filters
Use baremetal filters when we are scheduling baremetal, as suggested on the Ironic install guide [1]. [1]: http://docs.openstack.org/developer/ironic/deploy/install-guide.html Change-Id: Ic6a82812748a98397b705e2428b06f77841d7437
-rw-r--r--extensions/openstack-nova.configure3
-rw-r--r--install-files/openstack/usr/share/openstack/nova/nova.conf2
2 files changed, 4 insertions, 1 deletions
diff --git a/extensions/openstack-nova.configure b/extensions/openstack-nova.configure
index 9e77305d..241d94c2 100644
--- a/extensions/openstack-nova.configure
+++ b/extensions/openstack-nova.configure
@@ -115,6 +115,7 @@ case "$NOVA_BAREMETAL_SCHEDULING" in
export SCHEDULER_HOST_MANAGER=nova.scheduler.ironic_host_manager.IronicHostManager
export RAM_ALLOCATION_RATIO=1.0
export COMPUTE_DRIVER=nova.virt.ironic.IronicDriver
+ export SCHEDULER_USE_BAREMETAL_FILTERS=true
;;
*)
export COMPUTE_MANAGER=nova.compute.manager.ComputeManager
@@ -122,6 +123,7 @@ case "$NOVA_BAREMETAL_SCHEDULING" in
export SCHEDULER_HOST_MANAGER=nova.scheduler.host_manager.HostManager
export RAM_ALLOCATION_RATIO=1.5
export COMPUTE_DRIVER=libvirt.LibvirtDriver
+ export SCHEDULER_USE_BAREMETAL_FILTERS=false
;;
esac
@@ -141,6 +143,7 @@ nova_configuration={
'RESERVED_HOST_MEMORY_MB': os.environ['RESERVED_HOST_MEMORY_MB'],
'SCHEDULER_HOST_MANAGER': os.environ['SCHEDULER_HOST_MANAGER'],
'RAM_ALLOCATION_RATIO': os.environ['RAM_ALLOCATION_RATIO'],
+ 'SCHEDULER_USE_BAREMETAL_FILTERS': os.environ['SCHEDULER_USE_BAREMETAL_FILTERS'],
'COMPUTE_DRIVER': os.environ['COMPUTE_DRIVER'],
'NEUTRON_SERVICE_USER': os.environ['NEUTRON_SERVICE_USER'],
'NEUTRON_SERVICE_PASSWORD': os.environ['NEUTRON_SERVICE_PASSWORD'],
diff --git a/install-files/openstack/usr/share/openstack/nova/nova.conf b/install-files/openstack/usr/share/openstack/nova/nova.conf
index 9fc10493..f2db93fc 100644
--- a/install-files/openstack/usr/share/openstack/nova/nova.conf
+++ b/install-files/openstack/usr/share/openstack/nova/nova.conf
@@ -1602,7 +1602,7 @@ scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFi
# Flag to decide whether to use
# baremetal_scheduler_default_filters or not. (boolean value)
-#scheduler_use_baremetal_filters=false
+scheduler_use_baremetal_filters={{ SCHEDULER_USE_BAREMETAL_FILTERS }}
#