From d0023fd7dd14c943ff4146c7ef246a8ff896043a Mon Sep 17 00:00:00 2001 From: Devananda van der Veen Date: Mon, 8 Sep 2014 10:41:04 -0700 Subject: [PATCH] Switch config to use Ironic driver from Nova's tree Change the Nova config to use the IronicDriver from the Nova tree, so that the copy of this driver in Ironic's tree may be deleted. Also removes the unneeded [ironic] "sql_connection" config parameter which was cruft copied from the nova_bm configuration in commit 06fb29c66124b6c753fdd262eb262043b4551298 Change-Id: I35473b54d760bfa7395decbe6b086f64db60ab10 --- lib/nova_plugins/hypervisor-ironic | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/nova_plugins/hypervisor-ironic b/lib/nova_plugins/hypervisor-ironic index 344ef04681..4004cc935a 100644 --- a/lib/nova_plugins/hypervisor-ironic +++ b/lib/nova_plugins/hypervisor-ironic @@ -37,12 +37,9 @@ function configure_nova_hypervisor { configure_libvirt LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.firewall.NoopFirewallDriver"} - # 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 compute_driver 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 scheduler_host_manager nova.scheduler.ironic_host_manager.IronicHostManager iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0 iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0 # ironic section @@ -51,7 +48,6 @@ function configure_nova_hypervisor { iniset $NOVA_CONF ironic admin_url $KEYSTONE_AUTH_URI/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