Browse code
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
Adam Gandelman authored on 2014/04/01 03:41:54Showing 1 changed files
| ... | ... |
@@ -35,10 +35,12 @@ function cleanup_nova_hypervisor {
|
| 35 | 35 |
# configure_nova_hypervisor - Set config files, create data dirs, etc |
| 36 | 36 |
function configure_nova_hypervisor {
|
| 37 | 37 |
configure_libvirt |
| 38 |
- iniset $NOVA_CONF ironic sql_connection `database_connection_url nova_bm` |
|
| 39 | 38 |
LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.firewall.NoopFirewallDriver"}
|
| 40 |
- iniset $NOVA_CONF DEFAULT compute_driver nova.virt.ironic.IronicDriver |
|
| 41 | 39 |
|
| 40 |
+ # NOTE(adam_g): The ironic compute driver currently lives in the ironic |
|
| 41 |
+ # tree. We purposely configure Nova to load it from there until it moves |
|
| 42 |
+ # back into Nova proper. |
|
| 43 |
+ iniset $NOVA_CONF DEFAULT compute_driver ironic.nova.virt.ironic.IronicDriver |
|
| 42 | 44 |
iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER |
| 43 | 45 |
iniset $NOVA_CONF DEFAULT scheduler_host_manager ironic.nova.scheduler.ironic_host_manager.IronicHostManager |
| 44 | 46 |
iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0 |
| ... | ... |
@@ -49,6 +51,7 @@ function configure_nova_hypervisor {
|
| 49 | 49 |
iniset $NOVA_CONF ironic admin_url $KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v2.0 |
| 50 | 50 |
iniset $NOVA_CONF ironic admin_tenant_name demo |
| 51 | 51 |
iniset $NOVA_CONF ironic api_endpoint http://$SERVICE_HOST:6385/v1 |
| 52 |
+ iniset $NOVA_CONF ironic sql_connection `database_connection_url nova_bm` |
|
| 52 | 53 |
} |
| 53 | 54 |
|
| 54 | 55 |
# install_nova_hypervisor() - Install external components |