diff options
| author | Dan Prince <dprince@redhat.com> | 2013-10-16 22:18:47 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2013-10-30 09:02:50 -0400 |
| commit | f73c28eebf1b485957047948da643858be38b751 (patch) | |
| tree | 7c0b9e83c8dedc380526c9b0d8de4fc0591bf329 /tools | |
| parent | 864681ee2703bd278d8856e616000d6f3d8361d1 (diff) | |
| download | nova-f73c28eebf1b485957047948da643858be38b751.tar.gz | |
Add auth_token settings to nova.conf.sample.
Updates our example config file so that it includes configuration
settings for the auth_token middleware.
Includes the latest generate_sample.sh from Oslo.
Related-Bug: #1240753
Change-Id: I393a67f1f005e775928130c9241aa7e25c391ae3
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/config/generate_sample.sh | 5 | ||||
| -rw-r--r-- | tools/config/keystone_authtoken.conf.sample | 33 |
2 files changed, 38 insertions, 0 deletions
diff --git a/tools/config/generate_sample.sh b/tools/config/generate_sample.sh index 807883e1f2..5787bc9d4f 100755 --- a/tools/config/generate_sample.sh +++ b/tools/config/generate_sample.sh @@ -85,3 +85,8 @@ OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs) MODULEPATH=nova.openstack.common.config.generator OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample 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 diff --git a/tools/config/keystone_authtoken.conf.sample b/tools/config/keystone_authtoken.conf.sample new file mode 100644 index 0000000000..b8388647d5 --- /dev/null +++ b/tools/config/keystone_authtoken.conf.sample @@ -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 |