Merge "nova-placement: switch auth_uri to keystone versionless endpoint" into stable...

[apex-tripleo-heat-templates.git] / docker / services / horizon.yaml

diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml
index d6ffb6d..94fd9ee 100644 (file)
--- a/docker/services/horizon.yaml
+++ b/docker/services/horizon.yaml
@@ -95,6 +95,12 @@ outputs:
             - path: /var/log/horizon/
               owner: apache:apache
               recurse: true
+            # NOTE The upstream Kolla Dockerfile sets /etc/openstack-dashboard/ ownership to
+            # horizon:horizon - the policy.json files need read permissions for the apache user
+            # FIXME We should consider whether this should be fixed in the Kolla Dockerfile instead
+            - path: /etc/openstack-dashboard/
+              owner: apache:apache
+              recurse: true
             # FIXME Apache tries to write a .lock file there
             - path: /usr/share/openstack-dashboard/openstack_dashboard/local/
               owner: apache:apache
@@ -113,7 +119,7 @@ outputs:
             volumes:
               - /var/log/containers/horizon:/var/log/horizon
               - /var/log/containers/httpd/horizon:/var/log/httpd
-              - /var/lib/config-data/horizon/etc/:/etc/
+              - /var/lib/config-data/puppet-generated/horizon/etc/openstack-dashboard:/etc/openstack-dashboard
         step_3:
           horizon:
             image: *horizon_image