specified sane defaults for class params.

This commit is contained in:
Dan Bode 2011-06-01 15:25:58 -07:00
parent 8eb30aa306
commit e5ec324448
3 changed files with 29 additions and 45 deletions

View File

@ -4,16 +4,17 @@ class nova(
$sql_connection = false, $sql_connection = false,
$network_manager='nova.network.manager.FlatManager', $network_manager='nova.network.manager.FlatManager',
$flat_network_bridge, $flat_network_bridge,
$image_service, $image_service = 'nova.image.local.LocalImageService',
# is flat_network_bridge valid if network_manager is not FlatManager? # is flat_network_bridge valid if network_manager is not FlatManager?
$glance_host, # these glance params should be optional
$glance_port, # default is 9292 $glance_host = 'localhost',
$glance_port = '9292', # default is 9292
$allow_admin_api, $allow_admin_api,
$rabbit_host, $rabbit_host = 'localhost',
$rabbit_password, $rabbit_password='guest',
$rabbit_port, $rabbit_port='5672',
$rabbit_userid, $rabbit_userid='guest',
$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,
$quota_instances = 10, $quota_instances = 10,
@ -29,7 +30,9 @@ class nova(
$state_path = '/var/lib/nova', $state_path = '/var/lib/nova',
$lock_path = '/var/lock/nova', $lock_path = '/var/lock/nova',
$verbose = false, $verbose = false,
$nodaemon = false $nodaemon = false,
$periodic_interval = '60',
$report_interval = '10'
) { ) {
# TODO - why is this required? # TODO - why is this required?

View File

@ -6,17 +6,21 @@
# the various backends for openstack # the various backends for openstack
# #
class nova::rackspace::all( class nova::rackspace::all(
$verbose = 'false', $verbose = 'true',
$sql_connection = false, $db_password,
$db_name = 'nova',
$db_user = 'nova',
$db_host = 'localhost',
$image_service = 'nova.image.glance.GlanceImageService', $image_service = 'nova.image.glance.GlanceImageService',
$network_manager = 'nova.network.manager.FlatManager',
$flat_network_bridge = 'xenbr0', $flat_network_bridge = 'xenbr0',
$glance_host = 'localhost', $glance_host = 'localhost',
$glance_port = '9292', $glance_port = '9292',
$allow_admin_api = 'true', $allow_admin_api = 'true',
$rabbit_host = 'localhost', $rabbit_host = undef,
$rabbit_port = '5672', $rabbit_port = undef,
$rabbit_userid = 'nova', $rabbit_userid = undef,
$rabbit_password, $rabbit_password = undef,
$rabbit_virtual_host='/', $rabbit_virtual_host='/',
$service_down_time='180000000', $service_down_time='180000000',
$quota_instances='1000000', $quota_instances='1000000',
@ -53,13 +57,13 @@ class nova::rackspace::all(
class { 'mysql::server': class { 'mysql::server':
root_password => 'password' root_password => 'password'
} }
class { 'nova::rabbitmq': }
class { 'nova::rackspace::dev':} class { 'nova::rackspace::dev':}
class { "nova": class { "nova":
logdir => $logdir,
verbose => $verbose, verbose => $verbose,
sql_connection => $sql_connection, sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
network_manager => $network_manager, network_manager => $network_manager,
image_service => $image_service, image_service => $image_service,
flat_network_bridge => $flat_network_bridge, flat_network_bridge => $flat_network_bridge,
@ -71,8 +75,6 @@ class nova::rackspace::all(
rabbit_port => $rabbit_port, rabbit_port => $rabbit_port,
rabbit_userid => $rabbit_userid, rabbit_userid => $rabbit_userid,
rabbit_virtual_host => $rabbit_virtual_host, rabbit_virtual_host => $rabbit_virtual_host,
state_path => $state_path,
lock_path => $lock_path,
service_down_time => $service_down_time, service_down_time => $service_down_time,
quota_instances => $quota_instances, quota_instances => $quota_instances,
quota_cores => $quota_cores, quota_cores => $quota_cores,
@ -99,9 +101,9 @@ class nova::rackspace::all(
class { "nova::scheduler": enabled => false } class { "nova::scheduler": enabled => false }
class { 'nova::db': class { 'nova::db':
# pass in db config as params # pass in db config as params
password => 'password', password => $db_password,
name => 'nova', name => $db_name,
user => 'nova', user => $db_user,
host => 'localhost', host => $db_host,
} }
} }

View File

@ -4,35 +4,14 @@ resources { 'nova_config':
} }
class { 'nova::rackspace::all': class { 'nova::rackspace::all':
verbose => 'true',
logdir => '/var/log/nova',
sql_connection => 'mysql://root:<password>@127.0.0.1/nova',
network_manager => 'nova.network.manager.FlatManager',
image_service => 'nova.image.glance.GlanceImageService', image_service => 'nova.image.glance.GlanceImageService',
flat_network_bridge => 'xenbr0',
glance_host => 'glance_ip_address', glance_host => 'glance_ip_address',
glance_port => '9292', glance_port => '9292',
allow_admin_api => 'true', allow_admin_api => 'true',
rabbit_host => 'rabbit_ip_address',
rabbit_password => 'rabbitpassword',
rabbit_port => '5672',
rabbit_userid => 'rabbit_user',
rabbit_virtual_host => '/',
state_path => 'var/lib/nova',
lock_path => 'var/lock/nova',
service_down_time => '180000000',
quota_instances => '1000000',
quota_cores => '1000000',
quota_volumes => '1000000',
quota_gigabytes => '1000000',
quota_floating_ips => '1000000',
quota_metadata_items => '1000000',
quota_max_injected_files => '1000000',
quota_max_injected_file_content_bytes => '1000000',
quota_max_injected_file_path_bytes => '1000000',
host => $ipaddress, host => $ipaddress,
xenapi_connection_url => 'https://<XenServer_IP>', xenapi_connection_url => 'https://<XenServer_IP>',
xenapi_connection_username => 'root', xenapi_connection_username => 'root',
xenapi_connection_password => 'password', xenapi_connection_password => 'password',
xenapi_inject_image => 'false', xenapi_inject_image => 'false',
db_password => 'password',
} }