Fix horizon dashboard
WIP: Needs testing and probably Mirantis branding.
Change-Id: If6b359ec28470265be1cf7a27bf21c290e9b2bc8
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/dashboard.yml
index fba1f30..8bd69d9 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/dashboard.yml
@@ -1,10 +1,13 @@
classes:
+- system.linux.system.repo.ubuntu
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.horizon.server.single
- cluster.virtual-mcp-ocata-dvr
parameters:
+ _param:
+ horizon_site_branding: OpenStack Dashboard
linux:
network:
interface:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/dashboard.yml
index af39937..6f073d5 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/dashboard.yml
@@ -1,10 +1,13 @@
classes:
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
-- system.linux.system.repo.mcp.openstack
-- service.horizon.server.single
+- system.horizon.server.single
- cluster.virtual-mcp-ocata-ovs
parameters:
+ _param:
+ horizon_site_branding: OpenStack Dashboard
linux:
network:
interface:
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
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
index 70ef115..414bbe2 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
@@ -1,19 +1,14 @@
classes:
-#- 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.linux.system.repo.tcp_mk20
- system.horizon.server.single
- cluster.virtual-mcp10-dvr
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-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp10-dvr/openstack/proxy.yml
index d0d51f2..600819d 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/proxy.yml
@@ -12,4 +12,9 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ linux:
+ system:
+ package:
+ libapache2-mod-wsgi:
+ version: latest
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml
index a2b9762..e3e0881 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml
@@ -1,29 +1,14 @@
classes:
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.trusty
-- system.linux.system.repo.tcp_mk20
-- service.horizon.server.single
+- system.horizon.server.single
- cluster.virtual-mcp10-ovs
parameters:
- horizon:
- server:
- version: liberty
- branding: "OpenStack Dashboard"
- bind:
- address: 0.0.0.0
- port: 8078
- plugin:
- horizon_theme:
- app: horizon_theme
- theme_name: mirantis-theme
- source:
- engine: pkg
- name: openstack-dashboard-mirantis-theme
+ _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-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp10-ovs/openstack/proxy.yml
index 855ba7c..8916abc 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/proxy.yml
@@ -12,4 +12,9 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ linux:
+ system:
+ package:
+ libapache2-mod-wsgi:
+ version: latest
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
index 8a79ed1..17b7ace 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
@@ -1,6 +1,6 @@
classes:
-#- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mos10
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.horizon.server.single
@@ -8,6 +8,8 @@
- system.horizon.server.plugin.overrides
- cluster.virtual-mcp11-contrail
parameters:
+ _param:
+ horizon_site_branding: OpenStack Dashboard
linux:
network:
interface:
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
index 28c8f01..5729943 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
@@ -1,10 +1,13 @@
classes:
+- system.linux.system.repo.ubuntu
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.horizon.server.single
- cluster.virtual-mcp11-dvr
parameters:
+ _param:
+ horizon_site_branding: OpenStack Dashboard
linux:
network:
interface:
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
index 050681d..a9cbd60 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
@@ -1,10 +1,13 @@
classes:
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
-- system.linux.system.repo.mcp.openstack
-- service.horizon.server.single
+- system.horizon.server.single
- cluster.virtual-mcp11-ovs
parameters:
+ _param:
+ horizon_site_branding: OpenStack Dashboard
linux:
network:
interface: