aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorPierre Riteau <pierre@stackhpc.com>2021-06-03 15:37:45 +0200
committerPierre Riteau <pierre@stackhpc.com>2021-06-03 15:37:45 +0200
commit740448a658f0060b86d56e78915d8b751ade3616 (patch)
treeeabbc7626a4c4973d5dec40670ae5cf7d21bca87 /docker
parent5338b559ea12af998d89da3f339788a18e775dcd (diff)
downloadkolla-740448a658f0060b86d56e78915d8b751ade3616.tar.gz
kolla-740448a658f0060b86d56e78915d8b751ade3616.zip
Add missing default policy files for ubuntu-binary-horizon
The ubuntu-binary-horizon image is missing the default policies files which should be in /etc/openstack-dashboard/default_policies. By copying everything from /usr/share/openstack-dashboard/openstack_dashboard/conf into /etc/openstack-dashboard, we get the default policy files, as well as commented out policy files (e.g. cinder_policy.yaml) and the nova_policy.d directory containing api-extensions.yaml. Change-Id: I3c6fdcb9b7dd7443a7755599f7e4ee59f67e0a91 Closes-Bug: #1930586
Diffstat (limited to 'docker')
-rw-r--r--docker/horizon/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index 1b1a09078..ca3d726d1 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -80,7 +80,7 @@ RUN sed -i 's|\(ServerTokens \)OS|\1Prod|' /etc/apache2/conf-available/security.
&& ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load \
&& ln -s ../mods-available/expires.load /etc/apache2/mods-enabled/expires.load \
{% if base_distro == 'ubuntu' %}
- && cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/openstack-dashboard \
+ && cp -r /usr/share/openstack-dashboard/openstack_dashboard/conf/* /etc/openstack-dashboard \
&& rm /etc/apache2/conf-enabled/openstack-dashboard.conf \
{% else %}
&& cp /etc/openstack-dashboard/policy/*.json /etc/openstack-dashboard \