stackforge/puppet-openstack
Code Issues Proposed changes

shorten names of keystone db class params

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

32
manifests/controller.pp
View File

@@ -156,22 +156,22 @@ class openstack::controller (
####### KEYSTONE ########### ####### KEYSTONE ###########
class { 'openstack::keystone': class { 'openstack::keystone':
verbose => $verbose, verbose => $verbose,
db_type => $db_type, db_type => $db_type,
db_host => $db_host, db_host => $db_host,
keystone_db_password => $keystone_db_password, db_password => $keystone_db_password,
keystone_db_dbname => $keystone_db_dbname, db_name => $keystone_db_dbname,
keystone_db_user => $keystone_db_user, db_user => $keystone_db_user,
keystone_admin_token => $keystone_admin_token, admin_token => $keystone_admin_token,
keystone_admin_tenant => $keystone_admin_tenant, admin_tenant => $keystone_admin_tenant,
admin_email => $admin_email, admin_email => $admin_email,
admin_password => $admin_password, admin_password => $admin_password,
public_address => $public_address, public_address => $public_address,
internal_address => $internal_address, internal_address => $internal_address,
admin_address => $admin_address, admin_address => $admin_address,
glance_user_password => $glance_user_password, glance_user_password => $glance_user_password,
nova_user_password => $nova_user_password, nova_user_password => $nova_user_password,
enabled => $enabled, enabled => $enabled,
} }

12
manifests/keystone.pp
View File

@@ -9,7 +9,7 @@
# [keystone_db_password] Password for keystone DB. Required. # [keystone_db_password] Password for keystone DB. Required.
# [keystone_admin_token]. Auth token for keystone admin. Required. # [keystone_admin_token]. Auth token for keystone admin. Required.
# [admin_email] Email address of system admin. Required. # [admin_email] Email address of system admin. Required.
# [admin_password] # [admin_password]
# [glance_user_password] Auth password for glance user. Required. # [glance_user_password] Auth password for glance user. Required.
# [nova_user_password] Auth password for nova user. Required. # [nova_user_password] Auth password for nova user. Required.
# [public_address] Public address where keystone can be accessed. Required. # [public_address] Public address where keystone can be accessed. Required.
@@ -39,16 +39,13 @@
class openstack::keystone ( class openstack::keystone (
$db_host, $db_host,
$keystone_db_password, $db_password,
$keystone_admin_token, $admin_token,
$admin_email, $admin_email,
$admin_password, $admin_password,
$glance_user_password, $glance_user_password,
$nova_user_password, $nova_user_password,
$public_address, $public_address,
$db_type = 'mysql',
$keystone_db_user = 'keystone',
$keystone_db_dbname = 'keystone',
$keystone_admin_tenant = 'admin', $keystone_admin_tenant = 'admin',
$verbose = 'False', $verbose = 'False',
$bind_host = '0.0.0.0', $bind_host = '0.0.0.0',
@@ -57,6 +54,9 @@ class openstack::keystone (
$glance = true, $glance = true,
$nova = true, $nova = true,
$enabled = true, $enabled = true,
$db_type = 'mysql',
$db_user = 'keystone',
$db_name = 'keystone',
) { ) {
# Install and configure Keystone # Install and configure Keystone