openstack/nova
Code Issues Proposed changes

Merge "Add auth_token settings to nova.conf.sample."

Browse Source
This commit is contained in:
Jenkins 2013-11-05 02:15:21 +00:00 committed by Gerrit Code Review
commit ae24a9304c
3 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
etc/nova/nova.conf.sample
View File

@ -3355,3 +3355,36 @@
#keymap=en-us #keymap=en-us
[keystone_authtoken]
#
# Options defined in keystoneclient's authtoken middleware
#
# Host providing the admin Identity API endpoint
auth_host = 127.0.0.1
# Port of the admin Identity API endpoint
auth_port = 35357
# Protocol of the admin Identity API endpoint
auth_protocol = http
# Keystone service account tenant name to validate user tokens
admin_tenant_name = %SERVICE_TENANT_NAME%
# Keystone account username
admin_user = %SERVICE_USER%
# Keystone account password
admin_password = %SERVICE_PASSWORD%
# Directory used to cache files related to PKI tokens
# signing_dir is configurable, but the default behavior of the authtoken
# middleware should be sufficient. It will create a temporary directory
# in the home directory for the user the nova process is running as.
#signing_dir = /var/lib/nova/keystone-signing
# API version of the admin Identity API endpoint
# Workaround for https://bugs.launchpad.net/nova/+bug/1154809
auth_version = v2.0

5
tools/config/generate_sample.sh
View File

@ -85,3 +85,8 @@ OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs)
MODULEPATH=nova.openstack.common.config.generator MODULEPATH=nova.openstack.common.config.generator
OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample
python -m $MODULEPATH $FILES > $OUTPUTFILE python -m $MODULEPATH $FILES > $OUTPUTFILE
# Hook to allow projects to specify custom config file snippets
for CONCAT_FILE in $BASEDIR/tools/config/*.conf.sample; do
cat $CONCAT_FILE >> $OUTPUTFILE
done

33
tools/config/keystone_authtoken.conf.sample Normal file
View File

@ -0,0 +1,33 @@
[keystone_authtoken]
#
# Options defined in keystoneclient's authtoken middleware
#
# Host providing the admin Identity API endpoint
auth_host = 127.0.0.1
# Port of the admin Identity API endpoint
auth_port = 35357
# Protocol of the admin Identity API endpoint
auth_protocol = http
# Keystone service account tenant name to validate user tokens
admin_tenant_name = %SERVICE_TENANT_NAME%
# Keystone account username
admin_user = %SERVICE_USER%
# Keystone account password
admin_password = %SERVICE_PASSWORD%
# Directory used to cache files related to PKI tokens
# signing_dir is configurable, but the default behavior of the authtoken
# middleware should be sufficient. It will create a temporary directory
# in the home directory for the user the nova process is running as.
#signing_dir = /var/lib/nova/keystone-signing
# API version of the admin Identity API endpoint
# Workaround for https://bugs.launchpad.net/nova/+bug/1154809
auth_version = v2.0