From 6767da4200c8c0953f54dc28b6138b9111a598ef Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Thu, 25 Jan 2018 16:35:27 +0000 Subject: [PATCH] Include policy in tree for ease of deployment Some deployment methods are using the files delivered by the installation of packages to configure dashboards. For example, it's possible to pip install heat-dashboard and use the use local_settings.d files shipped inside the package to deploy the heat-dashboard. When the heat dashboard was not a plugin and included in horizon, it was usable without having to care about the policy file. This has changed, as the file is not shipped into horizon by default, and is not available when pip installing the heat dashboard directly, unlike the other files (above). This patch follows the pattern set by murano here [1], to be able to use the default policy file, shipped with the code, after a pip install of the heat-dashboard. [1]: https://github.com/openstack/murano-dashboard/blob/873fd7ff85f3695a9eab3c5b7269153989ea9f02/muranodashboard/conf/murano_policy.json Change-Id: I7e1d74bebc97874c9049f6be33cef27806739b11 --- devstack/plugin.sh | 2 +- doc/source/install/installation_contents.rst | 2 +- {etc => heat_dashboard/conf}/heat_policy.json | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {etc => heat_dashboard/conf}/heat_policy.json (100%) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 0ee523f3..813bc0ea 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -17,7 +17,7 @@ function install_heat_dashboard { function configure_heat_dashboard { cp -a ${HEAT_DASHBOARD_DIR}/heat_dashboard/enabled/* ${DEST}/horizon/openstack_dashboard/local/enabled/ cp -a ${HEAT_DASHBOARD_DIR}/heat_dashboard/local_settings.d/_1699_orchestration_settings.py ${DEST}/horizon/openstack_dashboard/local/local_settings.d/ - cp -a ${HEAT_DASHBOARD_DIR}/etc/heat_policy.json ${DEST}/horizon/openstack_dashboard/conf/ + cp -a ${HEAT_DASHBOARD_DIR}/heat-dashboard/conf/heat_policy.json ${DEST}/horizon/openstack_dashboard/conf/ # NOTE: If locale directory does not exist, compilemessages will fail, # so check for an existence of locale directory is required. if [ -d ${HEAT_DASHBOARD_DIR}/heat_dashboard/locale ]; then diff --git a/doc/source/install/installation_contents.rst b/doc/source/install/installation_contents.rst index 2e33d586..b41bb3e3 100644 --- a/doc/source/install/installation_contents.rst +++ b/doc/source/install/installation_contents.rst @@ -47,7 +47,7 @@ Enable heat-dashboard plugin in your Horizon environment:: cp heat-dashboard/heat_dashboard/enabled/* \ horizon/openstack_dashboard/local/enabled - cp heat-dashboard/etc/* \ + cp heat-dashboard/heat_dashboard/conf/* \ horizon/openstack_dashboard/conf/ cp heat-dashboard/heat_dashboard/local_settings.d/* \ diff --git a/etc/heat_policy.json b/heat_dashboard/conf/heat_policy.json similarity index 100% rename from etc/heat_policy.json rename to heat_dashboard/conf/heat_policy.json