commit 5b31d07cc240aed047afd37f795dc4b7798733e3
author Adam Tengler <atengler@mirantis.com> Wed Jul 19 10:33:04 2017 +0000
committer Adam Tengler <atengler@mirantis.com> Wed Jul 19 10:33:34 2017 +0000
tree 6b8c815402952df39d1c534e153cf86494a04cb6
parent 2bb12b27e5009da0f923ee585d73e4cda4200fc3

Move OS dashboard in OS HA Contrail lab and fix proxy

Change-Id: I60e8f076c446c2debc74353df95a4ad62b8aee09

classes/cluster/os_ha_contrail/infra/config.yml

diff --git a/classes/cluster/os_ha_contrail/infra/config.yml b/classes/cluster/os_ha_contrail/infra/config.yml
index fb26bc0..0277722 100755
--- a/classes/cluster/os_ha_contrail/infra/config.yml
+++ b/classes/cluster/os_ha_contrail/infra/config.yml
@@ -25,7 +25,6 @@
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
 - cluster.os_ha_contrail.openstack.proxy
-- cluster.os_ha_contrail.openstack.dashboard
 - cluster.os_ha_contrail
 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:
@@ -124,18 +123,21 @@
         openstack_control_node01:
           classes:
           - service.galera.master.cluster
+          - cluster.os_ha_contrail.openstack.dashboard
           params:
             mysql_cluster_role: master
             linux_system_codename: xenial
         openstack_control_node02:
           classes:
           - service.galera.slave.cluster
+          - cluster.os_ha_contrail.openstack.dashboard
           params:
             mysql_cluster_role: slave
             linux_system_codename: xenial
         openstack_control_node03:
           classes:
           - service.galera.slave.cluster
+          - cluster.os_ha_contrail.openstack.dashboard
           params:
             mysql_cluster_role: slave
             linux_system_codename: xenial