From 2920b7decc6769707ea45552c94864701c55988e Mon Sep 17 00:00:00 2001 From: Devananda van der Veen Date: Mon, 4 Mar 2013 11:47:14 -0800 Subject: [PATCH] Stash baremetal deploy image IDs in a namespace. Baremetal PXE driver should read deploy_kernel_id & deploy_ramdisk_id from the 'baremetal:' namespace within instance_type['extra_specs'] so that it doesn't conflict with ComputeCapabilitiesFilter any more. This allows nova-compute to use ComputeCapabilitiesFilter with baremetal again. For this filter to properly match the baremetal ndoe's RAM, we need to tune two other Nova options for physical hardware. Fixes bug 1129485. Change-Id: I0aa1b0fef8ac59a06217577af8c747437d2d6bf5 --- lib/baremetal | 7 ++++--- stack.sh | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/baremetal b/lib/baremetal index 26593867c1..a62cdc35b2 100644 --- a/lib/baremetal +++ b/lib/baremetal @@ -258,9 +258,10 @@ function create_baremetal_flavor() { nova flavor-create $BM_FLAVOR_NAME $BM_FLAVOR_ID \ $BM_FLAVOR_RAM $BM_FLAVOR_ROOT_DISK $BM_FLAVOR_CPU nova flavor-key $BM_FLAVOR_NAME set \ - cpu_arch=$BM_FLAVOR_ARCH \ - deploy_kernel_id=$aki \ - deploy_ramdisk_id=$ari + "cpu_arch"="$BM_FLAVOR_ARCH" \ + "baremetal:deploy_kernel_id"="$aki" \ + "baremetal:deploy_ramdisk_id"="$ari" + } # pull run-time kernel/ramdisk out of disk image and load into glance diff --git a/stack.sh b/stack.sh index d9fbb94547..df2344eb74 100755 --- a/stack.sh +++ b/stack.sh @@ -1078,9 +1078,8 @@ if is_service_enabled nova; then iniset $NOVA_CONF DEFAULT compute_driver nova.virt.baremetal.driver.BareMetalDriver iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER iniset $NOVA_CONF DEFAULT scheduler_host_manager nova.scheduler.baremetal_host_manager.BaremetalHostManager - # NOTE(deva): ComputeCapabilitiesFilter does not currently work with Baremetal. See bug # 1129485 - # As a work around, we disable CCFilter by explicitly enabling all the other default filters. - iniset $NOVA_CONF DEFAULT scheduler_default_filters ComputeFilter,RetryFilter,AvailabilityZoneFilter,ImagePropertiesFilter + iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0 + iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0 iniset $NOVA_CONF baremetal instance_type_extra_specs cpu_arch:$BM_CPU_ARCH iniset $NOVA_CONF baremetal driver $BM_DRIVER iniset $NOVA_CONF baremetal power_manager $BM_POWER_MANAGER