From aea63e98267345db5d0f7f0f59c32f2c078632fa Mon Sep 17 00:00:00 2001 From: Keiichi Hikita Date: Wed, 29 Nov 2017 10:20:36 +0900 Subject: [PATCH] Fix installation procedure for heat_policy.json according to Horizon team's advice. I've changed installation procedure as follows. (before changing) 1. copy heat_policy.json from Heat-Dashboard directory to Horizon directory (same as enable files) 2. add orchestration key to POLICY_FILES settings (after changing) 1. just point Heat-Dashboard policy file path from POLICY_FILES settings Change-Id: Idaf2cbfcb716a9aa4c0f43283526302f062ea0a7 --- README.rst | 9 ++------- doc/source/install/installation_contents.rst | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/README.rst b/README.rst index bb57cc73..7f3ae1b3 100644 --- a/README.rst +++ b/README.rst @@ -67,19 +67,14 @@ Enable heat-dashboard plugin in your Horizon environment:: cp heat-dashboard/heat_dashboard/enabled/* \ horizon/openstack_dashboard/local/enabled -Copy Heat policy file to your Horizon environment:: - - cp heat-dashboard/etc/heat_policy.json \ - horizon/openstack_dashboard/conf - -Add 'orchestration' key to POLICY_FILES value in local_settings.py:: +Add 'orchestration' entry to POLICY_FILES value in local_settings.py:: POLICY_FILES = { 'identity': 'keystone_policy.json', 'compute': 'nova_policy.json', 'volume': 'cinder_policy.json', 'image': 'glance_policy.json', - 'orchestration': 'heat_policy.json', <-- Add this if it does not exist + 'orchestration': '/etc/heat_policy.json', <-- add this key/value pair 'network': 'neutron_policy.json', } diff --git a/doc/source/install/installation_contents.rst b/doc/source/install/installation_contents.rst index 2054e0c1..550c28bc 100644 --- a/doc/source/install/installation_contents.rst +++ b/doc/source/install/installation_contents.rst @@ -47,19 +47,14 @@ Enable heat-dashboard plugin in your Horizon environment:: cp heat-dashboard/heat_dashboard/enabled/* \ horizon/openstack_dashboard/local/enabled -Copy Heat policy file to your Horizon environment:: - - cp heat-dashboard/etc/heat_policy.json \ - horizon/openstack_dashboard/conf - -Add 'orchestration' key to POLICY_FILES value in local_settings.py:: +Add 'orchestration' entry to POLICY_FILES value in local_settings.py:: POLICY_FILES = { 'identity': 'keystone_policy.json', 'compute': 'nova_policy.json', 'volume': 'cinder_policy.json', 'image': 'glance_policy.json', - 'orchestration': 'heat_policy.json', <-- Add this if it does not exist + 'orchestration': '/etc/heat_policy.json', <-- add this key/value pair 'network': 'neutron_policy.json', }