From: Radomir Dopieralski <rdopiera@redhat.com>
Date: Tue, 7 Nov 2017 19:20:38 +0000 (+0100)
Subject: Fix rights to local_settings.d for dockerized Horizon
X-Git-Tag: opnfv-6.0.0~18^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=efcd879b863d0e597f0b10b5df7ec74690aa23e5;p=apex-tripleo-heat-templates.git

Fix rights to local_settings.d for dockerized Horizon

For some reasonf that directory doesn't have r/x rights, so when
compress is ran as root, it can access config files in it, but when
horizon is run by apache, it can't, and expects different theme files,
thus failing with OfflineGenerationError. Giving apache access to that
directory fixes the problem and makes the custom theme work.

Closes-bug: #1730911
Change-Id: I53f6db23b036bc9b5a689bbac958550f384194c6
(cherry picked from commit 2827fa428c757180019dd7c1aacafcca554845ab)
---

diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml
index 94fd9eef..44a76d36 100644
--- a/docker/services/horizon.yaml
+++ b/docker/services/horizon.yaml
@@ -105,6 +105,10 @@ outputs:
             - path: /usr/share/openstack-dashboard/openstack_dashboard/local/
               owner: apache:apache
               recurse: false
+            # FIXME Our theme settings are there
+            - path: /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.d/
+              owner: apache:apache
+              recurse: false
       docker_config:
         step_2:
           horizon_fix_perms: