openstack/devstack
Code Issues Proposed changes

Avoid VM configuration with Ironic hardware mode.

Browse Source 
If "IRONIC_HARDWARE" is True, VMs are not required when using Ironic.

Change-Id: I33ba294f1e2ea583cd4c24c392637a4ee60a39ab
This commit is contained in:
Zhongyue Luo 2014-12-16 10:56:54 +08:00
parent 0f4942c784
commit 37026f5366
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nova_plugins/hypervisor-ironic
View File

@ -56,6 +56,8 @@ function configure_nova_hypervisor {
function install_nova_hypervisor { function install_nova_hypervisor {
if ! is_service_enabled neutron; then if ! is_service_enabled neutron; then
die $LINENO "Neutron should be enabled for usage of the Ironic Nova driver." die $LINENO "Neutron should be enabled for usage of the Ironic Nova driver."
elif is_ironic_hardware; then
return
fi fi
install_libvirt install_libvirt
if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] && is_ubuntu; then if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] && is_ubuntu; then