openstack/devstack
Code Issues Proposed changes

Merge "Avoid VM configuration with Ironic hardware mode."

Browse Source
This commit is contained in:
Jenkins 2015-01-21 08:12:25 +00:00 committed by Gerrit Code Review
commit b3e38cf295
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