fix minor compute issues

This commit resolves a few minor issues uncovered
when fixing the spec tests.
This commit is contained in:
Dan Bode
2012-10-28 21:23:22 -07:00
parent c8a15dfc74
commit 8da819bcf2

View File

@@ -103,7 +103,12 @@ class openstack::compute (
# if the compute node should be configured as a multi-host # if the compute node should be configured as a multi-host
# compute installation # compute installation
if $quantum == false { if ! $quantum {
if ! $fixed_range {
fail("Must specify the fixed range when using nova-networks")
}
if $multi_host { if $multi_host {
include keystone::python include keystone::python
nova_config { nova_config {
@@ -157,7 +162,10 @@ class openstack::compute (
volume_group => $nova_volume, volume_group => $nova_volume,
} }
# set in nova::api
if ! defined(Nova_config['volume_api_class']) {
nova_config { 'volume_api_class': value => 'nova.volume.cinder.API' } nova_config { 'volume_api_class': value => 'nova.volume.cinder.API' }
}
} else { } else {
# Set up nova-volume # Set up nova-volume
} }