diff --git a/classes/cluster/sl-os-contrail/infra/config.yml b/classes/cluster/sl-os-contrail/infra/config.yml
index 79d69bf..6db02be 100755
--- a/classes/cluster/sl-os-contrail/infra/config.yml
+++ b/classes/cluster/sl-os-contrail/infra/config.yml
@@ -1,11 +1,8 @@
 classes:
 - service.git.client
-- system.docker.client
-- system.docker.host
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.docker
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
@@ -29,26 +26,22 @@
 - system.keystone.client.service.nova-ec2
 - system.keystone.client.service.nova21
 - system.keystone.client.service.nova-placement
-- system.mysql.client
-- system.mysql.client.database.cinder
-- system.mysql.client.database.glance
-- system.mysql.client.database.heat
-- system.mysql.client.database.keystone
-- system.mysql.client.database.nova
-- system.mysql.client.database.nova_api
-- system.mysql.client.database.neutron
+- system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
+- system.reclass.storage.system.stacklightv2_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_proxy_single
 - cluster.sl-os-contrail.openstack.proxy
 - cluster.sl-os-contrail.stacklight.proxy
-- cluster.sl-os-contrail.openstack.dashboard
 - cluster.sl-os-contrail
 parameters:
   _param:
     reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
     reclass_data_revision: master
-    reclass_config_master: ${_param:infra_config_deploy_address}
-    single_address: ${_param:infra_config_address}
+    reclass_config_master: 192.168.10.90
+    single_address: 172.16.10.90
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
@@ -67,7 +60,7 @@
       site:
         nginx_proxy_openstack_web:
           proxy:
-            host: cfg
+            host: prx
         nginx_proxy_openstack_api_heat_cfn:
           enabled: false
   salt:
@@ -125,7 +118,7 @@
           expression: <<node_hostname>>__equals__ntw03
           cluster_param:
             opencontrail_control_node03_address:
-              value_template: <<node_control_ip>>  
+              value_template: <<node_control_ip>>
         openstack_compute:
           expression: <<node_hostname>>__startswith__cmp
           node_class:
@@ -136,89 +129,55 @@
               value_template: <<node_tenant_ip>>
             external_address:
               value_template: <<node_external_ip>>
-        stacklight_monitor01:
+        stacklight_monitor_node01:
           expression: <<node_hostname>>__equals__mon01
           cluster_param:
             stacklight_monitor_node01_address:
               value_template: <<node_control_ip>>
-        stacklight_monitor02:
+        stacklight_monitor_node02:
           expression: <<node_hostname>>__equals__mon02
           cluster_param:
             stacklight_monitor_node02_address:
               value_template: <<node_control_ip>>
-        stacklight_monitor03:
+        stacklight_monitor_node03:
           expression: <<node_hostname>>__equals__mon03
           cluster_param:
             stacklight_monitor_node03_address:
               value_template: <<node_control_ip>>
+        openstack_dashboard:
+          expression: <<node_hostname>>__startswith__prx
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.openstack.dashboard
+              - cluster.<<node_cluster>>.openstack.proxy
+          cluster_param:
+            openstack_proxy_node01_address:
+              value_template: <<node_control_ip>>
       node:
-        prx_node:
-          name: ${_param:openstack_proxy_node01_hostname}
-          domain: ${_param:cluster_domain}
-          classes:
-          - cluster.${_param:cluster_name}.stacklight.proxy
-          params:
-            salt_master_host: ${_param:infra_config_deploy_address}
-            linux_system_codename: xenial
-            single_address: ${_param:openstack_proxy_node01_address}
-        stacklight_server_node01:
-          name: ${_param:stacklight_monitor_node01_hostname}
-          domain: ${_param:cluster_domain}
-          classes:
-          - system.docker.swarm.master
-          - cluster.${_param:cluster_name}.stacklight.client
-          - cluster.${_param:cluster_name}.stacklight.server
-          params:
-            salt_master_host: ${_param:infra_config_deploy_address}
-            linux_system_codename: xenial
-            single_address: ${_param:stacklight_monitor_node01_address}
-            keepalived_vip_priority: 100
-        stacklight_server_node02:
-          name: ${_param:stacklight_monitor_node02_hostname}
-          domain: ${_param:cluster_domain}
-          classes:
-          - system.docker.swarm.manager
-          - cluster.${_param:cluster_name}.stacklight.server
-          params:
-            salt_master_host: ${_param:infra_config_deploy_address}
-            linux_system_codename: xenial
-            single_address: ${_param:stacklight_monitor_node02_address}
-            keepalived_vip_priority: 101
-        stacklight_server_node03:
-          name: ${_param:stacklight_monitor_node03_hostname}
-          domain: ${_param:cluster_domain}
-          classes:
-          - system.docker.swarm.manager
-          - cluster.${_param:cluster_name}.stacklight.server
-          params:
-            salt_master_host: ${_param:infra_config_deploy_address}
-            linux_system_codename: xenial
-            single_address: ${_param:stacklight_monitor_node03_address}
-            keepalived_vip_priority: 102
-        opencontrail_control_node01:
-          params:
-            rabbitmq_cluster_role: master
-        opencontrail_control_node02:
-          params:
-            rabbitmq_cluster_role: slave
-        opencontrail_control_node03:
-          params:
-            rabbitmq_cluster_role: slave
         openstack_control_node01:
           classes:
           - service.galera.master.cluster
           params:
-            linux_system_codename: xenial
             mysql_cluster_role: master
+            linux_system_codename: xenial
         openstack_control_node02:
           classes:
           - service.galera.slave.cluster
           params:
-            linux_system_codename: xenial
             mysql_cluster_role: slave
+            linux_system_codename: xenial
         openstack_control_node03:
           classes:
           - service.galera.slave.cluster
           params:
-            linux_system_codename: xenial
             mysql_cluster_role: slave
+            linux_system_codename: xenial
+        stacklight_server_node01:
+          classes:
+          - system.influxdb.server.single
+          - system.influxdb.database.stacklight
+        openstack_proxy_node01:
+          classes:
+          - cluster.sl-os-contrail.openstack.proxy
+          params:
+            linux_system_codename: xenial
diff --git a/classes/cluster/sl-os-contrail/infra/init.yml b/classes/cluster/sl-os-contrail/infra/init.yml
index 5c878d4..6c44489 100755
--- a/classes/cluster/sl-os-contrail/infra/init.yml
+++ b/classes/cluster/sl-os-contrail/infra/init.yml
@@ -1,13 +1,9 @@
 parameters:
-  _jenkins:
-    tests_enabled: false
   _param:
     cluster_domain: sl-os-contrail.local
     cluster_name: sl-os-contrail
-    infra_config_deploy_address: 192.168.10.90
-    infra_config_address: 172.16.10.100
     infra_config_hostname: cfg01
-    linux_system_repo_mcp_salt_version: nightly
+    infra_config_address: 172.16.10.90
   linux:
     network:
       host: