Fix horizon dashboard
WIP: Needs testing and probably Mirantis branding.
Change-Id: If6b359ec28470265be1cf7a27bf21c290e9b2bc8
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
index 6bcb96c..8dc953b 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
@@ -1,19 +1,16 @@
classes:
-- system.linux.system.repo.tcp_mk20
-#- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.trusty
- system.horizon.server.single
+- system.horizon.server.plugin.contrail
+- system.horizon.server.plugin.overrides
- cluster.virtual-mcp10-contrail
parameters:
- horizon:
- server:
- version: liberty
+ _param:
+ horizon_site_branding: OpenStack Dashboard
linux:
- system:
- repo:
- tcpcloud_openstack:
- source: deb [arch=amd64] http://apt.tcpcloud.eu/nightly/ trusty liberty
network:
interface:
eth1:
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml b/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml
index 9d81352..3c3838a 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml
@@ -15,3 +15,8 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ linux:
+ system:
+ package:
+ libapache2-mod-wsgi:
+ version: latest