diff --git a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
index 6c4495f..ede1437 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
@@ -19,9 +19,8 @@
       kubelet:
         address: ${_param:single_address}
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           image: ${_param:kubernetes_calico_image}
           calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
           cni_image: ${_param:kubernetes_calico_cni_image}
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/control.yml b/classes/cluster/k8s-aio-calico/kubernetes/control.yml
index 0616a0f..d26942b 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/control.yml
@@ -51,9 +51,8 @@
       kubelet:
         address: ${_param:single_address}
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           etcd:
             ssl:
               enabled: true
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
index e8803e5..a5559f4 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
@@ -36,8 +36,8 @@
   kubernetes:
     pool:
       network:
-        cnis:
-        - opencontrail
+        opencontrail:
+          enabled: true
     common:
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml b/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
index 72a8dba..5923e3d 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
@@ -40,9 +40,8 @@
         netchecker:
           enabled: true
       network:
-        cnis:
-        - opencontrail
-        contrail:
+        opencontrail:
+          enabled: true
           public_ip_range: 185.22.97.128/26
           public_network: default-domain:default-project:Public
           private_ip_range: 10.150.0.0/16
diff --git a/classes/cluster/k8s-compact/kubernetes/compute.yml b/classes/cluster/k8s-compact/kubernetes/compute.yml
index 624f709..edb70a4 100644
--- a/classes/cluster/k8s-compact/kubernetes/compute.yml
+++ b/classes/cluster/k8s-compact/kubernetes/compute.yml
@@ -13,9 +13,8 @@
       kubelet:
         address: ${_param:single_address}
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           image: ${_param:kubernetes_calico_image}
           calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
           cni_image: ${_param:kubernetes_calico_cni_image}
diff --git a/classes/cluster/k8s-compact/kubernetes/control.yml b/classes/cluster/k8s-compact/kubernetes/control.yml
index 82bd0a9..5564e9c 100644
--- a/classes/cluster/k8s-compact/kubernetes/control.yml
+++ b/classes/cluster/k8s-compact/kubernetes/control.yml
@@ -55,9 +55,8 @@
         ssl:
           enabled: true
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           etcd:
             ssl:
               enabled: true
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
index 6a22893..a594585 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
@@ -21,9 +21,8 @@
   kubernetes:
     pool:
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           image: ${_param:kubernetes_calico_image}
           calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
           cni_image: ${_param:kubernetes_calico_cni_image}
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
index 7f8560d..0d755a2 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
@@ -49,9 +49,8 @@
         ssl:
           enabled: true
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           etcd:
             ssl:
               enabled: true
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
index cddee62..2718fc1 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
@@ -19,9 +19,8 @@
   kubernetes:
     pool:
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           image: ${_param:kubernetes_calico_image}
           calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
           cni_image: ${_param:kubernetes_calico_cni_image}
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
index 3bb63dc..cc7a920 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
@@ -38,9 +38,8 @@
         ssl:
           enabled: true
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           etcd:
             ssl:
               enabled: true
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index 2b91e0d..476f176 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -20,9 +20,8 @@
         address: ${_param:single_address}
         fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           image: ${_param:kubernetes_calico_image}
           calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
           cni_image: ${_param:kubernetes_calico_cni_image}
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index 6629e13..26a8608 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -59,9 +59,8 @@
         ssl:
           enabled: true
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           etcd:
             ssl:
               enabled: true
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index 3f5af94..b9d1e74 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -38,9 +38,8 @@
         address: ${_param:single_address}
         fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
-        cnis:
-        - opencontrail
-        contrail:
+        opencontrail:
+          enabled: true
           config:
             api:
               host: ${_param:opencontrail_control_address}
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index 116cd82..8ef2041 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -58,9 +58,8 @@
         netchecker:
           enabled: true
       network:
-        cnis:
-        - opencontrail
-        contrail:
+        opencontrail:
+          enabled: true
           public_ip_range: 185.22.97.128/26
           public_network: default-domain:default-project:Public
           private_ip_range: 10.150.0.0/16
diff --git a/classes/cluster/model-manager/infra/config.yml b/classes/cluster/model-manager/infra/config.yml
index ac19fcc..a92683e 100644
--- a/classes/cluster/model-manager/infra/config.yml
+++ b/classes/cluster/model-manager/infra/config.yml
@@ -3,8 +3,8 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-aio-contrail/infra/config.yml b/classes/cluster/os-aio-contrail/infra/config.yml
index ebcbe3c..9af72a5 100755
--- a/classes/cluster/os-aio-contrail/infra/config.yml
+++ b/classes/cluster/os-aio-contrail/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-aio-ovs/infra/config.yml b/classes/cluster/os-aio-ovs/infra/config.yml
index 9447401..ae1ccc0 100644
--- a/classes/cluster/os-aio-ovs/infra/config.yml
+++ b/classes/cluster/os-aio-ovs/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-ha-contrail-40/infra/config.yml b/classes/cluster/os-ha-contrail-40/infra/config.yml
index dc238d6..6f85651 100644
--- a/classes/cluster/os-ha-contrail-40/infra/config.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-ha-contrail/infra/config.yml b/classes/cluster/os-ha-contrail/infra/config.yml
index c3e9ea2..8c39819 100755
--- a/classes/cluster/os-ha-contrail/infra/config.yml
+++ b/classes/cluster/os-ha-contrail/infra/config.yml
@@ -5,8 +5,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-ha-ovs-ceph/infra/config.yml b/classes/cluster/os-ha-ovs-ceph/infra/config.yml
index a723985..fc1dee1 100644
--- a/classes/cluster/os-ha-ovs-ceph/infra/config.yml
+++ b/classes/cluster/os-ha-ovs-ceph/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-ha-ovs-pike/.env b/classes/cluster/os-ha-ovs-pike/.env
new file mode 100644
index 0000000..ff12bb9
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-pike/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="ntp sphinx nginx memcached horizon neutron runtest artifactory"
diff --git a/classes/cluster/os-ha-ovs-pike/infra/config.yml b/classes/cluster/os-ha-ovs-pike/infra/config.yml
new file mode 100644
index 0000000..5c513da
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-pike/infra/config.yml
@@ -0,0 +1,156 @@
+classes:
+- 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.pkg
+- system.salt.master.api
+- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
+- system.salt.minion.cert.proxy
+- system.sphinx.server.doc.reclass
+- system.keystone.client.core
+- system.keystone.client.service.designate
+- system.keystone.client.service.cinder
+- system.keystone.client.service.cinder2
+- system.keystone.client.service.cinder3
+- system.keystone.client.service.glance
+- system.keystone.client.service.glare
+- system.keystone.client.service.heat
+- system.keystone.client.service.heat-cfn
+- system.keystone.client.service.keystone
+- system.keystone.client.service.neutron
+- system.keystone.client.service.nova-ec2
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
+- system.mysql.client
+- system.mysql.client.database.cinder
+- system.mysql.client.database.glance
+- system.mysql.client.database.heat
+- system.mysql.client.database.keystone
+- system.mysql.client.database.nova
+- system.mysql.client.database.nova_api
+- system.mysql.client.database.neutron
+- system.reclass.storage.system.openstack_control_cluster
+- system.neutron.client.service.public
+- cluster.os-ha-ovs-pike.openstack.proxy
+- cluster.os-ha-ovs-pike
+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:infra_config_address}
+        nginx_proxy_openstack_api_heat_cfn:
+          enabled: false
+  salt:
+    master:
+      reactor:
+        reclass/minion/classify:
+        - salt://reclass/reactor/node_register.sls
+      environment:
+        prd:
+          formula:
+            runtest:
+              source: pkg
+              name: salt-formula-runtest
+  reclass:
+    storage:
+      class_mapping:
+        common_node:
+          expression: all
+          node_param:
+            single_address:
+              value_template: <<node_control_ip>>
+            linux_system_codename:
+              value_template: <<node_os>>
+            salt_master_host:
+              value_template: <<node_master_ip>>
+        infra_config:
+          expression: <<node_hostname>>__startswith__cfg
+          cluster_param:
+            infra_config_address:
+              value_template: <<node_control_ip>>
+            infra_config_deploy_address:
+              value_template: <<node_deploy_ip>>
+            cluster_domain:
+              value_template: <<node_domain>>
+        openstack_control01:
+          expression: <<node_hostname>>__equals__ctl01
+          cluster_param:
+            openstack_control_node01_address:
+              value_template: <<node_control_ip>>
+        openstack_control02:
+          expression: <<node_hostname>>__equals__ctl02
+          cluster_param:
+            openstack_control_node02_address:
+              value_template: <<node_control_ip>>
+        openstack_control03:
+          expression: <<node_hostname>>__equals__ctl03
+          cluster_param:
+            openstack_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>>
+        openstack_gateway:
+          expression: <<node_hostname>>__startswith__gtw
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.openstack.gateway
+          node_param:
+            tenant_address:
+              value_template: <<node_tenant_ip>>
+            external_address:
+              value_template: <<node_external_ip>>
+          cluster_param:
+            openstack_gateway_node01_address:
+              value_template: <<node_control_ip>>
+      node:
+        openstack_control_node01:
+          classes:
+          - 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-pike/infra/init.yml b/classes/cluster/os-ha-ovs-pike/infra/init.yml
new file mode 100644
index 0000000..838f096
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-pike/infra/init.yml
@@ -0,0 +1,20 @@
+parameters:
+  _param:
+    cluster_domain: os-ha-ovs-pike.local
+    cluster_name: os-ha-ovs-pike
+    infra_config_hostname: cfg01
+    infra_config_deploy_address: 192.168.10.90
+    infra_config_address: 172.16.10.90
+  linux:
+    network:
+      host:
+        cfg01:
+          address: ${_param:infra_config_address}
+          names:
+          - ${_param:infra_config_hostname}
+          - ${_param:infra_config_hostname}.${_param:cluster_domain}
+        cfg:
+          address: ${_param:infra_config_address}
+          names:
+          - cfg
+          - cfg.${_param:cluster_domain}
diff --git a/classes/cluster/os-ha-ovs-pike/init.yml b/classes/cluster/os-ha-ovs-pike/init.yml
new file mode 100644
index 0000000..780e88d
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-pike/init.yml
@@ -0,0 +1,17 @@
+classes:
+- system.linux.network.dynamic_hosts
+- system.linux.system.single
+- cluster.os-ha-ovs-pike.infra
+- cluster.os-ha-ovs-pike.openstack
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- system.openssh.server.team.services
+- cluster.overrides
+parameters:
+  _param:
+    salt_minion_ca_host: cfg01.${linux:system:domain}
+  salt:
+    minion:
+      trusted_ca_minions:
+        - cfg01.${linux:system:domain}
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/compute.yml b/classes/cluster/os-ha-ovs-pike/openstack/compute.yml
new file mode 100644
index 0000000..b1ab980
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-pike/openstack/compute.yml
@@ -0,0 +1,81 @@
+classes:
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.linux.network.hosts
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- cluster.os-ha-ovs-pike
+parameters:
+  _param:
+    primary_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+    interface_mtu: 9000
+    linux_system_codename: xenial
+  nova:
+    compute:
+      cpu_mode: none
+      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}
+      identity:
+        protocol: https
+      network:
+        protocol: https
+      glance:
+        protocol: https
+      image:
+        protocol: https
+  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-pike/openstack/control.yml b/classes/cluster/os-ha-ovs-pike/openstack/control.yml
new file mode 100644
index 0000000..20d2497
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-pike/openstack/control.yml
@@ -0,0 +1,284 @@
+classes:
+- system.salt.minion.cert.proxy
+- 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.linux.storage.loopback
+- system.memcached.server.single
+- system.rabbitmq.server.cluster
+- system.rabbitmq.server.vhost.openstack
+- system.nginx.server.single
+- system.nginx.server.proxy.openstack_api
+- system.nginx.server.proxy.openstack.designate
+- system.nginx.server.proxy.openstack.placement
+- 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.cinder.control.backend.lvm
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
+- system.heat.server.cluster
+- system.designate.server.cluster
+- system.designate.server.backend.bind
+- system.galera.server.cluster
+- system.galera.server.database.cinder
+- system.galera.server.database.designate
+- system.galera.server.database.glance
+- system.galera.server.database.heat
+- system.galera.server.database.keystone
+- system.galera.server.database.nova
+- cluster.os-ha-ovs-pike.openstack.dashboard
+- cluster.os-ha-ovs-pike
+parameters:
+  _param:
+    salt_minion_ca_authority: salt_master_ca
+    keepalived_vip_interface: ens4
+    ### nginx ssl sites settings
+    nginx_proxy_ssl:
+      enabled: true
+      engine: salt
+      authority: "${_param:salt_minion_ca_authority}"
+      key_file: "/etc/ssl/private/internal_proxy.key"
+      cert_file: "/etc/ssl/certs/internal_proxy.crt"
+      chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+    nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
+    nginx_proxy_openstack_keystone_host: 127.0.0.1
+    nginx_proxy_openstack_nova_host: 127.0.0.1
+    nginx_proxy_openstack_cinder_host: 127.0.0.1
+    nginx_proxy_openstack_glance_host: 127.0.0.1
+    nginx_proxy_openstack_neutron_host: 127.0.0.1
+    nginx_proxy_openstack_heat_host: 127.0.0.1
+    nginx_proxy_openstack_designate_host: 127.0.0.1
+    nginx_proxy_openstack_placement_host: 127.0.0.1
+    apache_keystone_api_host: ${_param:single_address}
+    apache_keystone_ssl: ${_param:nginx_proxy_ssl}
+    designate_api_address: 127.0.0.1
+    designate_api_base_uri: ${_param:cluster_vip_address}
+  nginx:
+    server:
+      site:
+        nginx_proxy_openstack_api_keystone:
+          enabled: false
+        nginx_proxy_openstack_api_keystone_private:
+          enabled: false
+  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"
+  designate:
+    worker:
+      enabled: ${_param:designate_worker_enabled}
+    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
+      bind:
+        api:
+          address: ${_param:designate_api_address}
+      api:
+        base_uri: ${_param:designate_service_protocol}://${_param:designate_api_base_uri}:9001/
+      identity:
+        protocol: https
+  glance:
+    server:
+      storage:
+        engine: file
+      images: []
+      workers: 1
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+      bind:
+        address: 127.0.0.1
+      identity:
+        protocol: https
+      registry:
+        protocol: https
+  heat:
+    server:
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+      bind:
+        api:
+          address: 127.0.0.1
+        api_cfn:
+          address: 127.0.0.1
+        api_cloudwatch:
+          address: 127.0.0.1
+      identity:
+        protocol: https
+  neutron:
+    server:
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+      bind:
+        address: 127.0.0.1
+      identity:
+        protocol: https
+  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
+  nova:
+    controller:
+      networking: dvr
+      cpu_allocation: 54
+      metadata:
+        password: ${_param:metadata_password}
+      bind:
+        private_address: 127.0.0.1
+        public_address: ${_param:cluster_vip_address}
+        novncproxy_port: 6080
+      identity:
+        protocol: https
+      network:
+        protocol: https
+      glance:
+        protocol: https
+      vncproxy_url: http://${_param:cluster_vip_address}:6080
+      workers: 1
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+      metadata:
+         bind:
+           address: ${_param:single_address}
+  cinder:
+    volume:
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+    controller:
+      notification:
+        driver: messagingv2
+        topics: "notifications"
+      identity:
+        protocol: https
+      osapi:
+        host: 127.0.0.1
+      glance:
+        protocol: https
+  salt:
+    minion:
+      cert:
+        internal_proxy:
+          host: ${_param:salt_minion_ca_host}
+          authority: ${_param:salt_minion_ca_authority}
+          common_name: internal_proxy
+          signing_policy: cert_open
+          alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_public_host},DNS:${linux:system:name},DNS:${linux:network:fqdn},DNS:${_param:cluster_local_address},DNS:${_param:cluster_public_host}
+          key_file: "/etc/ssl/private/internal_proxy.key"
+          cert_file: "/etc/ssl/certs/internal_proxy.crt"
+          all_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+  haproxy:
+    proxy:
+      listen:
+        keystone_public_api:
+          type: ~
+        designate_api:
+          type: ~
+        keystone_admin_api:
+          type: ~
+        nova_api:
+          type: ~
+        nova_metadata_api:
+          type: ~
+        cinder_api:
+          type: ~
+        glance_api:
+          type: ~
+        glance_registry_api:
+          type: ~
+        heat_cloudwatch_api:
+          type: ~
+        heat_api:
+          type: ~
+        heat_cfn_api:
+          type: ~
+        neutron_api:
+          type: ~
+        nova_placement_api:
+          mode: tcp
+          service_name: nova_placement
+          binds:
+          - address: ${_param:cluster_vip_address}
+            port: 8778
+          servers:
+          - name: ${_param:cluster_node01_hostname}
+            host: ${_param:cluster_node01_address}
+            port: 8778
+            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+          - name: ${_param:cluster_node02_hostname}
+            host: ${_param:cluster_node02_address}
+            port: 8778
+            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+          - name: ${_param:cluster_node03_hostname}
+            host: ${_param:cluster_node03_address}
+            port: 8778
+            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml b/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml
new file mode 100644
index 0000000..e12c636
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-pike/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.single
+- cluster.os-ha-ovs-pike
+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-pike/openstack/gateway.yml b/classes/cluster/os-ha-ovs-pike/openstack/gateway.yml
new file mode 100644
index 0000000..58201bc
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-pike/openstack/gateway.yml
@@ -0,0 +1,89 @@
+classes:
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.neutron.gateway.cluster
+- cluster.os-ha-ovs-pike
+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
+          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
+        external_interface:
+          enabled: true
+          ipflush_onchange: 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
+        phy-public:
+          enabled: true
+          type: ovs_port
+          bridge: br-floating
+          proto: static
+          address: ${_param:openstack_public_neutron_subnet_gateway}
+          netmask: 255.255.255.0
+
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/init.yml b/classes/cluster/os-ha-ovs-pike/openstack/init.yml
new file mode 100644
index 0000000..11766e1
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-pike/openstack/init.yml
@@ -0,0 +1,231 @@
+parameters:
+  _param:
+    openstack_proxy_hostname: cfg
+    openstack_proxy_address: 172.16.10.254
+    openstack_proxy_node01_hostname: cfg01
+    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: pike
+    apt_mk_version: nightly
+    mcp_repo_version: 1.1
+    openstack_region: RegionOne
+    admin_email: root@localhost
+    cluster_public_protocol: https
+    cluster_internal_protocol: https
+    cluster_public_host: ${_param:openstack_proxy_address}
+    keystone_service_protocol: ${_param:cluster_internal_protocol}
+    glance_service_protocol: ${_param:cluster_internal_protocol}
+    nova_service_protocol: ${_param:cluster_internal_protocol}
+    neutron_service_protocol: ${_param:cluster_internal_protocol}
+    heat_service_protocol: ${_param:cluster_internal_protocol}
+    cinder_service_protocol: ${_param:cluster_internal_protocol}
+    designate_service_protocol: ${_param:cluster_internal_protocol}
+    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
+    openstack_public_neutron_subnet_gateway:  192.168.130.1
+    openstack_public_neutron_subnet_cidr: 192.168.130.0/24
+    openstack_public_neutron_subnet_allocation_start: 192.168.130.10
+    openstack_public_neutron_subnet_allocation_end: 192.168.130.254
+    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
+    designate_service_host: ${_param:openstack_control_address}
+    designate_admin_api_enabled: true
+    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_worker_enabled: true
+    designate_version: ${_param:openstack_version}
+    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: workshop
+    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
+    mysql_designate_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
+    keystone_designate_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
+    nginx_proxy_openstack_api_proxy_host: ${_param:cluster_vip_address}
+    loopback_device_size: 20
+    runtest_tempest_cfg_dir: /root/rally_reports/
+    runtest_tempest_cfg_name: tempest_generated.conf
+    artifactory_user: artifactory_user
+    artifactory_password: artifactory_password
+  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}
+  runtest:
+    enabled: True
+    test_target: gtw0*
+    keystonerc_node: ctl01*
+    tempest:
+      enabled: True
+      cfg_dir: ${_param:runtest_tempest_cfg_dir}
+      cfg_name: ${_param:runtest_tempest_cfg_name}
+      DEFAULT:
+        log_file: /home/rally/rally_reports/tempest.log
+      compute:
+        build_timeout: 600
+        min_microversion: 2.1
+        max_microversion: 2.42
+      orchestration:
+        max_template_size: 5440000
+        max_resources_per_stack: 20000
+      dns_feature_enabled:
+        # Switch this to designate_admin_api_enabled once [1] is promoted to stable packages
+        # [1] https://gerrit.mcp.mirantis.net/gitweb?p=salt-formulas/designate.git;a=commit;h=96a3f43f6cf1149559e54a00b5548bdf46333749
+        api_admin: false
+        api_v1: false
+        api_v2: true
+        api_v2_quotas: true
+        api_v2_root_recordsets: true
+        bug_1573141_fixed: true
+      volume-feature-enabled:
+        backup: false
+    artifact_collector:
+      enabled: true
+      artifactory:
+       enabled: true
+       user: ${_param:artifactory_user}
+       password: ${_param:artifactory_password}
+       host: artifactory.mcp.mirantis.net
+       port: 443
+       proto: https
+       endpoint: /oscore-local/${_param:cluster_domain}/${_param:infra_config_hostname}
+      artifacts:
+        sys_logs:
+          path: /var/log
+        etc:
+          path: /etc
+
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/proxy.yml b/classes/cluster/os-ha-ovs-pike/openstack/proxy.yml
new file mode 100644
index 0000000..ead28d0
--- /dev/null
+++ b/classes/cluster/os-ha-ovs-pike/openstack/proxy.yml
@@ -0,0 +1,17 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.openstack_api
+- system.nginx.server.proxy.openstack_vnc
+- system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.openstack.designate
+- system.salt.minion.cert.proxy
+- cluster.os-ha-ovs-pike.openstack.dashboard
+- cluster.os-ha-ovs-pike
+parameters:
+  _param:
+    nginx_proxy_ssl:
+      enabled: true
+      authority: ${_param:salt_minion_ca_authority}
+      engine: salt
+      mode: secure
+    salt_minion_ca_host: cfg01.${linux:system:domain}
diff --git a/classes/cluster/os-ha-ovs-syndic/infra/config.yml b/classes/cluster/os-ha-ovs-syndic/infra/config.yml
index 43ee1d7..81145b1 100644
--- a/classes/cluster/os-ha-ovs-syndic/infra/config.yml
+++ b/classes/cluster/os-ha-ovs-syndic/infra/config.yml
@@ -3,8 +3,8 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/os-ha-ovs/infra/config.yml b/classes/cluster/os-ha-ovs/infra/config.yml
index a7d91a2..686088f 100644
--- a/classes/cluster/os-ha-ovs/infra/config.yml
+++ b/classes/cluster/os-ha-ovs/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index b78a930..ac2f555 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -19,9 +19,8 @@
   kubernetes:
     pool:
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           image: ${_param:kubernetes_calico_image}
           calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
           cni_image: ${_param:kubernetes_calico_cni_image}
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/control.yml b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
index 6ffe418..1c0f9d1 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
@@ -39,9 +39,8 @@
         ssl:
           enabled: true
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           etcd:
             ssl:
               enabled: true
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml b/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
index 9365431..c64be9f 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
@@ -32,8 +32,8 @@
   kubernetes:
     pool:
       network:
-        cnis:
-        - opencontrail
+        opencontrail:
+          enabled: true
     common:
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
index 24de888..2cf6932 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
@@ -39,9 +39,8 @@
         netchecker:
           enabled: true
       network:
-        cnis:
-        - opencontrail
-        contrail:
+        opencontrail:
+          enabled: true
           public_ip_range: 185.22.97.128/26
           public_network: default-domain:default-project:Public
           private_ip_range: 10.150.0.0/16
diff --git a/classes/cluster/sl-os-contrail/infra/config.yml b/classes/cluster/sl-os-contrail/infra/config.yml
index 6db02be..e85cff6 100755
--- a/classes/cluster/sl-os-contrail/infra/config.yml
+++ b/classes/cluster/sl-os-contrail/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/sl-os-ovs/infra/config.yml b/classes/cluster/sl-os-ovs/infra/config.yml
index eac6a06..945673b 100644
--- a/classes/cluster/sl-os-ovs/infra/config.yml
+++ b/classes/cluster/sl-os-ovs/infra/config.yml
@@ -6,8 +6,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.docker
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
index 6235e8f..07eaa0f 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
index 7d0a986..fdd6cdd 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
@@ -5,8 +5,8 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.ubuntu
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml b/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml
index aa4c25f..0678b6e 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml b/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
index da81d4e..e1492eb 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
@@ -5,8 +5,8 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.ubuntu
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
index 03135b3..f406a42 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo_local.mcp.salt
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.reclass.storage.system.ceph_mon_cluster
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
index 90e94f8..cbffebb 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
index d9c1364..39f1b33 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo_local.mcp.salt
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.reclass.storage.system.ceph_mon_cluster
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
index 434c89e..0467708 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
@@ -5,8 +5,8 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.reclass.storage.system.ceph_mon_cluster
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index 22dfde8..b56b9ac 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
index fbacd1d..412a79c 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
@@ -5,8 +5,8 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.reclass.storage.system.ceph_mon_cluster
 - system.reclass.storage.system.ceph_rgw_cluster
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
index f5600aa..729d44f 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index ebcf19b..4037283 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 #- system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.salt.master.formula.pkg.manila
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
index 5500883..f5c8597 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
@@ -5,8 +5,8 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.reclass.storage.system.ceph_mon_cluster
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
index f216aa9..0563d54 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 #- system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.salt.master.formula.pkg.manila
 - system.salt.master.formula.pkg.gnocchi
 - system.salt.master.formula.pkg.panko
diff --git a/classes/cluster/virtual-mcp05-dvr/infra/config.yml b/classes/cluster/virtual-mcp05-dvr/infra/config.yml
index ed92a36..d8db7de 100644
--- a/classes/cluster/virtual-mcp05-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp05-dvr/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.tcp_salt
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp05-ovs/infra/config.yml b/classes/cluster/virtual-mcp05-ovs/infra/config.yml
index 6e8be81..7882e02 100644
--- a/classes/cluster/virtual-mcp05-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp05-ovs/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.tcp_salt
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp10-contrail/infra/config.yml b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
index 64fb0a1..f51a706 100755
--- a/classes/cluster/virtual-mcp10-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
@@ -3,8 +3,8 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp10-dvr/infra/config.yml b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
index 3eaadc9..8b0c481 100644
--- a/classes/cluster/virtual-mcp10-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
@@ -3,8 +3,8 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp10-ovs/infra/config.yml b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
index dc77ca6..6ea73b6 100644
--- a/classes/cluster/virtual-mcp10-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
@@ -3,8 +3,8 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index 8a2b105..dfbfc10 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -4,8 +4,8 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml b/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
index ed9bbf6..2199faa 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp11-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
index 4853abd..580d993 100755
--- a/classes/cluster/virtual-mcp11-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp11-dvr/infra/config.yml b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
index ad68abd..92da150 100644
--- a/classes/cluster/virtual-mcp11-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
index b90bbe1..2ada67e 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
@@ -14,9 +14,8 @@
   kubernetes:
     pool:
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           image: ${_param:kubernetes_calico_image}
           calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
           cni_image: ${_param:kubernetes_calico_cni_image}
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 813c28a..e2b9819 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
@@ -44,9 +44,8 @@
         ssl:
           enabled: true
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           etcd:
             ssl:
               enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
index 7ee7b30..fe6c867 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
@@ -14,9 +14,8 @@
   kubernetes:
     pool:
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           image: ${_param:kubernetes_calico_image}
           calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
           cni_image: ${_param:kubernetes_calico_cni_image}
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 1640fb7..0588b70 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
@@ -45,9 +45,8 @@
         ssl:
           enabled: true
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           etcd:
             ssl:
               enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index 4408379..27395f0 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -15,9 +15,8 @@
       kubelet:
         fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           image: ${_param:kubernetes_calico_image}
           calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
           cni_image: ${_param:kubernetes_calico_cni_image}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 3718aa4..9797bb4 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -46,9 +46,8 @@
         ssl:
           enabled: true
       network:
-        cnis:
-        - calico
         calico:
+          enabled: true
           etcd:
             ssl:
               enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 60c2328..f8f568b 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -36,9 +36,8 @@
       kubelet:
         fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
-        cnis:
-        - opencontrail
-        contrail:
+        opencontrail:
+          enabled: true
           config:
             api:
               host: ${_param:opencontrail_control_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index 0968833..d2210eb 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -50,9 +50,8 @@
         netchecker:
           enabled: ${_param:kubernetes_netchecker_enabled}
       network:
-        cnis:
-        - opencontrail
-        contrail:
+        opencontrail:
+          enabled: true
           public_ip_range: 185.22.97.128/26
           public_network: default-domain:default-project:Public
           private_ip_range: 10.150.0.0/16
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
index c1528b4..0211bf4 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
index ad9a18f..3cf494d 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.salt.master.formula.pkg.baremetal
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
index f62dd25..be7adff 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.salt.master.formula.pkg.baremetal
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/config.yml b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
index 237db95..16e21f2 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
index 4224974..cd33c53 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo_local.mcp.salt
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 #- system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
index 18389dc..eb0da09 100644
--- a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo_local.mcp.salt
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
index 4c55eee..25baf27 100644
--- a/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
-- system.salt.master.api
 - system.salt.master.pkg
+- system.salt.master.api
 - system.reclass.storage.salt
 - system.salt.minion.ca.salt_master
 - system.salt.minion.cert.proxy