diff --git a/classes/cluster/drivetrain_ha_clusters/cicd/init.yml b/classes/cluster/drivetrain_ha_clusters/cicd/init.yml
index 816b66f..b4740bf 100644
--- a/classes/cluster/drivetrain_ha_clusters/cicd/init.yml
+++ b/classes/cluster/drivetrain_ha_clusters/cicd/init.yml
@@ -1,8 +1,12 @@
 parameters:
   _param:
+    cicd_control_hostname: cid
     cicd_control_address: 172.16.10.254
+    cicd_control_node01_hostname: cid01
     cicd_control_node01_address: 172.16.10.11
+    cicd_control_node02_hostname: cid02
     cicd_control_node02_address: 172.16.10.12
+    cicd_control_node03_hostname: cid03
     cicd_control_node03_address: 172.16.10.13
 
     # CI/CD control infrastructure
diff --git a/classes/cluster/drivetrain_ha_clusters/infra/config.yml b/classes/cluster/drivetrain_ha_clusters/infra/config.yml
index d53cf1e..4cb7db5 100644
--- a/classes/cluster/drivetrain_ha_clusters/infra/config.yml
+++ b/classes/cluster/drivetrain_ha_clusters/infra/config.yml
@@ -17,8 +17,10 @@
     salt_master_host: ${_param:infra_config_deploy_address}
     salt_api_password: hovno12345!
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+    cluster_public_host: ${_param:infra_config_address}
   salt:
     master:
+      order_masters: true
       reactor:
         reclass/minion/classify:
         - salt://reclass/reactor/node_register.sls
@@ -44,7 +46,9 @@
             salt_master_host:
               value_template: <<node_master_ip>>
         infra_config:
-          expression: <<node_hostname>>__startswith__cfg
+          expression:
+          - <<node_hostname>>__startswith__cfg
+          - <<node_cluster>>__equals__drivetrain_ha_clusters
           cluster_param:
             infra_config_address:
               value_template: <<node_control_ip>>
diff --git a/classes/cluster/k8s_aio_calico/kubernetes/compute.yml b/classes/cluster/k8s_aio_calico/kubernetes/compute.yml
index 81ea8d1..56843a7 100644
--- a/classes/cluster/k8s_aio_calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s_aio_calico/kubernetes/compute.yml
@@ -6,10 +6,10 @@
 - cluster.k8s_aio_calico
 parameters:
   _param:
-    kubernetes_calicoctl_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/ctl:latest
-    kubernetes_calico_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/node:latest
-    kubernetes_calico_cni_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/cni:latest
-    kubernetes_hyperkube_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
+    kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+    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_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
   docker:
     host:
       pkgs:
diff --git a/classes/cluster/k8s_aio_calico/kubernetes/init.yml b/classes/cluster/k8s_aio_calico/kubernetes/init.yml
index 7533873..dbe4512 100644
--- a/classes/cluster/k8s_aio_calico/kubernetes/init.yml
+++ b/classes/cluster/k8s_aio_calico/kubernetes/init.yml
@@ -17,7 +17,7 @@
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
     kubernetes_control_hostname: ctl
-    kubernetes_control_address: 172.16.10.253
+    kubernetes_control_address: 192.168.10.253
     kubernetes_control_node01_hostname: ctl01
     kubernetes_control_node02_hostname: ctl02
     kubernetes_control_node03_hostname: ctl03
diff --git a/classes/cluster/k8s_aio_contrail/kubernetes/control.yml b/classes/cluster/k8s_aio_contrail/kubernetes/control.yml
index 13de790..304a82f 100644
--- a/classes/cluster/k8s_aio_contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s_aio_contrail/kubernetes/control.yml
@@ -8,7 +8,7 @@
 - cluster.overrides
 parameters:
   _param:
-    keepalived_vip_interface: vhost0
+    keepalived_vip_interface: ens3
     keepalived_vip_virtual_router_id: 60
   etcd:
     server:
diff --git a/classes/cluster/k8s_aio_contrail/kubernetes/init.yml b/classes/cluster/k8s_aio_contrail/kubernetes/init.yml
index acc7e93..d79e50b 100644
--- a/classes/cluster/k8s_aio_contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s_aio_contrail/kubernetes/init.yml
@@ -26,7 +26,7 @@
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
     kubernetes_control_hostname: ctl
-    kubernetes_control_address: 172.16.10.253
+    kubernetes_control_address: 192.168.10.253
     kubernetes_control_node01_hostname: ctl01
     kubernetes_control_node02_hostname: ctl02
     kubernetes_control_node03_hostname: ctl03
diff --git a/classes/cluster/k8s_ha_calico/kubernetes/compute.yml b/classes/cluster/k8s_ha_calico/kubernetes/compute.yml
index 3bb7828..8716a14 100644
--- a/classes/cluster/k8s_ha_calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s_ha_calico/kubernetes/compute.yml
@@ -6,10 +6,10 @@
 - cluster.k8s_ha_calico
 parameters:
   _param:
-    kubernetes_calicoctl_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/ctl:latest
-    kubernetes_calico_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/node:latest
-    kubernetes_calico_cni_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/cni:latest
-    kubernetes_hyperkube_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
+    kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+    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_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
   docker:
     host:
       pkgs:
diff --git a/classes/cluster/k8s_ha_calico/kubernetes/init.yml b/classes/cluster/k8s_ha_calico/kubernetes/init.yml
index c3c13a4..307ebd0 100644
--- a/classes/cluster/k8s_ha_calico/kubernetes/init.yml
+++ b/classes/cluster/k8s_ha_calico/kubernetes/init.yml
@@ -17,7 +17,7 @@
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
     kubernetes_control_hostname: ctl
-    kubernetes_control_address: 172.16.10.253
+    kubernetes_control_address: 192.168.10.253
     kubernetes_control_node01_hostname: ctl01
     kubernetes_control_node02_hostname: ctl02
     kubernetes_control_node03_hostname: ctl03
diff --git a/classes/cluster/k8s_ha_calico_syndic/infra/config.yml b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
new file mode 100644
index 0000000..0bd7355
--- /dev/null
+++ b/classes/cluster/k8s_ha_calico_syndic/infra/config.yml
@@ -0,0 +1,81 @@
+classes:
+- system.linux.system.repo.ubuntu
+- system.openssh.client.lab
+- system.salt.master.pkg
+- system.salt.minion.ca.salt_master
+- system.salt.master.api
+- system.salt.minion.cert.k8s_server
+- system.reclass.storage.salt
+- system.reclass.storage.system.kubernetes_control_cluster
+- cluster.k8s_ha_calico_syndic
+parameters:
+  _param:
+    salt_master_base_environment: prd
+    reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab.git"
+    reclass_data_revision: master
+    reclass_config_master: ${_param:infra_config_deploy_address}
+    single_address: ${_param:infra_config_address}
+    linux_system_codename: xenial
+    salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
+    salt_master_host: 127.0.0.1
+  salt:
+    syndic:
+      enabled: true
+      master:
+        host: ${_param:salt_syndic_master_address}
+    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
+          - <<node_cluster>>__equals__k8s_ha_calico_syndic
+          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>>
+        kubernetes_control01:
+          expression:
+          - <<node_hostname>>__equals__ctl01
+          - <<node_cluster>>__equals__k8s_ha_calico_syndic
+          cluster_param:
+            kubernetes_control_node01_address:
+              value_template: <<node_control_ip>>
+        kubernetes_control02:
+          expression:
+          - <<node_hostname>>__equals__ctl02
+          - <<node_cluster>>__equals__k8s_ha_calico_syndic
+          cluster_param:
+            kubernetes_control_node02_address:
+              value_template: <<node_control_ip>>
+        kubernetes_control03:
+          expression:
+          - <<node_hostname>>__equals__ctl03
+          - <<node_cluster>>__equals__k8s_ha_calico_syndic
+          cluster_param:
+            kubernetes_control_node03_address:
+              value_template: <<node_control_ip>>
+        kubernetes_compute:
+          expression:
+          - <<node_hostname>>__startswith__cmp
+          - <<node_cluster>>__equals__k8s_ha_calico_syndic
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.kubernetes.compute
+
diff --git a/classes/cluster/k8s_ha_calico_syndic/infra/init.yml b/classes/cluster/k8s_ha_calico_syndic/infra/init.yml
new file mode 100644
index 0000000..afc025c
--- /dev/null
+++ b/classes/cluster/k8s_ha_calico_syndic/infra/init.yml
@@ -0,0 +1,41 @@
+classes:
+- system.linux.system.single
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.ubuntu
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- system.openssh.server.team.k8s_team
+parameters:
+  _param:
+    # infra service addresses
+    infra_config_hostname: cfg01
+    infra_config_address: 172.16.10.90
+    infra_config_deploy_address: 192.168.10.90
+    salt_syndic_master_address: 192.168.10.90
+
+    cluster_domain: virtual-mcp11-k8s-calico.local
+    cluster_name: virtual-mcp11-k8s-calico
+    apt_mk_version: nightly
+    primary_interface: ens3
+  linux:
+    network:
+      host:
+        cfg01:
+          address: ${_param:infra_config_address}
+          names:
+          - ${_param:infra_config_hostname}
+          - ${_param:infra_config_hostname}.${_param:cluster_domain}
+      interface:
+        primary_interface:
+          enabled: true
+          type: eth
+          proto: dhcp
+          #proto: static
+          #name: ${_param:primary_interface}
+          #address: ${_param:single_address}
+          #netmask: 255.255.255.0
+    system:
+      name: ${_param:infra_config_hostname}
+      domain: ${_param:cluster_domain}
diff --git a/classes/cluster/k8s_ha_calico_syndic/init.yml b/classes/cluster/k8s_ha_calico_syndic/init.yml
new file mode 100644
index 0000000..7b55c9f
--- /dev/null
+++ b/classes/cluster/k8s_ha_calico_syndic/init.yml
@@ -0,0 +1,4 @@
+classes:
+- cluster.k8s_ha_calico_syndic.kubernetes
+- cluster.k8s_ha_calico_syndic.infra
+- cluster.overrides
diff --git a/classes/cluster/k8s_ha_calico_syndic/kubernetes/compute.yml b/classes/cluster/k8s_ha_calico_syndic/kubernetes/compute.yml
new file mode 100644
index 0000000..0be36d0
--- /dev/null
+++ b/classes/cluster/k8s_ha_calico_syndic/kubernetes/compute.yml
@@ -0,0 +1,45 @@
+classes:
+- system.linux.system.repo.docker
+- system.kubernetes.pool.cluster
+- system.salt.minion.cert.k8s_client
+- system.salt.minion.cert.etcd_client
+- cluster.k8s_ha_calico_syndic
+parameters:
+  _param:
+    kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+    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_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
+  docker:
+    host:
+      pkgs:
+        - docker-engine=1.12.6-0~ubuntu-xenial
+        - python-docker
+  kubernetes:
+    pool:
+      network:
+        etcd:
+          ssl:
+            enabled: true
+        image: ${_param:kubernetes_calico_image}
+        calicoctl:
+          image: ${_param:kubernetes_calicoctl_image}
+        cni:
+          image: ${_param:kubernetes_calico_cni_image}
+    common:
+      hyperkube:
+        image: ${_param:kubernetes_hyperkube_image}
+  linux:
+    network:
+      resolv:
+        dns:
+          - 10.254.0.10
+          - 172.18.176.4
+          - 172.18.176.7
+      interface:
+        primary_interface:
+          route:
+            kubernetes_services:
+              address: 10.254.0.0
+              netmask: 255.255.0.0
+              gateway: ${_param:single_address}
diff --git a/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml b/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml
new file mode 100644
index 0000000..14772c9
--- /dev/null
+++ b/classes/cluster/k8s_ha_calico_syndic/kubernetes/control.yml
@@ -0,0 +1,39 @@
+classes:
+- service.etcd.server.cluster
+- system.haproxy.proxy.listen.kubernetes.apiserver
+- system.linux.system.repo.docker
+- system.salt.minion.cert.etcd_server
+- system.kubernetes.master.cluster
+- cluster.k8s_ha_calico_syndic.kubernetes.compute
+- cluster.k8s_ha_calico_syndic
+parameters:
+  _param:
+    keepalived_vip_interface: ${_param:primary_interface}
+    keepalived_vip_virtual_router_id: 60
+  etcd:
+    server:
+      source:
+        engine: docker_hybrid
+      ssl:
+        enabled: true
+      setup:
+        calico:
+          key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
+          value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
+  kubernetes:
+    master:
+      etcd:
+        ssl:
+          enabled: true
+      network:
+        etcd:
+          ssl:
+            enabled: true
+      namespace:
+        netchecker:
+          enabled: true
+      addons:
+        netchecker:
+          enabled: true
+        helm:
+          enabled: true
diff --git a/classes/cluster/k8s_ha_calico_syndic/kubernetes/init.yml b/classes/cluster/k8s_ha_calico_syndic/kubernetes/init.yml
new file mode 100644
index 0000000..307ebd0
--- /dev/null
+++ b/classes/cluster/k8s_ha_calico_syndic/kubernetes/init.yml
@@ -0,0 +1,103 @@
+parameters:
+  _param:
+    salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
+    salt_minion_ca_authority: salt_master_ca
+
+    # kubernetes settings
+    kubernetes_admin_user: admin
+    kubernetes_admin_password: sbPfel23ZigJF3Bm
+    kubernetes_admin_token: PpP6Mm3pAoPVqcKOKUu0x1dh7b1959Fi
+    kubernetes_kubelet_token: JJ2PKHxjiU6EYvIt18BqwdSK1HvWh8pt
+    kubernetes_kube-proxy_token: jT0hJk9L6cIw5UpYDNhsRwcj3Z2n62B6
+    kubernetes_scheduler_token: VgkUHfrW07zNxrb0ucFyX7NBnSJN9Xp6
+    kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
+    kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
+    etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
+
+    # addresses and hostnames
+    kubernetes_internal_api_address: 10.254.0.1
+    kubernetes_control_hostname: ctl
+    kubernetes_control_address: 192.168.10.253
+    kubernetes_control_node01_hostname: ctl01
+    kubernetes_control_node02_hostname: ctl02
+    kubernetes_control_node03_hostname: ctl03
+    kubernetes_compute_node01_hostname: cmp01
+    kubernetes_compute_node02_hostname: cmp02
+    kubernetes_control_node01_address: 172.16.10.101
+    kubernetes_control_node02_address: 172.16.10.102
+    kubernetes_control_node03_address: 172.16.10.103
+    kubernetes_compute_node01_address: 172.16.10.105
+    kubernetes_compute_node02_address: 172.16.10.106
+    kubernetes_proxy_node01_hostname: prx01
+    kubernetes_proxy_node01_address: 172.16.10.121
+
+    cluster_vip_address: ${_param:kubernetes_control_address}
+    cluster_local_address: ${_param:single_address}
+
+    # etcd stuff
+    cluster_node01_hostname: ${_param:kubernetes_control_node01_hostname}
+    cluster_node01_address: ${_param:kubernetes_control_node01_address}
+    cluster_node01_port: 4001
+    cluster_node02_hostname: ${_param:kubernetes_control_node02_hostname}
+    cluster_node02_address: ${_param:kubernetes_control_node02_address}
+    cluster_node02_port: 4001
+    cluster_node03_hostname: ${_param:kubernetes_control_node03_hostname}
+    cluster_node03_address: ${_param:kubernetes_control_node03_address}
+    cluster_node03_port: 4001
+
+    # calico
+    calico_private_network: 192.168.0.0
+    calico_private_netmask: 16
+
+  linux:
+    network:
+      host:
+        ctl:
+          address: ${_param:kubernetes_control_address}
+          names:
+          - ${_param:kubernetes_control_hostname}
+          - ${_param:kubernetes_control_hostname}.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:kubernetes_control_node01_address}
+          names:
+          - ${_param:kubernetes_control_node01_hostname}
+          - ${_param:kubernetes_control_node01_hostname}.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:kubernetes_control_node02_address}
+          names:
+          - ${_param:kubernetes_control_node02_hostname}
+          - ${_param:kubernetes_control_node02_hostname}.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:kubernetes_control_node03_address}
+          names:
+          - ${_param:kubernetes_control_node03_hostname}
+          - ${_param:kubernetes_control_node03_hostname}.${_param:cluster_domain}
+        cmp01:
+          address: ${_param:kubernetes_compute_node01_address}
+          names:
+          - ${_param:kubernetes_compute_node01_hostname}
+          - ${_param:kubernetes_compute_node01_hostname}.${_param:cluster_domain}
+        cmp02:
+          address: ${_param:kubernetes_compute_node02_address}
+          names:
+          - ${_param:kubernetes_compute_node02_hostname}
+          - ${_param:kubernetes_compute_node02_hostname}.${_param:cluster_domain}
+        prx01:
+          address: ${_param:kubernetes_proxy_node01_address}
+          names:
+          - ${_param:kubernetes_proxy_node01_hostname}
+          - ${_param:kubernetes_proxy_node01_hostname}.${_param:cluster_domain}
+    system:
+      rc:
+        local: |
+          #!/bin/sh -e
+          #
+          # rc.local
+          #
+          ######### This file is managed by Salt! ##########
+          # This script is executed at the end of each multiuser runlevel.
+          # Make sure that the script will "exit 0" on success or any other
+          # value on error.
+          #
+          ip r a 10.254.0.0/16 dev ens3
+          exit 0
diff --git a/classes/cluster/k8s_ha_contrail/infra/config.yml b/classes/cluster/k8s_ha_contrail/infra/config.yml
index 30e09e7..c250b44 100644
--- a/classes/cluster/k8s_ha_contrail/infra/config.yml
+++ b/classes/cluster/k8s_ha_contrail/infra/config.yml
@@ -45,6 +45,8 @@
               value_template: <<node_os>>
             salt_master_host:
               value_template: <<node_master_ip>>
+            node_deploy_ip:
+              value_template: <<node_deploy_ip>>
         infra_config:
           expression: <<node_hostname>>__startswith__cfg
           cluster_param:
@@ -69,6 +71,21 @@
           cluster_param:
             kubernetes_control_node03_address:
               value_template: <<node_control_ip>>
+        etcd_control01:
+          expression: <<node_hostname>>__equals__ctl01
+          cluster_param:
+            etcd_control_node01_address:
+              value_template: <<node_deploy_ip>>
+        etcd_control02:
+          expression: <<node_hostname>>__equals__ctl02
+          cluster_param:
+            etcd_control_node02_address:
+              value_template: <<node_deploy_ip>>
+        etcd_control03:
+          expression: <<node_hostname>>__equals__ctl03
+          cluster_param:
+            etcd_control_node03_address:
+              value_template: <<node_deploy_ip>>
         opencontrail_control01:
           expression: <<node_hostname>>__equals__ntw01
           cluster_param:
diff --git a/classes/cluster/k8s_ha_contrail/kubernetes/control.yml b/classes/cluster/k8s_ha_contrail/kubernetes/control.yml
index 2e8fd73..198b6ab 100644
--- a/classes/cluster/k8s_ha_contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s_ha_contrail/kubernetes/control.yml
@@ -8,7 +8,7 @@
 - cluster.k8s_ha_contrail
 parameters:
   _param:
-    keepalived_vip_interface: vhost0
+    keepalived_vip_interface: ens3
     keepalived_vip_virtual_router_id: 60
   etcd:
     server:
diff --git a/classes/cluster/k8s_ha_contrail/kubernetes/init.yml b/classes/cluster/k8s_ha_contrail/kubernetes/init.yml
index d999c6b..d71de79 100644
--- a/classes/cluster/k8s_ha_contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s_ha_contrail/kubernetes/init.yml
@@ -26,7 +26,7 @@
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
     kubernetes_control_hostname: ctl
-    kubernetes_control_address: 172.16.10.253
+    kubernetes_control_address: 192.168.10.253
     kubernetes_control_node01_hostname: ctl01
     kubernetes_control_node02_hostname: ctl02
     kubernetes_control_node03_hostname: ctl03
diff --git a/classes/cluster/os_aio_contrail/infra/config.yml b/classes/cluster/os_aio_contrail/infra/config.yml
index 1615fd4..4214661 100755
--- a/classes/cluster/os_aio_contrail/infra/config.yml
+++ b/classes/cluster/os_aio_contrail/infra/config.yml
@@ -15,13 +15,10 @@
 - system.keystone.client.service.nova21
 - system.keystone.client.service.glare
 - system.keystone.client.service.cinder3
-- system.keystone.client.service.designate
-- system.mysql.client.single
-- system.reclass.storage.system.openstack_control_cluster
+# system.keystone.client.service.designate
+#- system.mysql.client.single
+- system.reclass.storage.system.openstack_control_single
 - system.reclass.storage.system.opencontrail_control_cluster
-- system.reclass.storage.system.openstack_compute_multi
-- system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.openstack_proxy_single
 - cluster.os_aio_contrail.openstack.proxy
 - cluster.os_aio_contrail
 parameters:
@@ -48,32 +45,62 @@
       site:
         nginx_proxy_openstack_web:
           proxy:
-            host: prx
+            host: ${_param:openstack_control_address}
         nginx_proxy_openstack_api_heat_cfn:
           enabled: false
+  salt:
+    master:
+      reactor:
+        reclass/minion/classify:
+        - salt://reclass/reactor/node_register.sls
   reclass:
     storage:
-      node:
-        openstack_control_node01:
-          classes:
-          - service.galera.master.cluster
-          params:
-            mysql_cluster_role: master
-            linux_system_codename: xenial
-        openstack_control_node02:
-          classes:
-          - service.galera.slave.cluster
-          params:
-            mysql_cluster_role: slave
-            linux_system_codename: xenial
-        openstack_control_node03:
-          classes:
-          - service.galera.slave.cluster
-          params:
-            mysql_cluster_role: slave
-            linux_system_codename: xenial
-        openstack_proxy_node01:
-          classes:
-          - cluster.os_aio_contrail.openstack.proxy
-          params:
-            linux_system_codename: xenial
+      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>>
+        openstack_control01:
+          expression: <<node_hostname>>__equals__ctl01
+          cluster_param:
+            openstack_control_node01_address:
+              value_template: <<node_control_ip>>
+        opencontrail_control01:
+          expression: <<node_hostname>>__equals__ntw01
+          cluster_param:
+            opencontrail_control_node01_address:
+              value_template: <<node_control_ip>>
+        opencontrail_control02:
+          expression: <<node_hostname>>__equals__ntw02
+          cluster_param:
+            opencontrail_control_node02_address:
+              value_template: <<node_control_ip>>
+        opencontrail_control03:
+          expression: <<node_hostname>>__equals__ntw03
+          cluster_param:
+            opencontrail_control_node03_address:
+              value_template: <<node_control_ip>>  
+        openstack_compute:
+          expression: <<node_hostname>>__startswith__cmp
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.openstack.compute
+          node_param:
+            tenant_address:
+              value_template: <<node_tenant_ip>>
+            external_address:
+              value_template: <<node_external_ip>>
diff --git a/classes/cluster/os_aio_contrail/infra/init.yml b/classes/cluster/os_aio_contrail/infra/init.yml
index 5e41624..81b8485 100755
--- a/classes/cluster/os_aio_contrail/infra/init.yml
+++ b/classes/cluster/os_aio_contrail/infra/init.yml
@@ -2,8 +2,8 @@
   _param:
     cluster_domain: os_aio_contrail.local
     cluster_name: os_aio_contrail
-    infra_config_deploy_address: 192.168.10.100
-    infra_config_address: 172.16.10.100
+    infra_config_deploy_address: 192.168.10.90
+    infra_config_address: 172.16.10.90
     infra_config_hostname: cfg01
     linux_system_repo_mcp_salt_version: nightly
   linux:
diff --git a/classes/cluster/os_aio_contrail/opencontrail/init.yml b/classes/cluster/os_aio_contrail/opencontrail/init.yml
index cee0b50..e5a5398 100644
--- a/classes/cluster/os_aio_contrail/opencontrail/init.yml
+++ b/classes/cluster/os_aio_contrail/opencontrail/init.yml
@@ -1,17 +1,17 @@
 parameters:
   _param:
-    opencontrail_analytics_address: ${_param:openstack_control_address}
-    opencontrail_analytics_node01_address: ${_param:openstack_control_node01_address}
-    opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
-    opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
+    opencontrail_analytics_address: ${_param:opencontrail_control_address}
+    opencontrail_analytics_node01_address: ${_param:opencontrail_control_node01_address}
+    opencontrail_analytics_node02_address: ${_param:opencontrail_control_node02_address}
+    opencontrail_analytics_node03_address: ${_param:opencontrail_control_node03_address}
 
     opencontrail_control_address: 172.16.10.252
     opencontrail_control_node01_hostname: ntw01
     opencontrail_control_node02_hostname: ntw02
     opencontrail_control_node03_hostname: ntw03
-    opencontrail_control_node01_address: 172.16.10.111
-    opencontrail_control_node02_address: 172.16.10.112
-    opencontrail_control_node03_address: 172.16.10.113
+    opencontrail_control_node01_address: 172.16.10.92
+    opencontrail_control_node02_address: 172.16.10.93
+    opencontrail_control_node03_address: 172.16.10.94
   linux:
     network:
       host:
diff --git a/classes/cluster/os_aio_contrail/openstack/compute.yml b/classes/cluster/os_aio_contrail/openstack/compute.yml
index 2c2f5b5..b96b26d 100755
--- a/classes/cluster/os_aio_contrail/openstack/compute.yml
+++ b/classes/cluster/os_aio_contrail/openstack/compute.yml
@@ -3,26 +3,111 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
-- system.nova.compute.cluster
 - system.opencontrail.compute.cluster
 - system.opencontrail.client.cluster
 - system.opencontrail.client.resource.virtual_router
-- service.opencontrail.compute.cluster
 - cluster.os_aio_contrail
 parameters:
   _param:
-    cluster_vip_address: ${_param:openstack_control_address}
     cluster_local_address: ${_param:single_address}
-    cluster_node01_hostname: ctl01
-    cluster_node01_address: ${_param:openstack_control_node01_address}
-    cluster_node02_hostname: ctl02
-    cluster_node02_address: ${_param:openstack_control_node02_address}
-    cluster_node03_hostname: ctl03
-    cluster_node03_address: ${_param:openstack_control_node03_address}
     opencontrail_compute_address: ${_param:single_address}
     opencontrail_compute_gateway: 172.16.10.1
     opencontrail_compute_iface: ens4
     linux_system_codename: xenial
+    control_address: ${_param:single_address}
+    nova_vncproxy_url: https://${_param:cluster_public_host}:6080
+    nova_compute_ssh_public: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCltIn93BcTMzNK/n2eBze6PyTkmIgdDkeXNR9X4DqE48Va80ojv2pq8xuaBxiNITJzyl+4p4UvTTXo+HmuX8qbHvqgMGXvuPUCpndEfb2r67f6vpMqPwMgBrUg2ZKgN4OsSDHU+H0dia0cEaTjz5pvbUy9lIsSyhrqOUVF9reJq+boAvVEedm8fUqiZuiejAw2D27+rRtdEPgsKMnh3626YEsr963q4rjU/JssV/iKMNu7mk2a+koOrJ+aHvcVU8zJjfA0YghoeVT/I3GLU/MB/4tD/RyR8GM+UYbI4sgAC7ZOCdQyHdJgnEzx3SJIwcS65U0T2XYvn2qXHXqJ9iGZ root@mirantis.com
+    nova_compute_avail_zone:
+    nova_compute_ssh_private: |
+      -----BEGIN RSA PRIVATE KEY-----
+      MIIEpAIBAAKCAQEApbSJ/dwXEzMzSv59ngc3uj8k5JiIHQ5HlzUfV+A6hOPFWvNK
+      I79qavMbmgcYjSEyc8pfuKeFL0016Ph5rl/Kmx76oDBl77j1AqZ3RH29q+u3+r6T
+      Kj8DIAa1INmSoDeDrEgx1Ph9HYmtHBGk48+ab21MvZSLEsoa6jlFRfa3iavm6AL1
+      RHnZvH1KombonowMNg9u/q0bXRD4LCjJ4d+tumBLK/et6uK41PybLFf4ijDbu5pN
+      mvpKDqyfmh73FVPMyY3wNGIIaHlU/yNxi1PzAf+LQ/0ckfBjPlGGyOLIAAu2TgnU
+      Mh3SYJxM8d0iSMHEuuVNE9l2L59qlx16ifYhmQIDAQABAoIBAQCYpqbwvE5tm59H
+      GQb0C8Ykx4LfLD1INx1wiLmlJKYEQihPTw0fvXj1qZvl21+cs9ZcoTRpUbn6B3EA
+      e9bs8sYc/P75j1x46LSdimkZKZUPygkk72d3ZbElUciOyKCxBDNDBQcTIQ9xpKFa
+      2E5Ep72npNMrWqp71r/Qwo20lEIkikIgAFPBgraxn5xIEdo59vzXNZsvyoIRi5p4
+      ayH9nWSAXdF1YU3p3ljtHD8o2G/0d2TWGmjrd9vztc6tgXjp0PF60vDNgcJiudBg
+      oNLDK/e5a44GJxlVDdJ84ESb7GprRStYmddl22xnI1SXlg87+t0QQwzR0CCtWXrz
+      neXkicHhAoGBANkG9tOZfErhSL/jmsElQTNPcMNQkPiJzEmOIpr6jgSzCusPT/QD
+      PnVwB42GC5+Zhd4e88BsTzECxPXmKk7r1cBKeJTg/ejgsrSfVAZqMsfhbp3mGOiH
+      jymF+zC6Urj5q/Zkof8pEFICtyA5zlHvZmsQL9PDiqXIWALki2JvIDPdAoGBAMN2
+      O+LWOM9qqwgSMaFY8VUdDdbmLx/ZMGWQ//Tx42WM8SU+cCpGTLDHHR0qC0gnRsV7
+      V63DySEwiHn4I1cQ/AMijRxuw4Dkgk2YMRlgsAbVWO7aIlECWjSg+pRjNeA7If4D
+      5L/gu6wZIv1vu8/fvOwRpPUzhWjGN5Z0RyvYc7btAoGALNnrmL9XmIIGbuGy0cfJ
+      OblpLHQyAas4tNrS/ARb5Uy7LOj1NRCWj96fMPhK3qjzqXvsFBBOLWrNGaR/id/j
+      ROIfGWWGE+KcDAgBbXH1HKnSGn+7FhMt2v79coyPG/s9NqaFdB4gaVJ2VgqcQQKg
+      v++QcssulCRbS/2/cJBWr2ECgYAJFCDL9G9HEwlGorGzcNIkxeiyppZhwFDDJuz8
+      j4+kU9uPg0rqa8F8JINxq1ZCz7A10/jKlWFuLTbpk2Dw1lUeQCiVvX9PKU30FLGT
+      IC6M4rPyxCb75EQUVbXN1p3WAGkfx0aEsweEgtZhNyNeEGJSBK/Iw8/agfpq/pOf
+      sboOMQKBgQClKmrAYKWnwdPPka3msyjl/AXDruR4XFvMlOPKbs3nYstolE7eR94F
+      7xDyBz85icFU0rceYQetwFH2p5tRL0GcUQhJmJFgIL0OXdCQvRNJrT3iS00N1aUo
+      SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
+      -----END RSA PRIVATE KEY-----
+  openssh:
+    client:
+      enabled: True
+      user: {}
+      stricthostkeychecking: False
+  nova:
+    compute:
+      version: ${_param:nova_version}
+      enabled: true
+      virtualization: ${_param:nova_compute_virtualization}
+      availability_zone: ${_param:nova_compute_avail_zone}
+      aggregates: ${_param:nova_aggregates}
+      heal_instance_info_cache_interval: 60
+      vncproxy_url: ${_param:nova_vncproxy_url}
+      bind:
+        vnc_address: ${_param:cluster_local_address}
+        vnc_port: 6080
+        vnc_name: 0.0.0.0
+      database:
+        engine: mysql
+        host: ${_param:openstack_database_address}
+        port: 3306
+        name: nova
+        user: nova
+        password: ${_param:mysql_nova_password}
+      identity:
+        engine: keystone
+        region: ${_param:openstack_region}
+        host: ${_param:cluster_vip_address}
+        port: 35357
+        user: nova
+        password: ${_param:keystone_nova_password}
+        tenant: service
+      message_queue:
+        engine: rabbitmq
+        port: 5672
+        user: openstack
+        password: ${_param:rabbitmq_openstack_password}
+        virtual_host: '/openstack'
+        host: ${_param:openstack_message_queue_node01_address}
+      image:
+        engine: glance
+        host: ${_param:cluster_vip_address}
+        port: 9292
+      network:
+        engine: neutron
+        region: ${_param:openstack_region}
+        host: ${_param:neutron_service_host}
+        port: 9696
+        user: neutron
+        tenant: service
+        password: ${_param:keystone_neutron_password}
+      user:
+        public_key: ${_param:nova_compute_ssh_public}
+        private_key: ${_param:nova_compute_ssh_private}
+      virtualization: kvm
+      heal_instance_info_cache_interval: 60
+      cache:
+        engine: memcached
+        members:
+        - host: ${_param:cluster_node01_address}
+          port: 11211
   linux:
     network:
       interface:
@@ -40,26 +125,11 @@
           - /usr/lib/contrail/if-vhost0
           use_interfaces:
           - ens4
-  nova:
-    compute:
-      vncproxy_url: http://${_param:cluster_vip_address}:6080
-      message_queue:
-        members:
-          - host: ${_param:openstack_control_node01_address}
-          - host: ${_param:openstack_control_node02_address}
-          - host: ${_param:openstack_control_node03_address}
-      notification:
-        driver: messagingv2
-        topics: "notifications"
-        notify_on:
-          state_change: vm_and_task_state
   ceilometer:
     agent:
       message_queue:
         members:
           - host: ${_param:openstack_control_node01_address}
-          - host: ${_param:openstack_control_node02_address}
-          - host: ${_param:openstack_control_node03_address}
   opencontrail:
     common:
       network:
diff --git a/classes/cluster/os_aio_contrail/openstack/control.yml b/classes/cluster/os_aio_contrail/openstack/control.yml
index 0f23675..84bb3c4 100755
--- a/classes/cluster/os_aio_contrail/openstack/control.yml
+++ b/classes/cluster/os_aio_contrail/openstack/control.yml
@@ -1,52 +1,36 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.memcached.server.single
-- system.rabbitmq.server.cluster
+- system.rabbitmq.server.single
 - system.rabbitmq.server.vhost.openstack
 - system.keystone.server.wsgi
-- system.keystone.server.cluster
-- system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
-- system.glusterfs.server.cluster
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
-- system.glance.control.cluster
-- system.nova.control.cluster
-- system.neutron.control.opencontrail.cluster
-- system.cinder.control.cluster
-- system.heat.server.cluster
-- system.designate.server.cluster
-- system.designate.server.backend.bind
-- system.ceilometer.server.cluster
-- system.aodh.server.cluster
-- system.galera.server.cluster
-- system.galera.server.database.aodh
-- system.galera.server.database.ceilometer
-- system.galera.server.database.cinder
-- system.galera.server.database.glance
-- system.galera.server.database.heat
-- system.galera.server.database.keystone
-- system.galera.server.database.nova
-- system.galera.server.database.designate
+- system.keystone.server.single
+- system.glance.control.single
+- system.nova.control.single
+- system.neutron.control.opencontrail.single
+- system.cinder.control.single
+- system.heat.server.single
+- system.ceilometer.server.single
+- system.aodh.server.single
+- system.mysql.client.database.keystone
+- system.mysql.client.database.glance
+- system.mysql.client.database.nova
+- system.mysql.client.database.nova_api
+- system.mysql.client.database.cinder
+- system.mysql.client.database.heat
+- service.mysql.server.single
+- system.mysql.client
+- cluster.os_aio_contrail.openstack.dashboard
 - cluster.os_aio_contrail
 parameters:
-  _param:
-    keepalived_vip_interface: ens4
-    cluster_vip_address: ${_param:openstack_control_address}
-    cluster_local_address: ${_param:single_address}
-    cluster_node01_hostname: ctl01
-    cluster_node01_address: ${_param:openstack_control_node01_address}
-    cluster_node02_hostname: ctl02
-    cluster_node02_address: ${_param:openstack_control_node02_address}
-    cluster_node03_hostname: ctl03
-    cluster_node03_address: ${_param:openstack_control_node03_address}
-    keepalived_openstack_telemetry_vip_interface: ens4
+  mysql:
+    server:
+      version: '5.6'
+      max_connections: 20000
   linux:
     system:
       package:
@@ -60,59 +44,54 @@
           proto: static
           address: ${_param:single_address}
           netmask: 255.255.255.0
-  keepalived:
-    cluster:
-      instance:
-        VIP:
-          virtual_router_id: 150
-  bind:
-    server:
-      control:
-        mgmt:
-          enabled: true
-          bind:
-            address: ${_param:single_address}
-            port: 953
-          allow:
-            - ${_param:openstack_control_node01_address}
-            - ${_param:openstack_control_node02_address}
-            - ${_param:openstack_control_node03_address}
-          keys:
-            - designate
+  # bind:
+  #   server:
+  #     control:
+  #       mgmt:
+  #         enabled: true
+  #         bind:
+  #           address: ${_param:single_address}
+  #           port: 953
+  #         allow:
+  #           - ${_param:openstack_control_node01_address}
+  #           - ${_param:openstack_control_node02_address}
+  #           - ${_param:openstack_control_node03_address}
+  #         keys:
+  #           - designate
   keystone:
     server:
       admin_email: ${_param:admin_email}
       notification:
         driver: messagingv2
         topics: "notifications"
-  designate:
-    server:
-      pools:
-        default:
-          description: 'test pool'
-          targets:
-            default:
-              description: 'test target1'
-            default1:
-              type: ${_param:designate_pool_target_type}
-              description: 'test target2'
-              masters: ${_param:designate_pool_target_masters}
-              options:
-                host: ${_param:openstack_control_node02_address}
-                port: 53
-                rndc_host: ${_param:openstack_control_node02_address}
-                rndc_port: 953
-                rndc_key_file: /etc/designate/rndc.key
-            default2:
-              type: ${_param:designate_pool_target_type}
-              description: 'test target3'
-              masters: ${_param:designate_pool_target_masters}
-              options:
-                host: ${_param:openstack_control_node03_address}
-                port: 53
-                rndc_host: ${_param:openstack_control_node03_address}
-                rndc_port: 953
-                rndc_key_file: /etc/designate/rndc.key
+  # designate:
+  #   server:
+  #     pools:
+  #       default:
+  #         description: 'test pool'
+  #         targets:
+  #           default:
+  #             description: 'test target1'
+  #           default1:
+  #             type: ${_param:designate_pool_target_type}
+  #             description: 'test target2'
+  #             masters: ${_param:designate_pool_target_masters}
+  #             options:
+  #               host: ${_param:openstack_control_node02_address}
+  #               port: 53
+  #               rndc_host: ${_param:openstack_control_node02_address}
+  #               rndc_port: 953
+  #               rndc_key_file: /etc/designate/rndc.key
+  #           default2:
+  #             type: ${_param:designate_pool_target_type}
+  #             description: 'test target3'
+  #             masters: ${_param:designate_pool_target_masters}
+  #             options:
+  #               host: ${_param:openstack_control_node03_address}
+  #               port: 53
+  #               rndc_host: ${_param:openstack_control_node03_address}
+  #               rndc_port: 953
+  #               rndc_key_file: /etc/designate/rndc.key
   glance:
     server:
       storage:
@@ -133,9 +112,9 @@
       cpu_allocation: 54
       bind:
         private_address: ${_param:cluster_local_address}
-        public_address: ${_param:cluster_vip_address}
+        public_address: ${_param:openstack_control_node01_address}
         novncproxy_port: 6080
-      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      vncproxy_url: http://${_param:openstack_control_node01_address}:6080
       cache:
         engine: memcached
         prefix: CACHE_NOVA
diff --git a/classes/cluster/os_aio_contrail/openstack/init.yml b/classes/cluster/os_aio_contrail/openstack/init.yml
index 20d4c9b..b3a0672 100755
--- a/classes/cluster/os_aio_contrail/openstack/init.yml
+++ b/classes/cluster/os_aio_contrail/openstack/init.yml
@@ -1,43 +1,25 @@
 parameters:
   _param:
-    openstack_proxy_address: 172.16.10.121
-    openstack_proxy_node01_hostname: prx01
-    openstack_proxy_node01_address: 172.16.10.121
-
-    openstack_control_address: 172.16.10.254
+    openstack_control_address: ${_param:openstack_control_node01_address}
     openstack_control_node01_hostname: ctl01
-    openstack_control_node02_hostname: ctl02
-    openstack_control_node03_hostname: ctl03
-    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_control_node01_address: 172.16.10.91
 
-    openstack_database_address: ${_param:openstack_control_address}
+    openstack_database_address: ${_param:openstack_control_node01_address}
     openstack_database_node01_hostname: dbs01
-    openstack_database_node02_hostname: dbs02
-    openstack_database_node03_hostname: dbs03
     openstack_database_node01_address: ${_param:openstack_control_node01_address}
-    openstack_database_node02_address: ${_param:openstack_control_node02_address}
-    openstack_database_node03_address: ${_param:openstack_control_node02_address}
-
-    openstack_message_queue_address: ${_param:openstack_control_address}
+    openstack_message_queue_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node01_hostname: msg01
-    openstack_message_queue_node02_hostname: msg02
-    openstack_message_queue_node03_hostname: msg03
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
-    openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
-    openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-
     openstack_compute_node01_hostname: cmp01
     openstack_compute_node02_hostname: cmp02
-    openstack_compute_node01_address: 172.16.10.105
-    openstack_compute_node02_address: 172.16.10.106
+    openstack_compute_node01_address: 172.16.10.95
+    openstack_compute_node02_address: 172.16.10.96
 
     openstack_version: ocata
     apt_mk_version: nightly
     openstack_region: RegionOne
     admin_email: root@localhost
-    cluster_public_host: 172.16.10.254
+    cluster_public_host: ${_param:openstack_control_node01_address}
     opencontrail_version: 3.0
     opencontrail_compute_dns: 8.8.8.8
     opencontrail_stats_password: contrail123
@@ -48,33 +30,7 @@
     rabbitmq_admin_password: workshop
     rabbitmq_openstack_password: workshop
     rabbitmq_cold_password: workshop
-    designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8
-    designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
-    designate_pool_ns_records:
-      - hostname: 'ns1.example.org.'
-        priority: 10
-    designate_pool_nameservers:
-      - host: ${_param:openstack_control_node01_address}
-        port: 53
-      - host: ${_param:openstack_control_node02_address}
-        port: 53
-      - host: ${_param:openstack_control_node03_address}
-        port: 53
-    designate_pool_target_type: bind9
-    designate_pool_target_masters:
-      - host: ${_param:openstack_control_node01_address}
-        port: 5354
-      - host: ${_param:openstack_control_node02_address}
-        port: 5354
-      - host: ${_param:openstack_control_node03_address}
-        port: 5354
-    designate_pool_target_options:
-      host: ${_param:openstack_control_node01_address}
-      port: 53
-      rndc_host: ${_param:openstack_control_node01_address}
-      rndc_port: 953
-      rndc_key_file: /etc/designate/rndc.key
-    designate_version: ${_param:openstack_version}
+    cluster_node01_address: ${_param:openstack_control_address}
     cluster_vip_address: ${_param:openstack_control_address}
     glance_version: ${_param:openstack_version}
     glance_service_host: ${_param:openstack_control_address}
@@ -98,6 +54,7 @@
     neutron_service_host: ${_param:openstack_control_address}
     glusterfs_service_host: ${_param:openstack_control_address}
     designate_service_host: ${_param:openstack_control_address}
+    cluster_local_address: ${_param:single_address}
     mysql_admin_user: root
     mysql_admin_password: workshop
     mysql_aodh_password: workshop
@@ -131,19 +88,14 @@
     mongodb_ceilometer_password: cloudlab
     mongodb_admin_password: cloudlab
     mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+    ceilometer_database_host: ${_param:openstack_control_node01_address}
+    stacklight_monitor_address: ${_param:openstack_control_node01_address}
+    stacklight_monitor_node01_address: ${_param:openstack_control_node01_address}
+    ceilometer_influxdb_password: workshop
+    neutron_enable_qos: false
   linux:
     network:
       host:
-        prx:
-          address: ${_param:openstack_proxy_address}
-          names:
-          - prx
-          - prx.${_param:cluster_domain}
-        prx01:
-          address: ${_param:openstack_proxy_node01_address}
-          names:
-          - ${_param:openstack_proxy_node01_hostname}
-          - prx01.${_param:cluster_domain}
         ctl:
           address: ${_param:openstack_control_address}
           names:
@@ -154,16 +106,6 @@
           names:
           - ${_param:openstack_control_node01_hostname}
           - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
-        ctl02:
-          address: ${_param:openstack_control_node02_address}
-          names:
-          - ${_param:openstack_control_node02_hostname}
-          - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
-        ctl03:
-          address: ${_param:openstack_control_node03_address}
-          names:
-          - ${_param:openstack_control_node03_hostname}
-          - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
         msg:
           address: ${_param:openstack_message_queue_address}
           names:
@@ -174,16 +116,6 @@
           names:
           - ${_param:openstack_message_queue_node01_hostname}
           - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
-        msg02:
-          address: ${_param:openstack_message_queue_node02_address}
-          names:
-          - ${_param:openstack_message_queue_node02_hostname}
-          - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
-        msg03:
-          address: ${_param:openstack_message_queue_node03_address}
-          names:
-          - ${_param:openstack_message_queue_node03_hostname}
-          - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
         dbs:
           address: ${_param:openstack_database_address}
           names:
@@ -194,16 +126,6 @@
           names:
           - ${_param:openstack_database_node01_hostname}
           - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
-        dbs02:
-          address: ${_param:openstack_database_node02_address}
-          names:
-          - ${_param:openstack_database_node02_hostname}
-          - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
-        dbs03:
-          address: ${_param:openstack_database_node03_address}
-          names:
-          - ${_param:openstack_database_node03_hostname}
-          - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
         cmp01:
           address: ${_param:openstack_compute_node01_address}
           names:
diff --git a/classes/cluster/os_aio_contrail/openstack/proxy.yml b/classes/cluster/os_aio_contrail/openstack/proxy.yml
index d92ae91..f732096 100755
--- a/classes/cluster/os_aio_contrail/openstack/proxy.yml
+++ b/classes/cluster/os_aio_contrail/openstack/proxy.yml
@@ -8,7 +8,6 @@
 - cluster.os_aio_contrail
 parameters:
   _param:
-    cluster_vip_address: ${_param:openstack_proxy_address}
     nginx_proxy_ssl:
       enabled: true
       authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/os_aio_ovs/infra/config.yml b/classes/cluster/os_aio_ovs/infra/config.yml
index 5c05f4c..494e23b 100644
--- a/classes/cluster/os_aio_ovs/infra/config.yml
+++ b/classes/cluster/os_aio_ovs/infra/config.yml
@@ -14,11 +14,7 @@
 - system.keystone.client.service.nova21
 - system.keystone.client.service.glare
 - system.keystone.client.service.cinder3
-- system.mysql.client.single
-- system.reclass.storage.system.openstack_control_cluster
-- system.reclass.storage.system.openstack_compute_multi
-- system.reclass.storage.system.openstack_gateway_single
-- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_control_single
 - cluster.os_aio_ovs.openstack.proxy
 - cluster.os_aio_ovs
 parameters:
@@ -47,46 +43,115 @@
       site:
         nginx_proxy_openstack_web:
           proxy:
-            host: prx
+            host: ${_param:openstack_control_address}
         nginx_proxy_openstack_api_heat_cfn:
           enabled: false
+  salt:
+    master:
+      reactor:
+        reclass/minion/classify:
+        - salt://reclass/reactor/node_register.sls
   reclass:
     storage:
-      node:
-        openstack_control_node01:
-          classes:
-          - service.galera.master.cluster
-          params:
-            mysql_cluster_role: master
-            linux_system_codename: xenial
-        openstack_control_node02:
-          classes:
-          - service.galera.slave.cluster
-          params:
-            mysql_cluster_role: slave
-            linux_system_codename: xenial
-        openstack_control_node03:
-          classes:
-          - service.galera.slave.cluster
-          params:
-            mysql_cluster_role: slave
-            linux_system_codename: xenial
-        openstack_compute_node01:
-          params:
-            single_address: 172.16.10.105
-            tenant_address: 10.1.0.105
-            external_address: 10.16.0.105
-        openstack_compute_node02:
-          params:
-            single_address: 172.16.10.106
-            tenant_address: 10.1.0.106
-            external_address: 10.16.0.106
-        openstack_gateway_node01:
-          params:
-            tenant_address: 10.1.0.110
-            external_address: 10.16.0.110
-        openstack_proxy_node01:
-          classes:
-          - cluster.os_aio_ovs.openstack.proxy
-          params:
-            linux_system_codename: xenial
+      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>>
+        openstack_control01:
+          expression: <<node_hostname>>__equals__ctl01
+          cluster_param:
+            openstack_control_node01_address:
+              value_template: <<node_control_ip>>
+        openstack_compute:
+          expression: <<node_hostname>>__startswith__cmp
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.openstack.compute
+          node_param:
+            tenant_address:
+              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:
+      #     params:
+      #       mysql_cluster_role: master
+
+
+  # nginx:
+  #   server:
+  #     site:
+  #       nginx_proxy_openstack_web:
+  #         proxy:
+  #           host: prx
+  #       nginx_proxy_openstack_api_heat_cfn:
+  #         enabled: false
+  # reclass:
+  #   storage:
+  #     node:
+  #       openstack_control_node01:
+  #         classes:
+  #         - service.galera.master.cluster
+  #         params:
+  #           mysql_cluster_role: master
+  #           linux_system_codename: xenial
+  #       openstack_control_node02:
+  #         classes:
+  #         - service.galera.slave.cluster
+  #         params:
+  #           mysql_cluster_role: slave
+  #           linux_system_codename: xenial
+  #       openstack_control_node03:
+  #         classes:
+  #         - service.galera.slave.cluster
+  #         params:
+  #           mysql_cluster_role: slave
+  #           linux_system_codename: xenial
+  #       openstack_compute_node01:
+  #         params:
+  #           single_address: 172.16.10.105
+  #           tenant_address: 10.1.0.105
+  #           external_address: 10.16.0.105
+  #       openstack_compute_node02:
+  #         params:
+  #           single_address: 172.16.10.106
+  #           tenant_address: 10.1.0.106
+  #           external_address: 10.16.0.106
+  #       openstack_gateway_node01:
+  #         params:
+  #           tenant_address: 10.1.0.110
+  #           external_address: 10.16.0.110
+  #       openstack_proxy_node01:
+  #         classes:
+  #         - cluster.os_aio_ovs.openstack.proxy
+  #         params:
+  #           linux_system_codename: xenial
+
diff --git a/classes/cluster/os_aio_ovs/infra/init.yml b/classes/cluster/os_aio_ovs/infra/init.yml
index 517da8f..fee7829 100644
--- a/classes/cluster/os_aio_ovs/infra/init.yml
+++ b/classes/cluster/os_aio_ovs/infra/init.yml
@@ -2,8 +2,8 @@
   _param:
     cluster_domain: os_aio_ovs.local
     cluster_name: os_aio_ovs
-    infra_config_deploy_address: 192.168.10.100
-    infra_config_address: 172.16.10.100
+    infra_config_deploy_address: 192.168.10.90
+    infra_config_address: 172.16.10.90
   linux:
     network:
       host:
diff --git a/classes/cluster/os_aio_ovs/openstack/compute.yml b/classes/cluster/os_aio_ovs/openstack/compute.yml
index 787e608..3631a07 100644
--- a/classes/cluster/os_aio_ovs/openstack/compute.yml
+++ b/classes/cluster/os_aio_ovs/openstack/compute.yml
@@ -2,8 +2,7 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
-- system.nova.compute.cluster
-- system.neutron.compute.cluster
+- service.neutron.compute.single
 - cluster.os_aio_ovs
 parameters:
   _param:
@@ -12,22 +11,109 @@
     external_interface: ens6
     interface_mtu: 9000
     linux_system_codename: xenial
+    control_address: ${_param:single_address}
+    nova_vncproxy_url: https://${_param:cluster_public_host}:6080
+    nova_compute_virtualization: kvm
+    nova_compute_avail_zone:
+    nova_aggregates: []
+    nova_compute_ssh_public: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCltIn93BcTMzNK/n2eBze6PyTkmIgdDkeXNR9X4DqE48Va80ojv2pq8xuaBxiNITJzyl+4p4UvTTXo+HmuX8qbHvqgMGXvuPUCpndEfb2r67f6vpMqPwMgBrUg2ZKgN4OsSDHU+H0dia0cEaTjz5pvbUy9lIsSyhrqOUVF9reJq+boAvVEedm8fUqiZuiejAw2D27+rRtdEPgsKMnh3626YEsr963q4rjU/JssV/iKMNu7mk2a+koOrJ+aHvcVU8zJjfA0YghoeVT/I3GLU/MB/4tD/RyR8GM+UYbI4sgAC7ZOCdQyHdJgnEzx3SJIwcS65U0T2XYvn2qXHXqJ9iGZ root@mirantis.com
+    nova_compute_ssh_private: |
+      -----BEGIN RSA PRIVATE KEY-----
+      MIIEpAIBAAKCAQEApbSJ/dwXEzMzSv59ngc3uj8k5JiIHQ5HlzUfV+A6hOPFWvNK
+      I79qavMbmgcYjSEyc8pfuKeFL0016Ph5rl/Kmx76oDBl77j1AqZ3RH29q+u3+r6T
+      Kj8DIAa1INmSoDeDrEgx1Ph9HYmtHBGk48+ab21MvZSLEsoa6jlFRfa3iavm6AL1
+      RHnZvH1KombonowMNg9u/q0bXRD4LCjJ4d+tumBLK/et6uK41PybLFf4ijDbu5pN
+      mvpKDqyfmh73FVPMyY3wNGIIaHlU/yNxi1PzAf+LQ/0ckfBjPlGGyOLIAAu2TgnU
+      Mh3SYJxM8d0iSMHEuuVNE9l2L59qlx16ifYhmQIDAQABAoIBAQCYpqbwvE5tm59H
+      GQb0C8Ykx4LfLD1INx1wiLmlJKYEQihPTw0fvXj1qZvl21+cs9ZcoTRpUbn6B3EA
+      e9bs8sYc/P75j1x46LSdimkZKZUPygkk72d3ZbElUciOyKCxBDNDBQcTIQ9xpKFa
+      2E5Ep72npNMrWqp71r/Qwo20lEIkikIgAFPBgraxn5xIEdo59vzXNZsvyoIRi5p4
+      ayH9nWSAXdF1YU3p3ljtHD8o2G/0d2TWGmjrd9vztc6tgXjp0PF60vDNgcJiudBg
+      oNLDK/e5a44GJxlVDdJ84ESb7GprRStYmddl22xnI1SXlg87+t0QQwzR0CCtWXrz
+      neXkicHhAoGBANkG9tOZfErhSL/jmsElQTNPcMNQkPiJzEmOIpr6jgSzCusPT/QD
+      PnVwB42GC5+Zhd4e88BsTzECxPXmKk7r1cBKeJTg/ejgsrSfVAZqMsfhbp3mGOiH
+      jymF+zC6Urj5q/Zkof8pEFICtyA5zlHvZmsQL9PDiqXIWALki2JvIDPdAoGBAMN2
+      O+LWOM9qqwgSMaFY8VUdDdbmLx/ZMGWQ//Tx42WM8SU+cCpGTLDHHR0qC0gnRsV7
+      V63DySEwiHn4I1cQ/AMijRxuw4Dkgk2YMRlgsAbVWO7aIlECWjSg+pRjNeA7If4D
+      5L/gu6wZIv1vu8/fvOwRpPUzhWjGN5Z0RyvYc7btAoGALNnrmL9XmIIGbuGy0cfJ
+      OblpLHQyAas4tNrS/ARb5Uy7LOj1NRCWj96fMPhK3qjzqXvsFBBOLWrNGaR/id/j
+      ROIfGWWGE+KcDAgBbXH1HKnSGn+7FhMt2v79coyPG/s9NqaFdB4gaVJ2VgqcQQKg
+      v++QcssulCRbS/2/cJBWr2ECgYAJFCDL9G9HEwlGorGzcNIkxeiyppZhwFDDJuz8
+      j4+kU9uPg0rqa8F8JINxq1ZCz7A10/jKlWFuLTbpk2Dw1lUeQCiVvX9PKU30FLGT
+      IC6M4rPyxCb75EQUVbXN1p3WAGkfx0aEsweEgtZhNyNeEGJSBK/Iw8/agfpq/pOf
+      sboOMQKBgQClKmrAYKWnwdPPka3msyjl/AXDruR4XFvMlOPKbs3nYstolE7eR94F
+      7xDyBz85icFU0rceYQetwFH2p5tRL0GcUQhJmJFgIL0OXdCQvRNJrT3iS00N1aUo
+      SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
+      -----END RSA PRIVATE KEY-----
+  openssh:
+    client:
+      enabled: True
+      user: {}
+      stricthostkeychecking: False
   nova:
     compute:
-      vncproxy_url: http://${_param:cluster_vip_address}:6080
-      notification:
-        driver: messagingv2
-        topics: "notifications"
-        notify_on:
-          state_change: vm_and_task_state
+      version: ${_param:nova_version}
+      enabled: true
+      virtualization: ${_param:nova_compute_virtualization}
+      availability_zone: ${_param:nova_compute_avail_zone}
+      aggregates: ${_param:nova_aggregates}
+      heal_instance_info_cache_interval: 60
+      vncproxy_url: ${_param:nova_vncproxy_url}
+      bind:
+        vnc_address: ${_param:cluster_local_address}
+        vnc_port: 6080
+        vnc_name: 0.0.0.0
+      database:
+        engine: mysql
+        host: ${_param:openstack_database_address}
+        port: 3306
+        name: nova
+        user: nova
+        password: ${_param:mysql_nova_password}
+      identity:
+        engine: keystone
+        region: ${_param:openstack_region}
+        host: ${_param:cluster_vip_address}
+        port: 35357
+        user: nova
+        password: ${_param:keystone_nova_password}
+        tenant: service
       message_queue:
+        engine: rabbitmq
+        port: 5672
+        user: openstack
+        password: ${_param:rabbitmq_openstack_password}
+        virtual_host: '/openstack'
+        host: ${_param:openstack_message_queue_node01_address}
+      image:
+        engine: glance
+        host: ${_param:cluster_vip_address}
+        port: 9292
+      network:
+        engine: neutron
+        region: ${_param:openstack_region}
+        host: ${_param:neutron_service_host}
+        port: 9696
+        user: neutron
+        tenant: service
+        password: ${_param:keystone_neutron_password}
+      user:
+        public_key: ${_param:nova_compute_ssh_public}
+        private_key: ${_param:nova_compute_ssh_private}
+      virtualization: kvm
+      heal_instance_info_cache_interval: 60
+      cache:
+        engine: memcached
         members:
-          - host: ${_param:openstack_control_node01_address}
-          - host: ${_param:openstack_control_node02_address}
-          - host: ${_param:openstack_control_node03_address}
+        - host: ${_param:cluster_node01_address}
+          port: 11211
+
   linux:
     network:
       bridge: openvswitch
+      concat_iface_files:
+      - src: '/etc/network/interfaces.d/50-cloud-init.cfg'
+        dst: '/etc/network/interfaces'
       interface:
         dhcp_int:
           enabled: true
@@ -37,12 +123,14 @@
           mtu: ${_param:interface_mtu}
         primary_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:primary_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
         tenant_interface:
           enabled: true
+          ipflush_onchange: true
           name: ${_param:tenant_interface}
           mtu: ${_param:interface_mtu}
           proto: manual
@@ -63,3 +151,4 @@
           netmask: 255.255.255.0
           use_interfaces:
           - ${_param:tenant_interface}
+
diff --git a/classes/cluster/os_aio_ovs/openstack/control.yml b/classes/cluster/os_aio_ovs/openstack/control.yml
index 4c474c1..d5ebcaa 100644
--- a/classes/cluster/os_aio_ovs/openstack/control.yml
+++ b/classes/cluster/os_aio_ovs/openstack/control.yml
@@ -5,33 +5,65 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.memcached.server.single
-- system.rabbitmq.server.cluster
+- system.rabbitmq.server.single
 - system.rabbitmq.server.vhost.openstack
 - system.keystone.server.wsgi
-- system.keystone.server.cluster
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
-- system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
-- system.glusterfs.server.cluster
-- system.glance.control.cluster
-- system.nova.control.cluster
-- system.neutron.control.openvswitch.cluster
-- system.cinder.control.cluster
-- system.heat.server.cluster
-- system.galera.server.cluster
-- system.galera.server.database.ceilometer
-- system.galera.server.database.cinder
-- system.galera.server.database.glance
-- system.galera.server.database.heat
-- system.galera.server.database.keystone
-- system.galera.server.database.nova
+- system.keystone.server.single
+# - system.glusterfs.client.cluster
+# - system.glusterfs.client.volume.glance
+# - system.glusterfs.client.volume.keystone
+# - system.glusterfs.server.volume.glance
+# - system.glusterfs.server.volume.keystone
+# - system.glusterfs.server.cluster
+- system.glance.control.single
+- system.nova.control.single
+- system.neutron.control.openvswitch.single
+- system.cinder.control.single
+- system.heat.server.single
+#- system.galera.server.cluster
+# - system.galera.server.database.ceilometer
+# - system.galera.server.database.cinder
+# - system.galera.server.database.glance
+# - system.galera.server.database.heat
+# - system.galera.server.database.keystone
+# - system.galera.server.database.nova
+
+- system.mysql.client.database.keystone
+- system.mysql.client.database.glance
+- system.mysql.client.database.nova
+- system.mysql.client.database.nova_api
+- system.mysql.client.database.cinder
+- system.mysql.client.database.heat
+
+- service.mysql.server.single
+- system.mysql.client
+- cluster.os_aio_ovs.openstack.dashboard
 - cluster.os_aio_ovs
 parameters:
-  _param:
-    keepalived_vip_interface: ens4
-    keepalived_openstack_telemetry_vip_interface: ens4
+#   _param:
+#     galera_server_cluster_name: galeracluster
+#     galera_server_bind_address: ${_param:cluster_local_address}
+#     galera_server_bind_port: 3306
+#     galera_server_admin_user: root
+#   galera:
+#     master:
+#       enabled: true
+#       name: ${_param:galera_server_cluster_name}
+#       bind:
+#         address: ${_param:galera_server_bind_address}
+#         port: ${_param:galera_server_bind_port}
+#       maintenance_password: ${_param:galera_server_maintenance_password}
+#       admin:
+#         user: ${_param:galera_server_admin_user}
+#         password: ${_param:galera_server_admin_password}
+#       members:
+#       - host: ${_param:openstack_control_node01_address}
+#         port: 4567
+# ##################
+  mysql:
+    server:
+      version: '5.6'
+      max_connections: 20000
   linux:
     system:
       package:
@@ -45,11 +77,6 @@
           proto: static
           address: ${_param:single_address}
           netmask: 255.255.255.0
-  keepalived:
-    cluster:
-      instance:
-        VIP:
-          virtual_router_id: 150
   keystone:
     server:
       admin_email: ${_param:admin_email}
@@ -83,9 +110,9 @@
         password: ${_param:metadata_password}
       bind:
         private_address: ${_param:cluster_local_address}
-        public_address: ${_param:cluster_vip_address}
+        public_address: ${_param:openstack_control_node01_address}
         novncproxy_port: 6080
-      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      vncproxy_url: http://${_param:openstack_control_node01_address}:6080
       workers: 1
       notification:
         driver: messagingv2
diff --git a/classes/cluster/os_aio_ovs/openstack/gateway.yml b/classes/cluster/os_aio_ovs/openstack/gateway.yml
index 7792236..37918a2 100644
--- a/classes/cluster/os_aio_ovs/openstack/gateway.yml
+++ b/classes/cluster/os_aio_ovs/openstack/gateway.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
-- system.neutron.gateway.cluster
+- service.neutron.gateway.single
 - cluster.os_aio_ovs
 parameters:
   _param:
@@ -75,4 +75,11 @@
           use_interfaces:
           - ${_param:external_interface}
           use_ovs_ports:
-          - float-to-ex
\ No newline at end of file
+          - float-to-ex
+  neutron:
+    gateway:
+      dvr: ${_param:neutron_gateway_dvr}
+      qos: ${_param:neutron_enable_qos}
+      agent_mode: ${_param:neutron_gateway_agent_mode}
+      backend:
+        tenant_network_types: ${_param:neutron_tenant_network_types}"
\ No newline at end of file
diff --git a/classes/cluster/os_aio_ovs/openstack/init.yml b/classes/cluster/os_aio_ovs/openstack/init.yml
index 5226be4..bb66a89 100644
--- a/classes/cluster/os_aio_ovs/openstack/init.yml
+++ b/classes/cluster/os_aio_ovs/openstack/init.yml
@@ -1,16 +1,15 @@
-arameters:
+parameters:
   _param:
-    openstack_proxy_address: 172.16.10.121
-    openstack_proxy_node01_address: 172.16.10.121
-    openstack_control_address: 172.16.10.254
-    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_database_address: ${_param:openstack_control_address}
-    openstack_message_queue_address: ${_param:openstack_control_address}
+    openstack_control_address: ${_param:openstack_control_node01_address}
+    openstack_control_node01_address: 172.16.10.91
+    openstack_database_address: ${_param:openstack_control_node01_address}
+    openstack_message_queue_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
-    openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
-    openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+
+    openstack_gateway_address: ${_param:openstack_gateway_node01_address}
+    openstack_gateway_node01_hostname: gtw01
+    openstack_gateway_node01_address: 172.16.10.92
+
 
     openstack_version: ocata
     apt_mk_version: nightly
@@ -18,7 +17,7 @@
     openstack_region: RegionOne
     admin_email: root@localhost
     cluster_public_protocol: http
-    cluster_public_host: 172.16.10.254
+    cluster_public_host: ${_param:openstack_control_node01_address}
     neutron_public_protocol: http
     neutron_control_dvr: False
     neutron_tenant_network_types: "flat,vxlan"
@@ -33,37 +32,33 @@
     galera_server_cluster_name: openstack_cluster
     galera_server_maintenance_password: workshop
     galera_server_admin_password: workshop
-    cluster_vip_address: 172.16.10.254
+    cluster_vip_address: ${_param:openstack_control_node01_address}
     cluster_local_address: ${_param:single_address}
     cluster_node01_hostname: ctl01
-    cluster_node01_address: 172.16.10.101
-    cluster_node02_hostname: ctl02
-    cluster_node02_address: 172.16.10.102
-    cluster_node03_hostname: ctl03
-    cluster_node03_address: 172.16.10.103
+    cluster_node01_address: ${_param:openstack_control_node01_address}
     rabbitmq_secret_key: workshop
     rabbitmq_admin_password: workshop
     rabbitmq_openstack_password: workshop
     rabbitmq_cold_password: workshop
     glance_version: ${_param:openstack_version}
-    glance_service_host: ${_param:cluster_vip_address}
+    glance_service_host: ${_param:openstack_control_node01_address}
     keystone_version: ${_param:openstack_version}
-    keystone_service_host: ${_param:cluster_vip_address}
+    keystone_service_host: ${_param:openstack_control_node01_address}
     heat_version: ${_param:openstack_version}
-    heat_service_host: ${_param:cluster_vip_address}
+    heat_service_host: ${_param:openstack_control_node01_address}
     heat_domain_admin_password: workshop
     ceilometer_version: ${_param:openstack_version}
     ceilometer_service_host: 172.16.10.108
     cinder_version: ${_param:openstack_version}
-    cinder_service_host: ${_param:cluster_vip_address}
+    cinder_service_host: ${_param:openstack_control_node01_address}
     ceilometer_graphite_publisher_host: 172.16.10.107
     ceilometer_graphite_publisher_port: 2013
     nova_version: ${_param:openstack_version}
-    nova_service_host: ${_param:cluster_vip_address}
-    nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+    nova_service_host: ${_param:openstack_control_node01_address}
+    nova_vncproxy_url: http://${_param:openstack_control_node01_address}:8060
     neutron_version: ${_param:openstack_version}
-    neutron_service_host: ${_param:cluster_vip_address}
-    glusterfs_service_host: ${_param:cluster_vip_address}
+    neutron_service_host: ${_param:openstack_control_node01_address}
+    glusterfs_service_host: ${_param:openstack_control_node01_address}
     metadata_password: password
     mysql_admin_user: root
     mysql_admin_password: workshop
@@ -88,58 +83,19 @@
     metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
-    horizon_identity_host: ${_param:cluster_vip_address}
+    horizon_identity_host: ${_param:openstack_control_node01_address}
     horizon_identity_encryption: none
     horizon_identity_version: 2
     mongodb_server_replica_set: ceilometer
     mongodb_ceilometer_password: cloudlab
     mongodb_admin_password: cloudlab
     mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+    neutron_enable_qos: false
   linux:
     network:
       host:
-        prx:
-          address: ${_param:openstack_proxy_address}
-          names:
-          - prx
-          - prx.${_param:cluster_domain}
-        prx01:
-          address: ${_param:openstack_proxy_node01_address}
-          names:
-          - prx01
-          - prx01.${_param:cluster_domain}
-        ctl:
-          address: ${_param:openstack_control_address}
-          names:
-          - ctl
-          - ctl.${_param:cluster_domain}
         ctl01:
           address: ${_param:openstack_control_node01_address}
           names:
           - ctl01
           - ctl01.${_param:cluster_domain}
-        ctl02:
-          address: ${_param:openstack_control_node02_address}
-          names:
-          - ctl02
-          - ctl02.${_param:cluster_domain}
-        ctl03:
-          address: ${_param:openstack_control_node03_address}
-          names:
-          - ctl03
-          - ctl03.${_param:cluster_domain}
-        gtw01:
-          address: ${_param:openstack_gateway_address}
-          names:
-          - gtw01
-          - gtw01.${_param:cluster_domain}
-        cmp01:
-          address: 172.16.10.105
-          names:
-          - cmp01
-          - cmp01.${_param:cluster_domain}
-        cmp02:
-          address: 172.16.10.106
-          names:
-          - cmp02
-          - cmp02.${_param:cluster_domain}
diff --git a/classes/cluster/os_ha_ovs/infra/init.yml b/classes/cluster/os_ha_ovs/infra/init.yml
index 98ed614..d5b51f9 100644
--- a/classes/cluster/os_ha_ovs/infra/init.yml
+++ b/classes/cluster/os_ha_ovs/infra/init.yml
@@ -2,8 +2,8 @@
   _param:
     cluster_domain: os_ha_ovs.local
     cluster_name: os_ha_ovs
-    infra_config_deploy_address: 192.168.10.100
-    infra_config_address: 172.16.10.100
+    infra_config_deploy_address: 192.168.10.90
+    infra_config_address: 172.16.10.90
   linux:
     network:
       host:
diff --git a/classes/cluster/os_ha_ovs/openstack/init.yml b/classes/cluster/os_ha_ovs/openstack/init.yml
index 5920112..771c191 100644
--- a/classes/cluster/os_ha_ovs/openstack/init.yml
+++ b/classes/cluster/os_ha_ovs/openstack/init.yml
@@ -9,13 +9,13 @@
     openstack_control_node02_hostname: ctl02
     openstack_control_node03_hostname: ctl03
     openstack_control_address: 172.16.10.254
-    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_control_node01_address: 172.16.10.91
+    openstack_control_node02_address: 172.16.10.92
+    openstack_control_node03_address: 172.16.10.93
     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_gateway_node01_address: 172.16.10.94
     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}
diff --git a/classes/cluster/os_ha_ovs_syndic/infra/config.yml b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
new file mode 100644
index 0000000..b60ba47
--- /dev/null
+++ b/classes/cluster/os_ha_ovs_syndic/infra/config.yml
@@ -0,0 +1,154 @@
+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.keystone.client.single
+- system.keystone.client.service.nova21
+- system.keystone.client.service.glare
+- system.keystone.client.service.cinder3
+- 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.reclass.storage.system.openstack_control_cluster
+- cluster.os_ha_ovs_syndic.openstack.proxy
+- cluster.os_ha_ovs_syndic
+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
+  nginx:
+    server:
+      site:
+        nginx_proxy_openstack_web:
+          proxy:
+            host: ${_param:openstack_control_address}
+        nginx_proxy_openstack_api_heat_cfn:
+          enabled: false
+  salt:
+    syndic:
+      enabled: true
+      master:
+        host: ${_param:salt_syndic_master_address}
+    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
+          - <<node_cluster>>__equals__os_ha_ovs_syndic
+          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>>
+        openstack_control01:
+          expression:
+          - <<node_hostname>>__equals__ctl01
+          - <<node_cluster>>__equals__os_ha_ovs_syndic
+          cluster_param:
+            openstack_control_node01_address:
+              value_template: <<node_control_ip>>
+        openstack_control02:
+          expression:
+          - <<node_hostname>>__equals__ctl02
+          - <<node_cluster>>__equals__os_ha_ovs_syndic
+          cluster_param:
+            openstack_control_node02_address:
+              value_template: <<node_control_ip>>
+        openstack_control03:
+          expression:
+          - <<node_hostname>>__equals__ctl03
+          - <<node_cluster>>__equals__os_ha_ovs_syndic
+          cluster_param:
+            openstack_control_node03_address:
+              value_template: <<node_control_ip>>
+        openstack_compute:
+          expression:
+          - <<node_hostname>>__startswith__cmp
+          - <<node_cluster>>__equals__os_ha_ovs_syndic
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.openstack.compute
+          node_param:
+            tenant_address:
+              value_template: <<node_tenant_ip>>
+            external_address:
+              value_template: <<node_external_ip>>
+        openstack_gateway:
+          expression:
+          - <<node_hostname>>__startswith__gtw
+          - <<node_cluster>>__equals__os_ha_ovs_syndic
+          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:
+          - service.galera.master.cluster
+          params:
+            mysql_cluster_role: master
+            linux_system_codename: xenial
+        openstack_control_node02:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+            linux_system_codename: xenial
+        openstack_control_node03:
+          classes:
+          - service.galera.slave.cluster
+          params:
+            mysql_cluster_role: slave
+            linux_system_codename: xenial
diff --git a/classes/cluster/os_ha_ovs_syndic/infra/init.yml b/classes/cluster/os_ha_ovs_syndic/infra/init.yml
new file mode 100644
index 0000000..c6de909
--- /dev/null
+++ b/classes/cluster/os_ha_ovs_syndic/infra/init.yml
@@ -0,0 +1,20 @@
+parameters:
+  _param:
+    cluster_domain: os_ha_ovs_syndic.local
+    cluster_name: os_ha_ovs_syndic
+    infra_config_deploy_address: 192.168.10.90
+    infra_config_address: 172.16.10.90
+    salt_syndic_master_address: 192.168.10.90
+  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/os_ha_ovs_syndic/init.yml b/classes/cluster/os_ha_ovs_syndic/init.yml
new file mode 100644
index 0000000..1d6bb29
--- /dev/null
+++ b/classes/cluster/os_ha_ovs_syndic/init.yml
@@ -0,0 +1,8 @@
+classes:
+- system.linux.system.single
+- cluster.os_ha_ovs_syndic.infra
+- cluster.os_ha_ovs_syndic.openstack
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- cluster.overrides
diff --git a/classes/cluster/os_ha_ovs_syndic/openstack/compute.yml b/classes/cluster/os_ha_ovs_syndic/openstack/compute.yml
new file mode 100644
index 0000000..c3b76fd
--- /dev/null
+++ b/classes/cluster/os_ha_ovs_syndic/openstack/compute.yml
@@ -0,0 +1,71 @@
+classes:
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- cluster.os_ha_ovs_syndic
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 9000
+    linux_system_codename: xenial
+  nova:
+    compute:
+      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+        notify_on:
+          state_change: vm_and_task_state
+      message_queue:
+        members:
+          - host: ${_param:openstack_control_node01_address}
+          - host: ${_param:openstack_control_node02_address}
+          - host: ${_param:openstack_control_node03_address}
+  linux:
+    network:
+      bridge: openvswitch
+      concat_iface_files:
+      - src: '/etc/network/interfaces.d/50-cloud-init.cfg'
+        dst: '/etc/network/interfaces'
+      interface:
+        dhcp_int:
+          enabled: true
+          name: ens3
+          proto: dhcp
+          type: eth
+          mtu: ${_param:interface_mtu}
+        primary_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:primary_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        tenant_interface:
+          enabled: true
+          ipflush_onchange: true
+          name: ${_param:tenant_interface}
+          mtu: ${_param:interface_mtu}
+          proto: manual
+          type: eth
+        br-mgmt:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-mesh:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: 255.255.255.0
+          use_interfaces:
+          - ${_param:tenant_interface}
+
diff --git a/classes/cluster/os_ha_ovs_syndic/openstack/control.yml b/classes/cluster/os_ha_ovs_syndic/openstack/control.yml
new file mode 100644
index 0000000..1b3d2db
--- /dev/null
+++ b/classes/cluster/os_ha_ovs_syndic/openstack/control.yml
@@ -0,0 +1,102 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.glusterfs
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.memcached.server.single
+- system.rabbitmq.server.cluster
+- system.rabbitmq.server.vhost.openstack
+- system.keystone.server.wsgi
+- system.keystone.server.cluster
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.glance
+- system.glusterfs.client.volume.keystone
+- system.glusterfs.server.volume.glance
+- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.cluster
+- system.glance.control.cluster
+- system.nova.control.cluster
+- system.neutron.control.openvswitch.cluster
+- system.cinder.control.cluster
+- system.heat.server.cluster
+- system.galera.server.cluster
+- system.galera.server.database.cinder
+- system.galera.server.database.glance
+- system.galera.server.database.heat
+- system.galera.server.database.keystone
+- system.galera.server.database.nova
+- cluster.os_ha_ovs_syndic.openstack.dashboard
+- cluster.os_ha_ovs_syndic
+parameters:
+  _param:
+    keepalived_vip_interface: ens4
+    keepalived_openstack_telemetry_vip_interface: ens4
+  linux:
+    system:
+      package:
+        python-msgpack:
+          version: latest
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+  keepalived:
+    cluster:
+      instance:
+        VIP:
+          virtual_router_id: 150
+  keystone:
+    server:
+      admin_email: ${_param:admin_email}
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+  glance:
+    server:
+      storage:
+        engine: file
+      images: []
+      workers: 1
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+  heat:
+    server:
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+  neutron:
+    server:
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+  nova:
+    controller:
+      networking: dvr
+      cpu_allocation: 54
+      metadata:
+        password: ${_param:metadata_password}
+      bind:
+        private_address: ${_param:cluster_local_address}
+        public_address: ${_param:cluster_vip_address}
+        novncproxy_port: 6080
+      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      workers: 1
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+  cinder:
+    volume:
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+    controller:
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+
diff --git a/classes/cluster/os_ha_ovs_syndic/openstack/dashboard.yml b/classes/cluster/os_ha_ovs_syndic/openstack/dashboard.yml
new file mode 100644
index 0000000..1e4565a
--- /dev/null
+++ b/classes/cluster/os_ha_ovs_syndic/openstack/dashboard.yml
@@ -0,0 +1,19 @@
+classes:
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.horizon.server.cluster
+- cluster.os_ha_ovs_syndic
+parameters:
+  _param:
+    horizon_site_branding: OpenStack Dashboard
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
diff --git a/classes/cluster/os_ha_ovs_syndic/openstack/gateway.yml b/classes/cluster/os_ha_ovs_syndic/openstack/gateway.yml
new file mode 100644
index 0000000..2e7f0f0
--- /dev/null
+++ b/classes/cluster/os_ha_ovs_syndic/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_syndic/openstack/init.yml b/classes/cluster/os_ha_ovs_syndic/openstack/init.yml
new file mode 100644
index 0000000..771c191
--- /dev/null
+++ b/classes/cluster/os_ha_ovs_syndic/openstack/init.yml
@@ -0,0 +1,139 @@
+parameters:
+  _param:
+    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
+    openstack_control_node03_hostname: ctl03
+    openstack_control_address: 172.16.10.254
+    openstack_control_node01_address: 172.16.10.91
+    openstack_control_node02_address: 172.16.10.92
+    openstack_control_node03_address: 172.16.10.93
+    openstack_gateway_hostname: gtw
+    openstack_gateway_address: ${_param:openstack_gateway_node01_address}
+    openstack_gateway_node01_hostname: gtw01
+    openstack_gateway_node01_address: 172.16.10.94
+    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}
+    openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+    openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+
+    openstack_version: ocata
+    apt_mk_version: nightly
+    mcp_repo_version: 1.1
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_protocol: http
+    cluster_public_host: ${_param:openstack_proxy_address}
+    neutron_public_protocol: http
+    neutron_control_dvr: False
+    neutron_tenant_network_types: "flat,vxlan"
+    neutron_l3_ha: False
+    neutron_global_physnet_mtu: 1500
+    neutron_external_mtu: 1500
+    neutron_gateway_dvr: False
+    neutron_gateway_agent_mode: legacy
+    neutron_compute_dvr: False
+    neutron_compute_agent_mode: legacy
+    neutron_compute_external_access: False
+    galera_server_cluster_name: openstack_cluster
+    galera_server_maintenance_password: workshop
+    galera_server_admin_password: workshop
+    cluster_vip_address: ${_param:openstack_control_address}
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ${_param:openstack_control_node01_hostname}
+    cluster_node01_address: ${_param:openstack_control_node01_address}
+    cluster_node02_hostname: ${_param:openstack_control_node02_hostname}
+    cluster_node02_address: ${_param:openstack_control_node02_address}
+    cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
+    cluster_node03_address: ${_param:openstack_control_node03_address}
+    rabbitmq_secret_key: workshop
+    rabbitmq_admin_password: workshop
+    rabbitmq_openstack_password: workshop
+    rabbitmq_cold_password: workshop
+    glance_version: ${_param:openstack_version}
+    glance_service_host: ${_param:cluster_vip_address}
+    keystone_version: ${_param:openstack_version}
+    keystone_service_host: ${_param:cluster_vip_address}
+    heat_version: ${_param:openstack_version}
+    heat_service_host: ${_param:cluster_vip_address}
+    heat_domain_admin_password: workshop
+    cinder_version: ${_param:openstack_version}
+    cinder_service_host: ${_param:cluster_vip_address}
+    nova_version: ${_param:openstack_version}
+    nova_service_host: ${_param:cluster_vip_address}
+    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}
+    metadata_password: password
+    mysql_admin_user: root
+    mysql_admin_password: workshop
+    mysql_cinder_password: workshop
+    mysql_glance_password: workshop
+    mysql_heat_password: workshop
+    mysql_keystone_password: workshop
+    mysql_neutron_password: workshop
+    mysql_nova_password: workshop
+    keystone_service_token: workshop
+    keystone_admin_password: workshop
+    keystone_cinder_password: workshop
+    keystone_glance_password: workshop
+    keystone_heat_password: workshop
+    keystone_keystone_password: workshop
+    keystone_neutron_password: workshop
+    keystone_nova_password: workshop
+    metadata_password: workshop
+    horizon_version: ${_param:openstack_version}
+    horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+    horizon_identity_host: ${_param:cluster_vip_address}
+    horizon_identity_encryption: none
+    horizon_identity_version: 2
+  linux:
+    network:
+      host:
+        prx:
+          address: ${_param:openstack_proxy_address}
+          names:
+          - ${_param:openstack_proxy_hostname}
+          - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
+        prx01:
+          address: ${_param:openstack_proxy_node01_address}
+          names:
+          - ${_param:openstack_proxy_node01_hostname}
+          - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
+        ctl:
+          address: ${_param:openstack_control_address}
+          names:
+          - ${_param:openstack_control_hostname}
+          - ${_param:openstack_control_hostname}.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:openstack_control_node01_address}
+          names:
+          - ${_param:openstack_control_node01_hostname}
+          - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:openstack_control_node02_address}
+          names:
+          - ${_param:openstack_control_node02_hostname}
+          - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:openstack_control_node03_address}
+          names:
+          - ${_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/os_ha_ovs_syndic/openstack/proxy.yml b/classes/cluster/os_ha_ovs_syndic/openstack/proxy.yml
new file mode 100644
index 0000000..880b908
--- /dev/null
+++ b/classes/cluster/os_ha_ovs_syndic/openstack/proxy.yml
@@ -0,0 +1,15 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.openstack_api
+- system.nginx.server.proxy.openstack_vnc
+- system.nginx.server.proxy.openstack_web
+- system.salt.minion.cert.proxy
+- cluster.os_ha_ovs_syndic
+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}
\ No newline at end of file
diff --git a/classes/cluster/sl_k8s_calico/kubernetes/compute.yml b/classes/cluster/sl_k8s_calico/kubernetes/compute.yml
index ab447dd..81cb2d7 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/compute.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/compute.yml
@@ -6,10 +6,10 @@
 - cluster.sl_k8s_calico
 parameters:
   _param:
-    kubernetes_calicoctl_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/ctl:latest
-    kubernetes_calico_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/node:latest
-    kubernetes_calico_cni_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/projectcalico/calico/cni:latest
-    kubernetes_hyperkube_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
+    kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+    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_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
   docker:
     host:
       pkgs:
diff --git a/classes/cluster/sl_k8s_calico/kubernetes/init.yml b/classes/cluster/sl_k8s_calico/kubernetes/init.yml
index c3c13a4..307ebd0 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/init.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/init.yml
@@ -17,7 +17,7 @@
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
     kubernetes_control_hostname: ctl
-    kubernetes_control_address: 172.16.10.253
+    kubernetes_control_address: 192.168.10.253
     kubernetes_control_node01_hostname: ctl01
     kubernetes_control_node02_hostname: ctl02
     kubernetes_control_node03_hostname: ctl03
diff --git a/classes/cluster/sl_k8s_contrail/kubernetes/control.yml b/classes/cluster/sl_k8s_contrail/kubernetes/control.yml
index 71d1948..2b870a1 100644
--- a/classes/cluster/sl_k8s_contrail/kubernetes/control.yml
+++ b/classes/cluster/sl_k8s_contrail/kubernetes/control.yml
@@ -8,7 +8,7 @@
 - cluster.sl_k8s_contrail
 parameters:
   _param:
-    keepalived_vip_interface: vhost0
+    keepalived_vip_interface: ens3
     keepalived_vip_virtual_router_id: 60
   etcd:
     server:
diff --git a/classes/cluster/sl_k8s_contrail/kubernetes/init.yml b/classes/cluster/sl_k8s_contrail/kubernetes/init.yml
index d999c6b..d71de79 100644
--- a/classes/cluster/sl_k8s_contrail/kubernetes/init.yml
+++ b/classes/cluster/sl_k8s_contrail/kubernetes/init.yml
@@ -26,7 +26,7 @@
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
     kubernetes_control_hostname: ctl
-    kubernetes_control_address: 172.16.10.253
+    kubernetes_control_address: 192.168.10.253
     kubernetes_control_node01_hostname: ctl01
     kubernetes_control_node02_hostname: ctl02
     kubernetes_control_node03_hostname: ctl03
diff --git a/classes/cluster/sl_os_contrail/stacklight/client.yml b/classes/cluster/sl_os_contrail/stacklight/client.yml
index 393449c..d7067d3 100755
--- a/classes/cluster/sl_os_contrail/stacklight/client.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/client.yml
@@ -4,6 +4,7 @@
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
+- cluster.sl_os_contrail
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/sl_os_contrail/stacklight/init.yml b/classes/cluster/sl_os_contrail/stacklight/init.yml
index 37bca4c..18ff098 100755
--- a/classes/cluster/sl_os_contrail/stacklight/init.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/init.yml
@@ -1,9 +1,9 @@
 parameters:
   _param:
     stacklight_monitor_address: 172.16.10.253
-    stacklight_monitor_node01_hostname: mon01
-    stacklight_monitor_node02_hostname: mon02
-    stacklight_monitor_node03_hostname: mon03
+    stacklight_node01_hostname: mon01
+    stacklight_node02_hostname: mon02
+    stacklight_node03_hostname: mon03
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
@@ -14,6 +14,10 @@
     elasticsearch_port: 9200
     stacklight_environment: ${_param:cluster_domain}
     stacklight_notification_topic: stacklight_notifications
+    grafana_admin_password: admin
+    grafana_database_type: mysql
+    grafana_database_host: ${_param:openstack_database_address}
+    grafana_database_password: ${_param:mysql_grafana_password}
   linux:
     network:
       host:
@@ -25,15 +29,15 @@
         mon01:
           address: ${_param:stacklight_monitor_node01_address}
           names:
-          - ${_param:stacklight_monitor_node01_hostname}
-          - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_node01_hostname}
+          - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
         mon02:
           address: ${_param:stacklight_monitor_node02_address}
           names:
-          - ${_param:stacklight_monitor_node02_hostname}
-          - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_node02_hostname}
+          - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
         mon03:
           address: ${_param:stacklight_monitor_node03_address}
           names:
-          - ${_param:stacklight_monitor_node03_hostname}
-          - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
+          - ${_param:stacklight_node03_hostname}
+          - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/sl_os_contrail/stacklight/proxy.yml b/classes/cluster/sl_os_contrail/stacklight/proxy.yml
index 9933070..8b71bcb 100755
--- a/classes/cluster/sl_os_contrail/stacklight/proxy.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/proxy.yml
@@ -9,6 +9,7 @@
 parameters:
   _param:
     nginx_proxy_grafana_port: 15013
+    cluster_public_host: ${_param:prometheus_control_address}
     nginx_proxy_ssl:
       enabled: true
       authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/sl_os_contrail/stacklight/server.yml b/classes/cluster/sl_os_contrail/stacklight/server.yml
index 23acc64..747ac71 100755
--- a/classes/cluster/sl_os_contrail/stacklight/server.yml
+++ b/classes/cluster/sl_os_contrail/stacklight/server.yml
@@ -71,4 +71,4 @@
           type: eth
           proto: static
           address: ${_param:single_address}
-          netmask: 255.255.255.0
+          netmask: 255.255.255.0
\ No newline at end of file
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 5bdbb9a..a9e7f7b 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
@@ -10,6 +10,7 @@
   - system.glusterfs.client.volume.mysql
   - system.glusterfs.client.volume.openldap
   - system.glusterfs.client.volume.postgresql
+  - system.glusterfs.client.volume.prometheus
   - system.glusterfs.client.volume.pushkin
   - system.glusterfs.client.volume.registry
   - system.glusterfs.client.volume.rundeck
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/leader.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/leader.yml
index 28bc297..d4b5fb2 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/leader.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/leader.yml
@@ -45,3 +45,5 @@
 
   - cluster.virtual-mcp-ocata-cicd.infra
   - cluster.virtual-mcp-ocata-cicd.cicd.control
+  - cluster.virtual-mcp-ocata-cicd.stacklight.client
+  - cluster.virtual-mcp-ocata-cicd.stacklight.server
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/manager.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/manager.yml
index 96dfe3d..0f53a66 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/manager.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/manager.yml
@@ -2,3 +2,4 @@
   - system.docker.swarm.manager
   - cluster.virtual-mcp-ocata-cicd.infra
   - cluster.virtual-mcp-ocata-cicd.cicd.control
+  - cluster.virtual-mcp-ocata-cicd.stacklight.server
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
index 082902e..47cd942 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
@@ -9,6 +9,7 @@
   - system.glusterfs.server.volume.mysql
   - system.glusterfs.server.volume.openldap
   - system.glusterfs.server.volume.postgresql
+  - system.glusterfs.server.volume.prometheus
   - system.glusterfs.server.volume.pushkin
   - system.glusterfs.server.volume.registry
   - system.glusterfs.server.volume.rundeck
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml b/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
index c04387f..aff7d8b 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
@@ -2,6 +2,7 @@
 - service.git.client
 - 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
@@ -21,7 +22,6 @@
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_gateway_single
 - system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.stacklightv2_server_cluster
 - system.reclass.storage.system.cicd_control_cluster
 - cluster.virtual-mcp-ocata-cicd.openstack.proxy
 - cluster.virtual-mcp-ocata-cicd.stacklight.proxy
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/client.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/client.yml
index d6e36d2..fae8c6a 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/client.yml
@@ -1,5 +1,5 @@
 classes:
-- system.docker.client
+- system.docker.host
 - system.elasticsearch.client.single
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
index 1270bbb..7cd5d90 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
@@ -1,5 +1,4 @@
 classes:
-- system.docker.host
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.tcp_elastic
 # Needed to install Galera packages
@@ -11,10 +10,6 @@
 - 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
-- system.glusterfs.server.cluster
-- system.glusterfs.server.volume.prometheus
 - system.galera.server.cluster
 - system.galera.server.database.grafana
 - system.influxdb.server.single
@@ -25,6 +20,8 @@
 - system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
 - system.prometheus.server.target.dns
+- system.docker.host
+- system.docker.client
 - system.docker.swarm.stack.monitoring
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp-ocata-cicd.infra
@@ -53,8 +50,6 @@
     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-mcp-ocata-dvr/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
index 025fb95..832a60c 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
@@ -2,6 +2,7 @@
 - service.git.client
 - 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
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index 02f7a11..a1e70bb 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -2,6 +2,7 @@
 - service.git.client
 - 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
diff --git a/classes/cluster/virtual-mcp11-aio/bootstrap_vars b/classes/cluster/virtual-mcp11-aio/bootstrap_vars
new file mode 100644
index 0000000..5661577
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-aio/bootstrap_vars
@@ -0,0 +1 @@
+FORMULAS_SALT_MASTER+=(mysql grafana libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate)
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index c6fca16..d0c5f40 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -13,6 +13,7 @@
 - system.memcached.server.single
 - system.rabbitmq.server.single
 - cluster.virtual-mcp11-aio.openstack
+- cluster.overrides
 parameters:
   _param:
     reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
@@ -42,6 +43,11 @@
           enabled: true
           # r00tme
           password: $6$9ojWyyN.$26Vj46JtCUL6C7XBQ8RmQTZLwo8/8SkqTRElXh0X2YBLrt7E/aVe2AYQ5gguYUwUknZNOSn5q7M9M3Jyf2gof/
+      repo:
+        linux_system_repo:
+          source: ${_param:linux_system_repo}
+          architectures: amd64
+          clean_file: true
     network:
       bridge: openvswitch
       interface:
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index b4f61cb..3984c02 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -29,7 +29,9 @@
 - service.cinder.volume.single
 - system.cinder.volume.backend.lvm
 - system.horizon.server.single
+- system.bind.server.single
 - system.designate.server.single
+- system.designate.server.backend.bind
 parameters:
   _param:
     openstack_version: ocata
@@ -81,10 +83,6 @@
     horizon_identity_version: 2
     designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
     designate_pool_target_type: bind9
-    designate_pool_target_options:
-      rndc_host: ${_param:single_address}
-      rndc_port: 953
-      rndc_key_file: /etc/designate/rndc.key
     designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
     designate_pool_ns_records:
       - hostname: 'ns1.example.org.'
@@ -98,6 +96,10 @@
     designate_pool_target_options:
       host: ${_param:single_address}
       port: 53
+      rndc_host: ${_param:single_address}
+      rndc_port: 953
+      rndc_key_file: /etc/designate/rndc.key
+    linux_system_repo: 'deb [arch=amd64] http://mirror.fuel-infra.org/mcp-repos/ocata/xenial ocata main'
   neutron:
     server:
       message_queue:
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/client.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/client.yml
index 393449c..68d391c 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/client.yml
@@ -4,6 +4,7 @@
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
+- cluster.virtual-mcp11-contrail
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
@@ -15,3 +16,7 @@
     grafana_password: ${_param:grafana_admin_password}
     grafana_prometheus_address: ${_param:stacklight_monitor_address}
     grafana_prometheus_port: 15010
+
+    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+    cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+    cluster_node03_address: ${_param:stacklight_monitor_node03_address}
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
index e283639..0b10c03 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/init.yml
@@ -5,6 +5,10 @@
     elasticsearch_port: 9200
     stacklight_environment: ${_param:cluster_domain}
     stacklight_notification_topic: stacklight_notifications
+    grafana_admin_password: admin
+    grafana_database_type: mysql
+    grafana_database_host: ${_param:openstack_database_address}
+    grafana_database_password: ${_param:mysql_grafana_password}
   linux:
     network:
       host:
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 099f7a6..512e30e 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -45,10 +45,6 @@
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
     cluster_node03_hostname: mon03
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
-    grafana_admin_password: admin
-    grafana_database_type: mysql
-    grafana_database_host: ${_param:openstack_database_address}
-    grafana_database_password: ${_param:mysql_grafana_password}
     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
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
diff --git a/classes/cluster/virtual-mcp11-dvr/infra/config.yml b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
index 8f0eaca..f2020dc 100644
--- a/classes/cluster/virtual-mcp11-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
@@ -2,6 +2,7 @@
 - service.git.client
 - 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
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/client.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/client.yml
index 393449c..81ee8d8 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/client.yml
@@ -4,6 +4,7 @@
 - system.grafana.client
 - system.grafana.client.datasource.prometheus
 - system.kibana.client.single
+- cluster.virtual-mcp11-dvr
 parameters:
   _param:
     # Elasticsearch/Kibana client parameters
@@ -15,3 +16,7 @@
     grafana_password: ${_param:grafana_admin_password}
     grafana_prometheus_address: ${_param:stacklight_monitor_address}
     grafana_prometheus_port: 15010
+
+    cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+    cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+    cluster_node03_address: ${_param:stacklight_monitor_node03_address}
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml
index e283639..0b10c03 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/init.yml
@@ -5,6 +5,10 @@
     elasticsearch_port: 9200
     stacklight_environment: ${_param:cluster_domain}
     stacklight_notification_topic: stacklight_notifications
+    grafana_admin_password: admin
+    grafana_database_type: mysql
+    grafana_database_host: ${_param:openstack_database_address}
+    grafana_database_password: ${_param:mysql_grafana_password}
   linux:
     network:
       host:
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index 2f85a58..6417dbe 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -45,10 +45,6 @@
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
     cluster_node03_hostname: mon03
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
-    grafana_admin_password: admin
-    grafana_database_type: mysql
-    grafana_database_host: ${_param:openstack_database_address}
-    grafana_database_password: ${_param:mysql_grafana_password}
     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
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
index 2caf3f1..727da7b 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
@@ -9,7 +9,7 @@
 - cluster.overrides
 parameters:
   _param:
-    keepalived_vip_interface: ens4
+    keepalived_vip_interface: ens3
     keepalived_vip_virtual_router_id: 60
   etcd:
     server:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
index 626a99d..9d0cbe9 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
@@ -36,7 +36,7 @@
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
     kubernetes_control_hostname: ctl
-    kubernetes_control_address: 172.16.10.253
+    kubernetes_control_address: 192.168.10.253
     kubernetes_control_node01_hostname: ctl01
     kubernetes_control_node02_hostname: ctl02
     kubernetes_control_node03_hostname: ctl03
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
index fa0bb5a..bb836a9 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
@@ -9,7 +9,7 @@
 - cluster.overrides
 parameters:
   _param:
-    keepalived_vip_interface: ens4
+    keepalived_vip_interface: ens3
     keepalived_vip_virtual_router_id: 60
   etcd:
     server:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
index 06b33d5..21aaca3 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
@@ -31,7 +31,7 @@
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
     kubernetes_control_hostname: ctl
-    kubernetes_control_address: 172.16.10.253
+    kubernetes_control_address: 192.168.10.253
     kubernetes_control_node01_hostname: ctl01
     kubernetes_control_node02_hostname: ctl02
     kubernetes_control_node03_hostname: ctl03
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index a98d70f..0c15550 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -9,7 +9,7 @@
 - cluster.overrides
 parameters:
   _param:
-    keepalived_vip_interface: ens4
+    keepalived_vip_interface: ens3
     keepalived_vip_virtual_router_id: 60
   etcd:
     server:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index 58860fa..571f908 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -36,7 +36,7 @@
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
     kubernetes_control_hostname: ctl
-    kubernetes_control_address: 172.16.10.253
+    kubernetes_control_address: 192.168.10.253
     kubernetes_control_node01_hostname: ctl01
     kubernetes_control_node02_hostname: ctl02
     kubernetes_control_node03_hostname: ctl03
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index 00c9266..966866a 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -8,7 +8,7 @@
 - cluster.overrides
 parameters:
   _param:
-    keepalived_vip_interface: vhost0
+    keepalived_vip_interface: ens3
     keepalived_vip_virtual_router_id: 60
   etcd:
     server:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index de711cc..e404760 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -41,7 +41,7 @@
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
     kubernetes_control_hostname: ctl
-    kubernetes_control_address: 172.16.10.253
+    kubernetes_control_address: 192.168.10.253
     kubernetes_control_node01_hostname: ctl01
     kubernetes_control_node02_hostname: ctl02
     kubernetes_control_node03_hostname: ctl03
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml
index db35cb0..53b6fb8 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml
@@ -14,7 +14,7 @@
 parameters:
   _param:
     primary_interface: ens4
-    tenant_interface: ens5
+    #tenant_interface: ens5
     external_interface: ens6
     interface_mtu: 9000
     linux_system_codename: xenial
@@ -47,12 +47,12 @@
           mtu: ${_param:interface_mtu}
           proto: manual
           type: eth
-        tenant_interface:
-          enabled: true
-          name: ${_param:tenant_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
         br-mgmt:
           enabled: true
           type: bridge
@@ -79,6 +79,7 @@
           name: ${_param:dpdk0_name}
           pci: ${_param:dpdk0_pci}
           driver: igb_uio
+          bridge: br-prv
 #          bond: dpdkbond1
           enabled: true
           type: dpdk_ovs_port
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
index f740414..a456bd2 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
@@ -2,6 +2,7 @@
 - service.git.client
 - 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
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/init.yml b/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
index 2f77f4a..531d59a 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
@@ -8,7 +8,7 @@
 - system.openssh.server.team.mcp_qa
 - cluster.virtual-mcp11-ovs-ironic.stacklight
 - cluster.virtual-mcp11-ovs-ironic.stacklight.client
-
+- cluster.overrides
 parameters:
   _param:
     cluster_domain: virtual-mcp11-ovs-ironic.local
@@ -44,3 +44,11 @@
     openstack_baremeta_neutron_subnet_allocation_start: 192.168.90.100
     openstack_baremeta_neutron_subnet_allocation_end: 192.168.90.150
     openstack_baremetal_node01_hostname: bmt01
+  linux:
+    system:
+      repo:
+        linux_system_repo:
+          source: ${_param:linux_system_repo}
+          architectures: amd64
+          clean_file: true
+
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml
index fdc0ee5..2cc6792 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml
@@ -90,6 +90,7 @@
     mongodb_ceilometer_password: cloudlab
     mongodb_admin_password: cloudlab
     mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+    linux_system_repo: 'deb [arch=amd64] http://mirror.fuel-infra.org/mcp-repos/ocata/xenial ocata main'
   linux:
     network:
       host:
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/config.yml b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
index e97504a..ed8c765 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
@@ -2,6 +2,7 @@
 - service.git.client
 - 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
diff --git a/classes/system b/classes/system
index c292a9b..6320d70 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit c292a9b5afb28898fc250f5006b8cbf017bac958
+Subproject commit 6320d70d52fda38b989dfdb91621f52c16f27f97
diff --git a/scripts/test_reclass.sh b/scripts/test_reclass.sh
index f04a6ec..34eb3c5 100755
--- a/scripts/test_reclass.sh
+++ b/scripts/test_reclass.sh
@@ -164,7 +164,6 @@
     for master in ${masters[@]}; do
         master=$(basename $master .yml)
         echo "$master"
-        continue
         run_tests $master
     done
 }