commit 03f8c5f70e191ecd9d7f9b5348c21a89a5c37d98
author Adam Tengler <atengler@mirantis.com> Wed Jul 19 13:56:34 2017 +0000
committer Adam Tengler <atengler@mirantis.com> Wed Jul 19 13:57:09 2017 +0000
tree aacb3870f411af10a3807e77ee6fdbf0d91081f0
parent 9443566770d6b618b9f7e187045dab80bba433b3

Move OS Dashboard to ctl nodes in OS HA OVS

Change-Id: I2aef7d99373152bb192d9b66e93da3a74afe8639

classes/cluster/os_ha_ovs/openstack/control.yml

diff --git a/classes/cluster/os_ha_ovs/openstack/control.yml b/classes/cluster/os_ha_ovs/openstack/control.yml
index 742153a..5e8accb 100644
--- a/classes/cluster/os_ha_ovs/openstack/control.yml
+++ b/classes/cluster/os_ha_ovs/openstack/control.yml
@@ -26,6 +26,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- cluster.os_ha_ovs.openstack.dashboard
 - cluster.os_ha_ovs
 parameters:
   _param:

classes/cluster/os_ha_ovs/openstack/dashboard.yml

diff --git a/classes/cluster/os_ha_ovs/openstack/dashboard.yml b/classes/cluster/os_ha_ovs/openstack/dashboard.yml
index c790ad0..ddddaa9 100644
--- a/classes/cluster/os_ha_ovs/openstack/dashboard.yml
+++ b/classes/cluster/os_ha_ovs/openstack/dashboard.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
-- system.horizon.server.single
+- system.horizon.server.cluster
 - cluster.os_ha_ovs
 parameters:
   _param:

classes/cluster/os_ha_ovs/openstack/init.yml

diff --git a/classes/cluster/os_ha_ovs/openstack/init.yml b/classes/cluster/os_ha_ovs/openstack/init.yml
index fff4f05..5920112 100644
--- a/classes/cluster/os_ha_ovs/openstack/init.yml
+++ b/classes/cluster/os_ha_ovs/openstack/init.yml
@@ -28,7 +28,7 @@
     openstack_region: RegionOne
     admin_email: root@localhost
     cluster_public_protocol: http
-    cluster_public_host: ${_param:openstack_control_address}
+    cluster_public_host: ${_param:openstack_proxy_address}
     neutron_public_protocol: http
     neutron_control_dvr: False
     neutron_tenant_network_types: "flat,vxlan"