aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-07-29 10:47:42 +0000
committerGerrit Code Review <review@openstack.org>2021-07-29 10:47:42 +0000
commitf95ba3d8a39a6336eac0febab43a9eb0975ad6a2 (patch)
tree046c0e5d7880a6c44c9107b3e1a82ef47c280dd1
parent53b391d3612a322ad13e1ec65e2ed9ba7e94a3c1 (diff)
parent01d02be25ed043b4541db3ebfc102d013cdc578a (diff)
downloadkolla-f95ba3d8a39a6336eac0febab43a9eb0975ad6a2.tar.gz
kolla-f95ba3d8a39a6336eac0febab43a9eb0975ad6a2.zip
Merge "Add missing default policy files for debian-binary-horizon"
-rw-r--r--docker/horizon/Dockerfile.j22
-rw-r--r--releasenotes/notes/bug-1933759-c03e50c243850a49.yaml5
2 files changed, 6 insertions, 1 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index 6d7180e40..a672807c1 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -84,7 +84,7 @@ RUN sed -i 's|\(ServerTokens \)OS|\1Prod|' /etc/apache2/conf-available/security.
&& 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 \
+ && cp -r /etc/openstack-dashboard/policy/* /etc/openstack-dashboard \
{% endif %}
&& cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
&& rm /etc/openstack-dashboard/local_settings.py \
diff --git a/releasenotes/notes/bug-1933759-c03e50c243850a49.yaml b/releasenotes/notes/bug-1933759-c03e50c243850a49.yaml
new file mode 100644
index 000000000..c4ed605d4
--- /dev/null
+++ b/releasenotes/notes/bug-1933759-c03e50c243850a49.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Fix missing default policy files for debian-binary-horizon.
+ `LP#1933759 <https://launchpad.net/bugs/1933759>`__