From 49b9c735a29560290ff1655ac6d24d5b9abf210c Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Wed, 14 Oct 2015 21:03:14 +0100
Subject: [PATCH] Update Heat Configuration for Liberty

This patch includes the updates to the configuration files for Heat
for the Liberty release.

DocImpact
UpgradeImpact
Implements: blueprint liberty-release
Change-Id: I07baa2b6cc5becdfef995f70ff3d1e8dcde1a21e
---
 playbooks/roles/os_heat/templates/api-paste.ini.j2 |  2 +-
 playbooks/roles/os_heat/templates/heat.conf.j2     |  1 -
 playbooks/roles/os_heat/templates/policy.json.j2   | 10 +++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/playbooks/roles/os_heat/templates/api-paste.ini.j2 b/playbooks/roles/os_heat/templates/api-paste.ini.j2
index 0e8185dfa0..f0eedb8ed7 100644
--- a/playbooks/roles/os_heat/templates/api-paste.ini.j2
+++ b/playbooks/roles/os_heat/templates/api-paste.ini.j2
@@ -96,7 +96,7 @@ 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 = oslo.middleware.request_id:RequestId.factory
+paste.filter_factory = oslo_middleware.request_id:RequestId.factory
 
 [filter:osprofiler]
 paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
diff --git a/playbooks/roles/os_heat/templates/heat.conf.j2 b/playbooks/roles/os_heat/templates/heat.conf.j2
index c87ecf7ab5..520cbb3526 100644
--- a/playbooks/roles/os_heat/templates/heat.conf.j2
+++ b/playbooks/roles/os_heat/templates/heat.conf.j2
@@ -4,7 +4,6 @@
 verbose = {{ verbose }}
 debug = {{ debug }}
 fatal_deprecations = {{ heat_fatal_deprecations }}
-use_syslog = False
 
 log_file = /var/log/heat/heat.log
 
diff --git a/playbooks/roles/os_heat/templates/policy.json.j2 b/playbooks/roles/os_heat/templates/policy.json.j2
index 54c845b346..1c8cd02719 100644
--- a/playbooks/roles/os_heat/templates/policy.json.j2
+++ b/playbooks/roles/os_heat/templates/policy.json.j2
@@ -45,6 +45,8 @@
     "stacks:global_index": "rule:deny_everybody",
     "stacks:index": "rule:deny_stack_user",
     "stacks:list_resource_types": "rule:deny_stack_user",
+    "stacks:list_template_versions": "rule:deny_stack_user",
+    "stacks:list_template_functions": "rule:deny_stack_user",
     "stacks:lookup": "",
     "stacks:preview": "rule:deny_stack_user",
     "stacks:resource_schema": "rule:deny_stack_user",
@@ -52,6 +54,8 @@
     "stacks:template": "rule:deny_stack_user",
     "stacks:update": "rule:deny_stack_user",
     "stacks:update_patch": "rule:deny_stack_user",
+    "stacks:preview_update": "rule:deny_stack_user",
+    "stacks:preview_update_patch": "rule:deny_stack_user",
     "stacks:validate_template": "rule:deny_stack_user",
     "stacks:snapshot": "rule:deny_stack_user",
     "stacks:show_snapshot": "rule:deny_stack_user",
@@ -59,6 +63,8 @@
     "stacks:list_snapshots": "rule:deny_stack_user",
     "stacks:restore_snapshot": "rule:deny_stack_user",
 
+    "software_configs:global_index": "rule:deny_everybody",
+    "software_configs:index": "rule:deny_stack_user",
     "software_configs:create": "rule:deny_stack_user",
     "software_configs:show": "rule:deny_stack_user",
     "software_configs:delete": "rule:deny_stack_user",
@@ -69,5 +75,7 @@
     "software_deployments:delete": "rule:deny_stack_user",
     "software_deployments:metadata": "",
 
-    "service:index": "rule:context_is_admin"
+    "service:index": "rule:context_is_admin",
+
+    "resource_types:OS::Nova::Flavor": "rule:context_is_admin"
 }