fixed a few small errors.
This commit is contained in:
parent
43617b82bd
commit
941866eb08
2
mysql
2
mysql
|
@ -1 +1 @@
|
||||||
Subproject commit fa7f0ebf17228b594553cc9215e4ba4bebbc3c1a
|
Subproject commit bf334ccb4ecd2136ba180e9365eb71e5532cdd13
|
|
@ -8,7 +8,7 @@ class nova::compute::xenserver(
|
||||||
$enabled=true
|
$enabled=true
|
||||||
) {
|
) {
|
||||||
|
|
||||||
class { 'nova':
|
class { 'nova::compute':
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
}
|
}
|
||||||
nova_config {
|
nova_config {
|
||||||
|
|
|
@ -3,9 +3,9 @@ class nova(
|
||||||
$nova_cluster_id='localcluster',
|
$nova_cluster_id='localcluster',
|
||||||
$sql_connection = false,
|
$sql_connection = false,
|
||||||
$network_manager='nova.network.manager.FlatManager',
|
$network_manager='nova.network.manager.FlatManager',
|
||||||
|
$flat_network_bridge,
|
||||||
$image_service,
|
$image_service,
|
||||||
# is flat_network_bridge valid if network_manager is not FlatManager?
|
# is flat_network_bridge valid if network_manager is not FlatManager?
|
||||||
$flat_network_bridge,
|
|
||||||
$glance_host,
|
$glance_host,
|
||||||
$glance_port, # default is 9292
|
$glance_port, # default is 9292
|
||||||
$allow_admin_api,
|
$allow_admin_api,
|
||||||
|
@ -16,7 +16,6 @@ class nova(
|
||||||
$rabbit_virtual_host,
|
$rabbit_virtual_host,
|
||||||
# Following may need to be broken out to different nova services
|
# Following may need to be broken out to different nova services
|
||||||
$service_down_time,
|
$service_down_time,
|
||||||
# TODO - do we really want to enforce the defaults here?
|
|
||||||
$quota_instances = 10,
|
$quota_instances = 10,
|
||||||
$quota_cores = 20,
|
$quota_cores = 20,
|
||||||
$quota_volumes = 10,
|
$quota_volumes = 10,
|
||||||
|
|
|
@ -92,8 +92,7 @@ class nova::rackspace::all(
|
||||||
}
|
}
|
||||||
|
|
||||||
class { "nova::api": enabled => false }
|
class { "nova::api": enabled => false }
|
||||||
class { "nova::compute":
|
class { "nova::compute::xenserver":
|
||||||
compute_type => $compute_type,
|
|
||||||
host => $host,
|
host => $host,
|
||||||
xenapi_connection_url => $xenapi_connection_url,
|
xenapi_connection_url => $xenapi_connection_url,
|
||||||
xenapi_connection_username => $xenapi_connection_username,
|
xenapi_connection_username => $xenapi_connection_username,
|
||||||
|
|
|
@ -7,7 +7,6 @@ class nova::rackspace::dev() {
|
||||||
'bzr',
|
'bzr',
|
||||||
'git',
|
'git',
|
||||||
'gcc',
|
'gcc',
|
||||||
'gcc::swig',
|
|
||||||
# I may need to move python-mysqldb to elsewhere if it depends on mysql
|
# I may need to move python-mysqldb to elsewhere if it depends on mysql
|
||||||
# python-nova pulls in all of the deps mentioned here
|
# python-nova pulls in all of the deps mentioned here
|
||||||
'python',
|
'python',
|
||||||
|
|
Loading…
Reference in New Issue