shorten names of keystone db class params

removed the extra keystone_ prefix.
This commit is contained in:
Dan Bode
2012-10-09 22:33:57 -07:00
parent fd305d2bb7
commit 1a62606836
2 changed files with 22 additions and 22 deletions

View File

@@ -159,11 +159,11 @@ class openstack::controller (
verbose => $verbose,
db_type => $db_type,
db_host => $db_host,
keystone_db_password => $keystone_db_password,
keystone_db_dbname => $keystone_db_dbname,
keystone_db_user => $keystone_db_user,
keystone_admin_token => $keystone_admin_token,
keystone_admin_tenant => $keystone_admin_tenant,
db_password => $keystone_db_password,
db_name => $keystone_db_dbname,
db_user => $keystone_db_user,
admin_token => $keystone_admin_token,
admin_tenant => $keystone_admin_tenant,
admin_email => $admin_email,
admin_password => $admin_password,
public_address => $public_address,

View File

@@ -39,16 +39,13 @@
class openstack::keystone (
$db_host,
$keystone_db_password,
$keystone_admin_token,
$db_password,
$admin_token,
$admin_email,
$admin_password,
$glance_user_password,
$nova_user_password,
$public_address,
$db_type = 'mysql',
$keystone_db_user = 'keystone',
$keystone_db_dbname = 'keystone',
$keystone_admin_tenant = 'admin',
$verbose = 'False',
$bind_host = '0.0.0.0',
@@ -57,6 +54,9 @@ class openstack::keystone (
$glance = true,
$nova = true,
$enabled = true,
$db_type = 'mysql',
$db_user = 'keystone',
$db_name = 'keystone',
) {
# Install and configure Keystone