From 60439d897db4a720f3a4b5d1331396e13b646a3e Mon Sep 17 00:00:00 2001
From: Noboru Iwamatsu <n_iwamatsu@jp.fujitsu.com>
Date: Wed, 28 Jun 2017 00:30:08 +0900
Subject: [PATCH] fix horizon contents path for ubuntu/binary

The static contents directory path of the openstack-dashboard
provided by Ubuntu Cloud Archive is different from RDO's.
This fixes the horizon.conf template to set the correct alias
when ubuntu+binary are specified.

Change-Id: I1b0c04cecc66b42bf764aa035e7ec24c37d805e3
Closes-Bug: #1700712
---
 ansible/roles/horizon/templates/horizon.conf.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ansible/roles/horizon/templates/horizon.conf.j2 b/ansible/roles/horizon/templates/horizon.conf.j2
index d6d684873b..7d352060ee 100644
--- a/ansible/roles/horizon/templates/horizon.conf.j2
+++ b/ansible/roles/horizon/templates/horizon.conf.j2
@@ -16,7 +16,11 @@ Listen {{ api_interface_address }}:{{ horizon_port }}
         Require all granted
     </Location>
 
+{% if kolla_base_distro == 'ubuntu' and kolla_install_type == 'binary' %}
+    Alias /static /var/lib/openstack-dashboard/static
+{% else %}
     Alias /static {{ python_path }}/static
+{% endif %}
     <Location "/static">
         SetHandler None
     </Location>