commit 06ef8c0fe60f6649a09fc0dd95b24050ed9581c2
author Richard Felkl <rfelkl@mirantis.com> Mon Aug 28 15:13:48 2017 +0000
committer Gerrit Code Review <gerrit2@b3fef64565ee> Mon Aug 28 15:13:50 2017 +0000
tree d335cc9aec08479e6f224e692b01cf57845c0c8d
parent 347249169798a18463cbc7c53daa4cbfeae36c8c
parent b352e4feaab404806bd697454e369e19b1ebc5ef

Merge "fixed horizon for sl_os_contrail"

classes/cluster/sl_os_contrail/infra/config.yml

diff --git a/classes/cluster/sl_os_contrail/infra/config.yml b/classes/cluster/sl_os_contrail/infra/config.yml
index d625393..1d2bebb 100755
--- a/classes/cluster/sl_os_contrail/infra/config.yml
+++ b/classes/cluster/sl_os_contrail/infra/config.yml
@@ -4,6 +4,7 @@
 - system.docker.host
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
@@ -65,7 +66,7 @@
       site:
         nginx_proxy_openstack_web:
           proxy:
-            host: prx
+            host: cfg
         nginx_proxy_openstack_api_heat_cfn:
           enabled: false
   salt:

classes/cluster/sl_os_contrail/openstack/dashboard.yml

diff --git a/classes/cluster/sl_os_contrail/openstack/dashboard.yml b/classes/cluster/sl_os_contrail/openstack/dashboard.yml
index 4edfcb5..7ad6038 100755
--- a/classes/cluster/sl_os_contrail/openstack/dashboard.yml
+++ b/classes/cluster/sl_os_contrail/openstack/dashboard.yml
@@ -19,3 +19,7 @@
           proto: static
           address: ${_param:single_address}
           netmask: 255.255.255.0
+  horizon:
+    server:
+      identity:
+        host: ctl
\ No newline at end of file