diff --git a/classes/cluster/k8s_ha_contrail/infra/init.yml b/classes/cluster/k8s_ha_contrail/infra/init.yml
index 166a17b..a624371 100644
--- a/classes/cluster/k8s_ha_contrail/infra/init.yml
+++ b/classes/cluster/k8s_ha_contrail/infra/init.yml
@@ -15,6 +15,11 @@
   linux:
     network:
       host:
+        self:
+          address: ${_param:single_address}
+          names:
+          - ${linux:system:name}
+          - ${linux:system:name}.${linux:system:domain}
         cfg01:
           address: ${_param:infra_config_address}
           names:
diff --git a/classes/cluster/model_manager/infra/config.yml b/classes/cluster/model_manager/infra/config.yml
new file mode 100644
index 0000000..a36a00f
--- /dev/null
+++ b/classes/cluster/model_manager/infra/config.yml
@@ -0,0 +1,66 @@
+classes:
+- service.git.client
+- system.linux.system.single
+- system.linux.system.repo.mcp.salt
+- system.openssh.client.lab
+- system.salt.master.api
+- system.salt.master.pkg
+- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
+- system.salt.minion.cert.proxy
+- system.sphinx.server.doc.reclass
+#- system.reclass.storage.system.model_manager
+- cluster.model_manager
+parameters:
+  _param:
+    reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
+    reclass_data_revision: master
+    salt_master_environment_repository: "https://github.com/tcpcloud"
+    salt_master_environment_revision: master
+    reclass_config_master: ${_param:infra_config_deploy_address}
+    single_address: ${_param:infra_config_address}
+    salt_master_host: 127.0.0.1
+    salt_master_base_environment: prd
+    salt_minion_ca_host: ${linux:network:fqdn}
+    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+  salt:
+    master:
+      reactor:
+        reclass/minion/classify:
+        - salt://reclass/reactor/node_register.sls
+  reclass:
+    storage:
+      class_mapping:
+        common_node:
+          expression: all
+          node_param:
+            single_address:
+              value_template: <<node_control_ip>>
+            linux_system_codename:
+              value_template: <<node_os>>
+            salt_master_host:
+              value_template: <<node_master_ip>>
+        infra_config:
+          expression: <<node_hostname>>__startswith__cfg
+          cluster_param:
+            infra_config_address:
+              value_template: <<node_control_ip>>
+            infra_config_deploy_address:
+              value_template: <<node_deploy_ip>>
+            cluster_domain:
+              value_template: <<node_domain>>
+        model_manager:
+          expression: <<node_hostname>>__startswith__web
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.model_manager.dashboard
+
diff --git a/classes/cluster/model_manager/infra/init.yml b/classes/cluster/model_manager/infra/init.yml
new file mode 100644
index 0000000..c99dcd4
--- /dev/null
+++ b/classes/cluster/model_manager/infra/init.yml
@@ -0,0 +1,19 @@
+parameters:
+  _param:
+    cluster_domain: model_manager.local
+    cluster_name: model_manager
+    infra_config_deploy_address: 192.168.10.100
+    infra_config_address: 172.16.10.100
+  linux:
+    network:
+      host:
+        cfg01:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg01
+          - cfg01.${_param:cluster_domain}
+        cfg:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg
+          - cfg.${_param:cluster_domain}
diff --git a/classes/cluster/model_manager/init.yml b/classes/cluster/model_manager/init.yml
new file mode 100644
index 0000000..af717ac
--- /dev/null
+++ b/classes/cluster/model_manager/init.yml
@@ -0,0 +1,9 @@
+classes:
+- system.linux.system.single
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- cluster.os_ha_ovs.infra
+- cluster.os_ha_ovs.model_manager
+- cluster.overrides
+
diff --git a/classes/cluster/model_manager/model_manager/dashboard.yml b/classes/cluster/model_manager/model_manager/dashboard.yml
new file mode 100644
index 0000000..baa7ff0
--- /dev/null
+++ b/classes/cluster/model_manager/model_manager/dashboard.yml
@@ -0,0 +1,17 @@
+classes:
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+#- system.model_manager.single
+- cluster.model_manager
+parameters:
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+
diff --git a/classes/cluster/model_manager/model_manager/init.yml b/classes/cluster/model_manager/model_manager/init.yml
new file mode 100644
index 0000000..1c740f9
--- /dev/null
+++ b/classes/cluster/model_manager/model_manager/init.yml
@@ -0,0 +1,2 @@
+# TODO: model_manager params
+
diff --git a/classes/cluster/model_manager/model_manager/proxy.yml b/classes/cluster/model_manager/model_manager/proxy.yml
new file mode 100644
index 0000000..b992ad6
--- /dev/null
+++ b/classes/cluster/model_manager/model_manager/proxy.yml
@@ -0,0 +1,14 @@
+classes:
+- system.nginx.server.single
+#- system.nginx.server.proxy.model_manager
+- system.salt.minion.cert.proxy
+- cluster.model_manager
+parameters:
+  _param:
+    nginx_proxy_ssl:
+      enabled: true
+      authority: ${_param:salt_minion_ca_authority}
+      engine: salt
+      mode: secure
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+
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
diff --git a/classes/cluster/os_ha_contrail/openstack/dashboard.yml b/classes/cluster/os_ha_contrail/openstack/dashboard.yml
index 7c9602e..0c4cb38 100755
--- a/classes/cluster/os_ha_contrail/openstack/dashboard.yml
+++ b/classes/cluster/os_ha_contrail/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
 - system.horizon.server.plugin.contrail
 - system.horizon.server.plugin.overrides
 - cluster.os_ha_contrail
diff --git a/classes/cluster/os_ha_contrail/openstack/init.yml b/classes/cluster/os_ha_contrail/openstack/init.yml
index 97a3fcf..826c807 100755
--- a/classes/cluster/os_ha_contrail/openstack/init.yml
+++ b/classes/cluster/os_ha_contrail/openstack/init.yml
@@ -1,8 +1,9 @@
 parameters:
   _param:
-    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_hostname: prx
+    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
     openstack_proxy_node01_hostname: prx01
-    openstack_proxy_node01_address: 172.16.10.121
+    openstack_proxy_node01_address: ${_param:infra_config_address}
 
     openstack_control_address: 172.16.10.254
     openstack_control_node01_hostname: ctl01
@@ -37,7 +38,7 @@
     apt_mk_version: nightly
     openstack_region: RegionOne
     admin_email: root@localhost
-    cluster_public_host: ${_param:openstack_control_address}
+    cluster_public_host: ${_param:openstack_proxy_address}
     opencontrail_version: 3.0
     opencontrail_compute_dns: 8.8.8.8
     opencontrail_stats_password: contrail123
diff --git a/classes/cluster/os_ha_ovs/infra/config.yml b/classes/cluster/os_ha_ovs/infra/config.yml
index 7d36a2b..bbc9975 100644
--- a/classes/cluster/os_ha_ovs/infra/config.yml
+++ b/classes/cluster/os_ha_ovs/infra/config.yml
@@ -105,6 +105,19 @@
               value_template: <<node_tenant_ip>>
             external_address:
               value_template: <<node_external_ip>>
+        openstack_gateway:
+          expression: <<node_hostname>>__startswith__gtw
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.openstack.gateway
+          node_param:
+            tenant_address:
+              value_template: <<node_tenant_ip>>
+            external_address:
+              value_template: <<node_external_ip>>
+          cluster_param:
+            openstack_gateway_node01_address:
+              value_template: <<node_control_ip>>
       node:
         openstack_control_node01:
           classes:
diff --git a/classes/cluster/os_ha_ovs/openstack/gateway.yml b/classes/cluster/os_ha_ovs/openstack/gateway.yml
new file mode 100644
index 0000000..2e7f0f0
--- /dev/null
+++ b/classes/cluster/os_ha_ovs/openstack/gateway.yml
@@ -0,0 +1,78 @@
+classes:
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp11-ovs
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 9000
+    linux_system_codename: xenial
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        external_interface:
+          enabled: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-floating:
+          enabled: true
+          type: ovs_bridge
+          mtu: ${_param:interface_mtu}
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          mtu: ${_param:interface_mtu}
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-mesh:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:tenant_interface}
+        float-to-ex:
+          enabled: true
+          type: ovs_port
+          mtu: ${_param:interface_mtu}
+          bridge: br-floating
+        br-ex:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          address: ${_param:external_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:external_interface}
+          use_ovs_ports:
+          - float-to-ex
\ No newline at end of file
diff --git a/classes/cluster/os_ha_ovs/openstack/init.yml b/classes/cluster/os_ha_ovs/openstack/init.yml
index fc7c24c..fff4f05 100644
--- a/classes/cluster/os_ha_ovs/openstack/init.yml
+++ b/classes/cluster/os_ha_ovs/openstack/init.yml
@@ -1,7 +1,9 @@
 parameters:
   _param:
-    openstack_proxy_address: 172.16.10.121
-    openstack_proxy_node01_address: 172.16.10.121
+    openstack_proxy_hostname: prx
+    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
+    openstack_proxy_node01_hostname: prx01
+    openstack_proxy_node01_address: ${_param:infra_config_address}
     openstack_control_hostname: ctl
     openstack_control_node01_hostname: ctl01
     openstack_control_node02_hostname: ctl02
@@ -10,6 +12,10 @@
     openstack_control_node01_address: 172.16.10.101
     openstack_control_node02_address: 172.16.10.102
     openstack_control_node03_address: 172.16.10.103
+    openstack_gateway_hostname: gtw
+    openstack_gateway_address: ${_param:openstack_gateway_node01_address}
+    openstack_gateway_node01_hostname: gtw01
+    openstack_gateway_node01_address: 172.16.10.110
     openstack_database_address: ${_param:openstack_control_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
@@ -93,30 +99,41 @@
         prx:
           address: ${_param:openstack_proxy_address}
           names:
-          - prx
-          - prx.${_param:cluster_domain}
+          - ${_param:openstack_proxy_hostname}
+          - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
         prx01:
           address: ${_param:openstack_proxy_node01_address}
           names:
-          - prx01
-          - prx01.${_param:cluster_domain}
+          - ${_param:openstack_proxy_node01_hostname}
+          - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
         ctl:
           address: ${_param:openstack_control_address}
           names:
-          - ctl
-          - ctl.${_param:cluster_domain}
+          - ${_param:openstack_control_hostname}
+          - ${_param:openstack_control_hostname}.${_param:cluster_domain}
         ctl01:
           address: ${_param:openstack_control_node01_address}
           names:
-          - ctl01
-          - ctl01.${_param:cluster_domain}
+          - ${_param:openstack_control_node01_hostname}
+          - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
         ctl02:
           address: ${_param:openstack_control_node02_address}
           names:
-          - ctl02
-          - ctl02.${_param:cluster_domain}
+          - ${_param:openstack_control_node02_hostname}
+          - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
         ctl03:
           address: ${_param:openstack_control_node03_address}
           names:
-          - ctl03
-          - ctl03.${_param:cluster_domain}
+          - ${_param:openstack_control_node03_hostname}
+          - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
+        gtw:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - ${_param:openstack_gateway_hostname}
+          - ${_param:openstack_gateway_hostname}.${_param:cluster_domain}
+        gtw01:
+          address: ${_param:openstack_gateway_address}
+          names:
+          - ${_param:openstack_gateway_hostname}
+          - ${_param:openstack_gateway_hostname}.${_param:cluster_domain}
+
diff --git a/classes/cluster/sl_k8s_calico/stacklight/client.yml b/classes/cluster/sl_k8s_calico/stacklight/client.yml
index 3799964..393449c 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/client.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/client.yml
@@ -7,11 +7,11 @@
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
-    stacklight_log_address: ${_param:stacklight_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
     # Grafana client parameters
-    grafana_address: ${_param:stacklight_address}
+    grafana_address: ${_param:stacklight_monitor_address}
     grafana_port: 15013
     grafana_user: admin
     grafana_password: ${_param:grafana_admin_password}
-    grafana_prometheus_address: ${_param:stacklight_address}
+    grafana_prometheus_address: ${_param:stacklight_monitor_address}
     grafana_prometheus_port: 15010
diff --git a/classes/cluster/sl_k8s_calico/stacklight/init.yml b/classes/cluster/sl_k8s_calico/stacklight/init.yml
index 0790d9d..9745f9a 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/init.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    stacklight_address: 172.16.10.252
+    stacklight_monitor_address: 172.16.10.252
     stacklight_monitor_node01_hostname: mon01
     stacklight_monitor_node02_hostname: mon02
     stacklight_monitor_node03_hostname: mon03
@@ -9,10 +9,10 @@
     stacklight_monitor_node03_address: 172.16.10.109
 
     # Glusterfs
-    glusterfs_service_host: ${_param:stacklight_address}
+    glusterfs_service_host: ${_param:stacklight_monitor_address}
 
     # Prometheus
-    prometheus_control_address: ${_param:stacklight_address}
+    prometheus_control_address: ${_param:stacklight_monitor_address}
 
     mysql_admin_user: root
     mysql_admin_password: workshop
@@ -22,11 +22,15 @@
     galera_server_cluster_name: monitoring_cluster
     galera_server_maintenance_password: workshop
     galera_server_admin_password: workshop
+
+    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_port: 9200
+    stacklight_environment: ${_param:cluster_domain}
   linux:
     network:
       host:
         mon:
-          address: ${_param:stacklight_address}
+          address: ${_param:stacklight_monitor_address}
           names:
           - mon
           - mon.${_param:cluster_domain}
diff --git a/classes/cluster/sl_k8s_calico/stacklight/proxy.yml b/classes/cluster/sl_k8s_calico/stacklight/proxy.yml
index 5fe4edd..f2a4469 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/proxy.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/proxy.yml
@@ -1,8 +1,18 @@
 classes:
 - system.nginx.server.single
+- system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
+- system.salt.minion.cert.proxy
 - cluster.sl_k8s_calico
 parameters:
   _param:
     cluster_public_host: ${_param:prometheus_control_address}
+    nginx_proxy_grafana_port: 15013
+    nginx_proxy_ssl:
+      enabled: true
+      authority: ${_param:salt_minion_ca_authority}
+      engine: salt
+      mode: secure
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/sl_k8s_calico/stacklight/server.yml b/classes/cluster/sl_k8s_calico/stacklight/server.yml
index ce40987..ec66592 100644
--- a/classes/cluster/sl_k8s_calico/stacklight/server.yml
+++ b/classes/cluster/sl_k8s_calico/stacklight/server.yml
@@ -9,6 +9,7 @@
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.influxdb
 - service.haproxy.proxy.single
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.prometheus
@@ -20,15 +21,18 @@
 - system.influxdb.database.stacklight
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
+- system.prometheus.server.remote_write.docker
+- system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.etcd
 - system.prometheus.server.target.kubernetes
 - system.prometheus.server.target.dns
 - system.docker.swarm.stack.monitoring
-#- system.docker.swarm.service.dashboard.grafana_server
+- system.docker.swarm.stack.dashboard
 - cluster.sl_k8s_calico
 parameters:
   _param:
-    cluster_vip_address: ${_param:stacklight_address}
+    cluster_vip_address: ${_param:stacklight_monitor_address}
     cluster_public_host: mon
     docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
@@ -39,7 +43,7 @@
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
     keepalived_prometheus_vip_password: password
-    keepalived_prometheus_vip_interface: ${_param:primary_interface}
+    keepalived_prometheus_vip_interface: ens4
     # Docker/Elasticsearch
     cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
     cluster_node01_address: ${_param:stacklight_monitor_node01_address}
@@ -50,20 +54,22 @@
     # Kibana
     kibana_elasticsearch_host: ${_param:cluster_vip_address}
     # Galera
-    openstack_version: ocata
+    openstack_version: newton
     # Grafana
-    docker_grafana_replicas: 1
     grafana_database_type: mysql
     grafana_database_host: ${_param:cluster_vip_address}
     grafana_database_password: ${_param:mysql_grafana_password}
-    grafana_database_type: mysql
     influxdb_port: 8086
     influxdb_admin_password: password
     influxdb_stacklight_password: lmapass
-    prometheus_influxdb_url: "http://${_param:stacklight_address}:8086/"
+    prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
     prometheus_influxdb_db: lma
     prometheus_influxdb_username: lma
-    prometheus_influxdb_password: lmapass
+    prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+  elasticsearch:
+    server:
+      heap:
+        size: 1
   keepalived:
     cluster:
       instance:
diff --git a/classes/cluster/sl_os_ovs/infra/config.yml b/classes/cluster/sl_os_ovs/infra/config.yml
index 75401d0..a1c2d1a 100644
--- a/classes/cluster/sl_os_ovs/infra/config.yml
+++ b/classes/cluster/sl_os_ovs/infra/config.yml
@@ -107,6 +107,19 @@
               value_template: <<node_tenant_ip>>
             external_address:
               value_template: <<node_external_ip>>
+        openstack_gateway:
+          expression: <<node_hostname>>__startswith__gtw
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.openstack.gateway
+          node_param:
+            tenant_address:
+              value_template: <<node_tenant_ip>>
+            external_address:
+              value_template: <<node_external_ip>>
+          cluster_param:
+            openstack_gateway_node01_address:
+              value_template: <<node_control_ip>>
         stacklight_monitor01:
           expression: <<node_hostname>>__equals__mon01
           cluster_param:
diff --git a/classes/cluster/sl_os_ovs/init.yml b/classes/cluster/sl_os_ovs/init.yml
index b9a31c6..5fc70a0 100644
--- a/classes/cluster/sl_os_ovs/init.yml
+++ b/classes/cluster/sl_os_ovs/init.yml
@@ -1,11 +1,11 @@
 classes:
 - system.linux.system.single
-- cluster.sl_os_ovs.infra
-- cluster.sl_os_ovs.openstack
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.stacklight
 - system.openssh.server.team.mcp_qa
+- cluster.sl_os_ovs.infra
+- cluster.sl_os_ovs.openstack
 - cluster.sl_os_ovs.stacklight
 - cluster.sl_os_ovs.stacklight.client
-- cluster.overrides
\ No newline at end of file
+- cluster.overrides
diff --git a/classes/cluster/sl_os_ovs/openstack/gateway.yml b/classes/cluster/sl_os_ovs/openstack/gateway.yml
new file mode 100644
index 0000000..2e7f0f0
--- /dev/null
+++ b/classes/cluster/sl_os_ovs/openstack/gateway.yml
@@ -0,0 +1,78 @@
+classes:
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp11-ovs
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 9000
+    linux_system_codename: xenial
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        external_interface:
+          enabled: true
+          name: ${_param:external_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-floating:
+          enabled: true
+          type: ovs_bridge
+          mtu: ${_param:interface_mtu}
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          mtu: ${_param:interface_mtu}
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-mesh:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:tenant_interface}
+        float-to-ex:
+          enabled: true
+          type: ovs_port
+          mtu: ${_param:interface_mtu}
+          bridge: br-floating
+        br-ex:
+          enabled: true
+          type: bridge
+          mtu: ${_param:interface_mtu}
+          address: ${_param:external_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:external_interface}
+          use_ovs_ports:
+          - float-to-ex
\ No newline at end of file
diff --git a/classes/cluster/sl_os_ovs/openstack/init.yml b/classes/cluster/sl_os_ovs/openstack/init.yml
index 280ddce..6c1ddb6 100644
--- a/classes/cluster/sl_os_ovs/openstack/init.yml
+++ b/classes/cluster/sl_os_ovs/openstack/init.yml
@@ -1,7 +1,9 @@
 parameters:
   _param:
-    openstack_proxy_address: 172.16.10.121
-    openstack_proxy_node01_address: 172.16.10.121
+    openstack_proxy_hostname: prx
+    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
+    openstack_proxy_node01_hostname: prx01
+    openstack_proxy_node01_address: ${_param:infra_config_address}
     openstack_control_hostname: ctl
     openstack_control_node01_hostname: ctl01
     openstack_control_node02_hostname: ctl02
@@ -10,6 +12,10 @@
     openstack_control_node01_address: 172.16.10.101
     openstack_control_node02_address: 172.16.10.102
     openstack_control_node03_address: 172.16.10.103
+    openstack_gateway_hostname: gtw
+    openstack_gateway_address: ${_param:openstack_gateway_node01_address}
+    openstack_gateway_node01_hostname: gtw01
+    openstack_gateway_node01_address: 172.16.10.110
     openstack_database_address: ${_param:openstack_control_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
@@ -94,40 +100,41 @@
         prx:
           address: ${_param:openstack_proxy_address}
           names:
-          - prx
-          - prx.${_param:cluster_domain}
+          - ${_param:openstack_proxy_hostname}
+          - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
         prx01:
           address: ${_param:openstack_proxy_node01_address}
           names:
-          - prx01
-          - prx01.${_param:cluster_domain}
+          - ${_param:openstack_proxy_node01_hostname}
+          - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
         ctl:
           address: ${_param:openstack_control_address}
           names:
-          - ctl
-          - ctl.${_param:cluster_domain}
+          - ${_param:openstack_control_hostname}
+          - ${_param:openstack_control_hostname}.${_param:cluster_domain}
         ctl01:
           address: ${_param:openstack_control_node01_address}
           names:
-          - ctl01
-          - ctl01.${_param:cluster_domain}
+          - ${_param:openstack_control_node01_hostname}
+          - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
         ctl02:
           address: ${_param:openstack_control_node02_address}
           names:
-          - ctl02
-          - ctl02.${_param:cluster_domain}
+          - ${_param:openstack_control_node02_hostname}
+          - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
         ctl03:
           address: ${_param:openstack_control_node03_address}
           names:
-          - ctl03
-          - ctl03.${_param:cluster_domain}
-        cmp01:
-          address: 172.16.10.105
+          - ${_param:openstack_control_node03_hostname}
+          - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
+        gtw:
+          address: ${_param:openstack_gateway_address}
           names:
-          - cmp01
-          - cmp01.${_param:cluster_domain}
-        cmp02:
-          address: 172.16.10.106
+          - ${_param:openstack_gateway_hostname}
+          - ${_param:openstack_gateway_hostname}.${_param:cluster_domain}
+        gtw01:
+          address: ${_param:openstack_gateway_address}
           names:
-          - cmp02
-          - cmp02.${_param:cluster_domain}
+          - ${_param:openstack_gateway_hostname}
+          - ${_param:openstack_gateway_hostname}.${_param:cluster_domain}
+
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
index 0bbe57c..5bdbb9a 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
@@ -89,8 +89,9 @@
     keepalived_vip_virtual_router_id: 180
     keepalived_vip_password: TLrAYaAbAEZwXsp1
     keepalived_vip_interface: ens3
-    cluster_vip_address: ${_param:control_vip_address}
     control_vip_address: ${_param:cicd_control_address}
+    cluster_vip_address: ${_param:control_vip_address}
+    glusterfs_service_host: ${_param:control_vip_address}
     cluster_public_host: ${_param:control_vip_address}
     salt_api_password: Dnx3fapzHIcGuURdDck3DPv78V3ehwue
     # Docker images and versions
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
index 2241bae..6ad2afa 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
@@ -37,6 +37,7 @@
 - cluster.virtual-mcp-ocata-cicd.infra
 parameters:
   _param:
+    glusterfs_service_host: ${_param:cluster_vip_address}
     keepalived_vip_interface: ens4
     keepalived_openstack_telemetry_vip_interface: ens4
     linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
index 100bcd8..7d4f5f2 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
@@ -78,7 +78,6 @@
     nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
     neutron_version: ${_param:openstack_version}
     neutron_service_host: ${_param:cluster_vip_address}
-    glusterfs_service_host: ${_param:cluster_vip_address}
     designate_service_host: ${_param:cluster_vip_address}
     metadata_password: password
     mysql_admin_user: root
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/init.yml
index 16a9faf..8d3e10e 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/init.yml
@@ -16,10 +16,6 @@
     stacklight_log_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_address: ${_param:stacklight_monitor_address}
 
-
-    # Glusterfs
-    glusterfs_service_host: ${_param:stacklight_monitor_address}
-
     # Prometheus
     prometheus_control_address: ${_param:stacklight_monitor_address}
 
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/proxy.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/proxy.yml
index 956ee51..3b6d25e 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/proxy.yml
@@ -8,7 +8,7 @@
 - cluster.virtual-mcp-ocata-cicd.infra
 parameters:
   _param:
-    cluster_public_host: ${_param:prometheus_control_address}
+    #cluster_public_host: ${_param:prometheus_control_address}
     nginx_proxy_grafana_port: 15013
     nginx_proxy_ssl:
       enabled: true
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
index c5684a1..1270bbb 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
@@ -53,6 +53,8 @@
     kibana_elasticsearch_host: ${_param:cluster_vip_address}
     # Galera
     openstack_version: newton
+    # Glusterfs
+    glusterfs_service_host: ${_param:stacklight_monitor_address}
     # Grafana
     grafana_database_type: mysql
     grafana_database_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
index abc4a46..a115aac 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
@@ -46,6 +46,7 @@
 parameters:
   _param:
     keepalived_vip_interface: ens4
+    keepalived_openstack_telemetry_vip_address: 172.16.10.252
     cluster_vip_address: ${_param:openstack_control_address}
     cluster_local_address: ${_param:single_address}
     cluster_node01_hostname: ctl01
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index 8ad024a..2887191 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -45,6 +45,7 @@
 parameters:
   _param:
     keepalived_vip_interface: ens4
+    keepalived_openstack_telemetry_vip_address: 172.16.10.252
     cluster_vip_address: ${_param:openstack_control_address}
     cluster_local_address: ${_param:single_address}
     cluster_node01_hostname: ctl01
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
index de0b3c0..fc227cc 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
@@ -5,6 +5,8 @@
     openstack_region: RegionOne
     admin_email: root@localhost
     cluster_public_host: 172.16.10.254
+    neutron_public_protocol: http
+    cluster_public_protocol: http
     opencontrail_version: 3.0
     opencontrail_compute_dns: 8.8.8.8
     opencontrail_stats_password: contrail123
@@ -187,4 +189,4 @@
       user:
         root:
           name: root
-          password: false
\ No newline at end of file
+          password: false
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
index dd6fc11..2403464 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
@@ -39,6 +39,7 @@
 parameters:
   _param:
     keepalived_vip_interface: ens4
+    keepalived_openstack_telemetry_vip_address: 172.16.10.252
     keepalived_openstack_telemetry_vip_interface: ens4
   linux:
     system:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 728b82e..4282d49 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -44,6 +44,8 @@
           image: ${_param:kubernetes_calicoctl_image}
         cni:
           image: ${_param:kubernetes_calico_cni_image}
+        contrail_cni:
+          image: ${_param:kubernetes_contrail_cni_image}
     common:
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index 5a5a26d..de711cc 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -23,6 +23,8 @@
     kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
     kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
     kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
+    kubernetes_opencontrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
+
     kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
     kubernetes_virtlet_image: mirantis/virtlet:latest
     kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml
index 98f1154..ca478b9 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/control.yml
@@ -36,6 +36,7 @@
 parameters:
   _param:
     keepalived_vip_interface: ens4
+    keepalived_openstack_telemetry_vip_address: 172.16.10.252
     keepalived_openstack_telemetry_vip_interface: ens4
   linux:
     system:
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
index 9a94459..9f0477a 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
@@ -33,6 +33,7 @@
 parameters:
   _param:
     keepalived_vip_interface: ens4
+    keepalived_openstack_telemetry_vip_address: 172.16.10.252
     keepalived_openstack_telemetry_vip_interface: ens4
   linux:
     system:
diff --git a/scripts/stacklightv2_infra_install.sh b/scripts/stacklightv2_infra_install.sh
index 8ce538a..12cef91 100755
--- a/scripts/stacklightv2_infra_install.sh
+++ b/scripts/stacklightv2_infra_install.sh
@@ -16,6 +16,9 @@
 # Configure Telegraf
 salt -C 'I@telegraf:agent or I@telegraf:remote_agent' state.sls telegraf
 
+# Configure Prometheus exporters
+salt -C 'I@prometheus:exporters' state.sls prometheus
+
 # Configure log_collector
 salt -C 'I@heka:log_collector' state.sls heka.log_collector