From f10de77dfffae9c3ba7a9e68c68d07d087d8c75d Mon Sep 17 00:00:00 2001 From: newptone Date: Fri, 26 Jul 2013 11:23:53 +0800 Subject: [PATCH] Update the specification in openstack::keystone This patch is aim to update the option names in specification and the use example. Change-Id: I5ae49b1a929cfeebe94dbf25435f8e3328fb8216 --- manifests/keystone.pp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/manifests/keystone.pp b/manifests/keystone.pp index 5578c7e..231a257 100644 --- a/manifests/keystone.pp +++ b/manifests/keystone.pp @@ -7,17 +7,17 @@ # # [db_host] Host where DB resides. Optional. Defaults to 127.0.0.1.. # [idle_timeout] Timeout to reap SQL connections. Optional. Defaults to '200'. -# [keystone_db_password] Password for keystone DB. Required. -# [keystone_admin_token]. Auth token for keystone admin. Required. +# [db_password] Password for keystone DB. Required. +# [admin_token]. Auth token for keystone admin. Required. # [admin_email] Email address of system admin. Required. -# [admin_password] +# [admin_password] Auth password for admin user. Required. # [glance_user_password] Auth password for glance user. Required. # [nova_user_password] Auth password for nova user. Required. # [public_address] Public address where keystone can be accessed. Required. # [db_type] Type of DB used. Currently only supports mysql. Optional. Defaults to 'mysql' -# [keystone_db_user] Name of keystone db user. Optional. Defaults to 'keystone' -# [keystone_db_dbname] Name of keystone DB. Optional. Defaults to 'keystone' -# [keystone_admin_tenant] Name of keystone admin tenant. Optional. Defaults to 'admin' +# [db_user] Name of keystone db user. Optional. Defaults to 'keystone' +# [db_name] Name of keystone DB. Optional. Defaults to 'keystone' +# [admin_tenant] Name of keystone admin tenant. Optional. Defaults to 'admin' # [verbose] Log verbosely. Optional. Defaults to false. # [debug] Log at a debug-level. Optional. Defaults to false. # [bind_host] Address that keystone binds to. Optional. Defaults to '0.0.0.0' @@ -36,10 +36,14 @@ # # class { 'openstack::keystone': # db_host => '127.0.0.1', -# keystone_db_password => 'changeme', -# keystone_admin_token => '12345', +# db_password => 'changeme', +# admin_token => '12345', # admin_email => 'root@localhost', # admin_password => 'changeme', +# glance_user_password => 'glance', +# nova_user_password => 'nova', +# cinder_user_password => 'cinder', +# quantum_user_password => 'quantum', # public_address => '192.168.1.1', # }