Merge "Move OpenStack dashboard to control nodes"
diff --git a/classes/cluster/os-ha-contrail-40/infra/config.yml b/classes/cluster/os-ha-contrail-40/infra/config.yml
index 6f85651..7eb7bfa 100644
--- a/classes/cluster/os-ha-contrail-40/infra/config.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/config.yml
@@ -160,7 +160,6 @@
openstack_control_node01:
classes:
- service.galera.master.cluster
- - cluster.os-ha-contrail-40.openstack.dashboard
params:
mysql_cluster_role: master
linux_system_codename: xenial
@@ -168,7 +167,6 @@
openstack_control_node02:
classes:
- service.galera.slave.cluster
- - cluster.os-ha-contrail-40.openstack.dashboard
params:
mysql_cluster_role: slave
linux_system_codename: xenial
@@ -176,7 +174,6 @@
openstack_control_node03:
classes:
- service.galera.slave.cluster
- - cluster.os-ha-contrail-40.openstack.dashboard
params:
mysql_cluster_role: slave
linux_system_codename: xenial
diff --git a/classes/cluster/os-ha-contrail-40/openstack/control.yml b/classes/cluster/os-ha-contrail-40/openstack/control.yml
index 7fd147b..787fce7 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/control.yml
@@ -31,6 +31,7 @@
- system.galera.server.database.nova
- system.galera.server.database.designate
- system.haproxy.proxy.listen.openstack.nova-placement
+- cluster.os-ha-contrail-40.openstack.dashboard
- cluster.os-ha-contrail-40
parameters:
_param: