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