From 1bb9ef63c535b274a4b8c905f54335bbb1d779c3 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Mon, 31 Mar 2014 11:41:54 -0700 Subject: [PATCH] Update compute driver name for Ironic Commit 08448e3a mistakenly updated the location of the Ironic compute driver to be loaded from within the Nova tree. However, no such module exists as the compute and scheduler drivers both live in the Ironic tree. This reverts that and adds a note explaining the setting. Change-Id: I7f32f77bd7e5fd1f6b41014ac71bbf6e1a7d84cf --- lib/nova_plugins/hypervisor-ironic | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/nova_plugins/hypervisor-ironic b/lib/nova_plugins/hypervisor-ironic index 9bd4217820..e72f7c1dc0 100644 --- a/lib/nova_plugins/hypervisor-ironic +++ b/lib/nova_plugins/hypervisor-ironic @@ -35,10 +35,12 @@ function cleanup_nova_hypervisor { # configure_nova_hypervisor - Set config files, create data dirs, etc function configure_nova_hypervisor { configure_libvirt - iniset $NOVA_CONF ironic sql_connection `database_connection_url nova_bm` LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.firewall.NoopFirewallDriver"} - iniset $NOVA_CONF DEFAULT compute_driver nova.virt.ironic.IronicDriver + # NOTE(adam_g): The ironic compute driver currently lives in the ironic + # tree. We purposely configure Nova to load it from there until it moves + # back into Nova proper. + iniset $NOVA_CONF DEFAULT compute_driver ironic.nova.virt.ironic.IronicDriver iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER iniset $NOVA_CONF DEFAULT scheduler_host_manager ironic.nova.scheduler.ironic_host_manager.IronicHostManager iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0 @@ -49,6 +51,7 @@ function configure_nova_hypervisor { iniset $NOVA_CONF ironic admin_url $KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v2.0 iniset $NOVA_CONF ironic admin_tenant_name demo iniset $NOVA_CONF ironic api_endpoint http://$SERVICE_HOST:6385/v1 + iniset $NOVA_CONF ironic sql_connection `database_connection_url nova_bm` } # install_nova_hypervisor() - Install external components