openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "Glance: Enable passthrough configuration"

This commit is contained in:
Jenkins 2014-05-30 18:42:54 +00:00 committed by Gerrit Code Review
parent 932ea4931d 53b86a804a
commit 327467fd2b
4 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
elements/glance/os-config-applier/etc/glance/glance-api.conf
View File

@ -153,3 +153,19 @@ auth_uri = http://{{keystone.host}}:5000/v2.0
[paste_deploy]
flavor = keystone
# Passthrough configuration support
{{#glance-api}}
{{#config}}
[{{{section}}}]
{{#values}}
{{#comment}}
# {{{.}}}
{{/comment}}
{{#option}}
{{{option}}} = {{{value}}}
{{/option}}
{{/values}}
{{/config}}
{{/glance-api}}

16
elements/glance/os-config-applier/etc/glance/glance-cache.conf
View File

@ -40,3 +40,19 @@ s3_store_access_key = <20-char AWS access key>
s3_store_secret_key = <40-char AWS secret key>
s3_store_bucket = <lowercased 20-char aws access key>glance
s3_store_create_bucket_on_put = False
# Passthrough configuration support
{{#glance-cache}}
{{#config}}
[{{{section}}}]
{{#values}}
{{#comment}}
# {{{.}}}
{{/comment}}
{{#option}}
{{{option}}} = {{{value}}}
{{/option}}
{{/values}}
{{/config}}
{{/glance-cache}}

16
elements/glance/os-config-applier/etc/glance/glance-registry.conf
View File

@ -51,3 +51,19 @@ auth_uri = http://{{keystone.host}}:5000/v2.0
[paste_deploy]
flavor = keystone
# Passthrough configuration support
{{#glance-registry}}
{{#config}}
[{{{section}}}]
{{#values}}
{{#comment}}
# {{{.}}}
{{/comment}}
{{#option}}
{{{option}}} = {{{value}}}
{{/option}}
{{/values}}
{{/config}}
{{/glance-registry}}

16
elements/glance/os-config-applier/etc/glance/glance-scrubber.conf
View File

@ -42,3 +42,19 @@ registry_host = 0.0.0.0
# Port the registry server is listening on
registry_port = 9191
# Passthrough configuration support
{{#glance-scrubber}}
{{#config}}
[{{{section}}}]
{{#values}}
{{#comment}}
# {{{.}}}
{{/comment}}
{{#option}}
{{{option}}} = {{{value}}}
{{/option}}
{{/values}}
{{/config}}
{{/glance-scrubber}}