Move OS Dashboard to ctl nodes in OS HA OVS
Change-Id: I2aef7d99373152bb192d9b66e93da3a74afe8639
diff --git a/classes/cluster/os_ha_ovs/infra/config.yml b/classes/cluster/os_ha_ovs/infra/config.yml
index bbc9975..783586f 100644
--- a/classes/cluster/os_ha_ovs/infra/config.yml
+++ b/classes/cluster/os_ha_ovs/infra/config.yml
@@ -23,7 +23,6 @@
- system.mysql.client.database.neutron
- system.reclass.storage.system.openstack_control_cluster
- cluster.os_ha_ovs.openstack.proxy
-- cluster.os_ha_ovs.openstack.dashboard
- cluster.os_ha_ovs
parameters:
_param:
@@ -51,7 +50,7 @@
site:
nginx_proxy_openstack_web:
proxy:
- host: prx
+ host: ${_param:openstack_control_address}
nginx_proxy_openstack_api_heat_cfn:
enabled: false
salt:
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:
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:
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"