openstack/devstack
Code Issues Proposed changes

Merge "Stash baremetal deploy image IDs in a namespace."

Browse Source
This commit is contained in:
Jenkins 2013-03-06 19:09:13 +00:00 committed by Gerrit Code Review
commit 35a90d7fc0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/baremetal
View File

@ -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

5
stack.sh
View File

@ -1076,9 +1076,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