Browse code
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
Devananda van der Veen authored on 2014/09/09 02:41:04Showing 1 changed files
| ... | ... |
@@ -37,12 +37,9 @@ function configure_nova_hypervisor {
|
| 37 | 37 |
configure_libvirt |
| 38 | 38 |
LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.firewall.NoopFirewallDriver"}
|
| 39 | 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 |
|
| 40 |
+ iniset $NOVA_CONF DEFAULT compute_driver nova.virt.ironic.IronicDriver |
|
| 44 | 41 |
iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER |
| 45 |
- iniset $NOVA_CONF DEFAULT scheduler_host_manager ironic.nova.scheduler.ironic_host_manager.IronicHostManager |
|
| 42 |
+ iniset $NOVA_CONF DEFAULT scheduler_host_manager nova.scheduler.ironic_host_manager.IronicHostManager |
|
| 46 | 43 |
iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0 |
| 47 | 44 |
iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0 |
| 48 | 45 |
# ironic section |
| ... | ... |
@@ -51,7 +48,6 @@ function configure_nova_hypervisor {
|
| 51 | 51 |
iniset $NOVA_CONF ironic admin_url $KEYSTONE_AUTH_URI/v2.0 |
| 52 | 52 |
iniset $NOVA_CONF ironic admin_tenant_name demo |
| 53 | 53 |
iniset $NOVA_CONF ironic api_endpoint http://$SERVICE_HOST:6385/v1 |
| 54 |
- iniset $NOVA_CONF ironic sql_connection `database_connection_url nova_bm` |
|
| 55 | 54 |
} |
| 56 | 55 |
|
| 57 | 56 |
# install_nova_hypervisor() - Install external components |