Refactor parameter defaults

Add more parameter defaults to support backwards
compatibility.
This commit is contained in:
Dan Bode
2012-08-19 00:47:58 -07:00
parent f6085946b9
commit 45eccb2a18

View File

@@ -25,26 +25,25 @@
class openstack::controller ( class openstack::controller (
# Required Network # Required Network
$public_address, $public_address,
$public_interface,
$private_interface,
# Required Database # Required Database
$mysql_root_password, $mysql_root_password = 'sql_pass',
# Required Keystone # Required Keystone
$admin_email, $admin_email = 'some_user@some_fake_email_address.foo',
$admin_password, $admin_password = 'ChangeMe',
$keystone_db_password, $keystone_db_password = 'keystone_pass',
$keystone_admin_token, $keystone_admin_token = 'keystone_admin_token',
# Required Glance # Required Glance
$glance_db_password, $glance_db_password = 'glance_pass',
$glance_user_password, $glance_user_password = 'glance_pass',
# Required Nova # Required Nova
$nova_db_password, $nova_db_password = 'nova_pass',
$nova_user_password, $nova_user_password = 'nova_pass',
# Required Horizon # Required Horizon
$secret_key, $secret_key = 'dummy_secret_key',
# Network
$public_interface = 'eth0',
$private_interface = 'eth1',
$internal_address = $public_address, $internal_address = $public_address,
$admin_address = $public_address, $admin_address = $internal_address,
$network_manager = 'nova.network.manager.FlatDHCPManager', $network_manager = 'nova.network.manager.FlatDHCPManager',
$fixed_range = '10.0.0.0/24', $fixed_range = '10.0.0.0/24',
$floating_range = false, $floating_range = false,
@@ -58,7 +57,7 @@ class openstack::controller (
$db_type = 'mysql', $db_type = 'mysql',
$mysql_account_security = true, $mysql_account_security = true,
$mysql_bind_address = '0.0.0.0', $mysql_bind_address = '0.0.0.0',
$allowed_hosts = ['127.0.0.%'], $allowed_hosts = '%',
# Keystone # Keystone
$keystone_db_user = 'keystone', $keystone_db_user = 'keystone',
$keystone_db_dbname = 'keystone', $keystone_db_dbname = 'keystone',
@@ -72,7 +71,7 @@ class openstack::controller (
$nova_db_dbname = 'nova', $nova_db_dbname = 'nova',
$purge_nova_config = true, $purge_nova_config = true,
# Rabbit # Rabbit
$rabbit_password, $rabbit_password = 'rabbit_pw',
$rabbit_user = 'nova', $rabbit_user = 'nova',
# Horizon # Horizon
$cache_server_ip = '127.0.0.1', $cache_server_ip = '127.0.0.1',
@@ -135,6 +134,7 @@ class openstack::controller (
enabled => $enabled, enabled => $enabled,
} }
######## BEGIN GLANCE ########## ######## BEGIN GLANCE ##########
class { 'openstack::glance': class { 'openstack::glance':
verbose => $verbose, verbose => $verbose,