Update conf file with icehouse release changes

Sync api-paste.ini with ssl support
Sync heat.conf with comment changes and additional sections.

Change-Id: Icff75c6737f37df8466cf2b9d591483d8f917509
Closes-Bug: 1300320
This commit is contained in:
Mark Vanderwiel 2014-03-31 11:32:17 -05:00
parent 48db4ab1fc
commit cd7f69d21b
2 changed files with 539 additions and 167 deletions

View File

@ -2,7 +2,7 @@
# heat-api pipeline
[pipeline:heat-api]
pipeline = faultwrap versionnegotiation authurl authtoken context apiv1app
pipeline = faultwrap ssl versionnegotiation authurl authtoken context apiv1app
# heat-api pipeline for standalone heat
# ie. uses alternative auth backend that authenticates users against keystone
@ -13,7 +13,7 @@ pipeline = faultwrap versionnegotiation authurl authtoken context apiv1app
# flavor = standalone
#
[pipeline:heat-api-standalone]
pipeline = faultwrap versionnegotiation authpassword context apiv1app
pipeline = faultwrap ssl versionnegotiation authurl authpassword context apiv1app
# heat-api pipeline for custom cloud backends
# i.e. in heat.conf:
@ -75,6 +75,10 @@ paste.filter_factory = heat.common.context:ContextMiddleware_filter_factory
[filter:ec2authtoken]
paste.filter_factory = heat.api.aws.ec2token:EC2Token_filter_factory
[filter:ssl]
paste.filter_factory = heat.common.wsgi:filter_factory
heat.filter_factory = heat.api.openstack:sslmiddleware_filter
# Middleware to set auth_url header appropriately
[filter:authurl]
paste.filter_factory = heat.common.auth_url:filter_factory

698
templates/default/heat.conf.erb Normal file → Executable file

File diff suppressed because it is too large Load Diff