openstack
/
cookbook-openstack-orchestration
Code Issues Proposed changes

Update heat conf files for Juno 

* Update paste.ini
* Update conf
  - Add in description comments
  - Put section in order

Change-Id: Ie70594a5d12e76f4d30e07b5620dd4776995c4f8
Closes-Bug: #1353063
This commit is contained in:
Mark Vanderwiel 2014-08-05 14:55:38 -05:00
parent 20db01de38
commit 0aaa20863d
3 changed files with 449 additions and 389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@ This file is used to list changes made in each version of cookbook-openstack-orc
## 10.0.0
* Upgrading to Juno
* Sync conf files with Juno
## 9.2.0
* python_packages database client attributes have been migrated to

10
templates/default/api-paste.ini.erb
View File

@ -2,7 +2,7 @@
# heat-api pipeline
[pipeline:heat-api]
pipeline = faultwrap ssl versionnegotiation authurl authtoken context apiv1app
pipeline = request_id 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 ssl versionnegotiation authurl authtoken context apiv1app
# flavor = standalone
#
[pipeline:heat-api-standalone]
pipeline = faultwrap ssl versionnegotiation authurl authpassword context apiv1app
pipeline = request_id faultwrap ssl versionnegotiation authurl authpassword context apiv1app
# heat-api pipeline for custom cloud backends
# i.e. in heat.conf:
@ -21,7 +21,7 @@ pipeline = faultwrap ssl versionnegotiation authurl authpassword context apiv1ap
# flavor = custombackend
#
[pipeline:heat-api-custombackend]
pipeline = faultwrap versionnegotiation context custombackendauth apiv1app
pipeline = request_id faultwrap versionnegotiation context custombackendauth apiv1app
# heat-api-cfn pipeline
[pipeline:heat-api-cfn]
@ -94,3 +94,7 @@ paste.filter_factory = heat.common.auth_password:filter_factory
# Auth middleware that validates against custom backend
[filter:custombackendauth]
paste.filter_factory = heat.common.custom_backend_auth:filter_factory
# Middleware to set x-openstack-request-id in http response header
[filter:request_id]
paste.filter_factory = heat.openstack.common.middleware.request_id:RequestIdMiddleware.factory

827
templates/default/heat.conf.erb Executable file → Normal file
View File

File diff suppressed because it is too large Load Diff