diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
index 676a1f8..e9cd961 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
@@ -16,6 +16,9 @@
         storage-driver: overlay2
   kubernetes:
     pool:
+      proxy:
+        daemon_opts:
+          cluster-cidr: ${_param:calico_private_network}/${_param:calico_private_netmask}
       kubelet:
         address: ${_param:single_address}
         fail_on_swap: ${_param:kubelet_fail_on_swap}
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
index 4f2bcce..57b41fd 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -56,6 +56,8 @@
           enabled: ${_param:kubernetes_metallb_enabled}
           addresses:
           - ${_param:kubernetes_metallb_addresses_pool}
+        ingress-nginx:
+          enabled: ${_param:kubernetes_ingressnginx_enabled}
     master:
       kubelet:
         address: ${_param:single_address}
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
index 22b959a..c994041 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
@@ -21,15 +21,11 @@
     kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
 
     # component docker images
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.11.2-1
-    kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.11.2-1
-    kubernetes_virtlet_image: mirantis/virtlet:v1.4.0
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.11.3-2
+    kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.11.3-2
+    kubernetes_virtlet_image: mirantis/virtlet:v1.4.1
     kubernetes_criproxy_version: v0.12.0
     kubernetes_criproxy_checksum: md5=371cacd3d8568eb88425498b48a649dd
-    kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
-    kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
-    kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
-    kubernetes_dns_autoscaler_image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0
     kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
     kubernetes_genie_image: mirantis/cnigenie:latest
     # kube-controllers image is temporarily added here as it's not defined in TCP-QA by now
@@ -87,6 +83,7 @@
     kubernetes_coredns_enabled: true
     kubernetes_externaldns_enabled: false
     kubernetes_metallb_enabled: false
+    kubernetes_ingressnginx_enabled: false
 
   linux:
     network:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index 2f5afd9..92e7a25 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -16,6 +16,9 @@
         storage-driver: overlay2
   kubernetes:
     pool:
+      proxy:
+        daemon_opts:
+          cluster-cidr: ${_param:calico_private_network}/${_param:calico_private_netmask}
       kubelet:
         address: ${_param:single_address}
         fail_on_swap: ${_param:kubelet_fail_on_swap}
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index 9656362..df24448 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -55,6 +55,8 @@
           enabled: ${_param:kubernetes_metallb_enabled}
           addresses:
           - ${_param:kubernetes_metallb_addresses_pool}
+        ingress-nginx:
+          enabled: ${_param:kubernetes_ingressnginx_enabled}
     master:
       kubelet:
         address: ${_param:single_address}
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index 8becfef..8181eaf 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -21,15 +21,11 @@
     kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
 
     # component docker images
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.11.2-1
-    kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.11.2-1
-    kubernetes_virtlet_image: mirantis/virtlet:v1.4.0
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.11.3-2
+    kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.11.3-2
+    kubernetes_virtlet_image: mirantis/virtlet:v1.4.1
     kubernetes_criproxy_version: v0.12.0
     kubernetes_criproxy_checksum: md5=371cacd3d8568eb88425498b48a649dd
-    kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
-    kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
-    kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
-    kubernetes_dns_autoscaler_image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0
     kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
     # kube-controllers image is temporarily added here as it's not defined in TCP-QA by now
     kubernetes_calico_kube_controllers_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/kube-controllers:v3.1.3
@@ -86,6 +82,7 @@
     kubernetes_coredns_enabled: true
     kubernetes_externaldns_enabled: false
     kubernetes_metallb_enabled: false
+    kubernetes_ingressnginx_enabled: false
 
   linux:
     network:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index f83f9a4..5eddc11 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -80,6 +80,8 @@
           enabled: ${_param:kubernetes_externaldns_enabled}
           image: ${_param:kubernetes_externaldns_image}
           provider: ${_param:kubernetes_externaldns_provider}
+        ingress-nginx:
+          enabled: ${_param:kubernetes_ingressnginx_enabled}
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}
     master:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
index 9248a8a..1ea0664 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
@@ -47,6 +47,7 @@
     kubernetes_contrail_network_controller: true
     kubernetes_coredns_enabled: true
     kubernetes_externaldns_enabled: false
+    kubernetes_ingressnginx_enabled: false
 
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index 7c2d531..f308676 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -52,6 +52,8 @@
           enabled: ${_param:kubernetes_externaldns_enabled}
           image: ${_param:kubernetes_externaldns_image}
           provider: ${_param:kubernetes_externaldns_provider}
+        ingress-nginx:
+          enabled: ${_param:kubernetes_ingressnginx_enabled}
     master:
       kubelet:
         address: ${_param:single_address}
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index 8bdf4ab..cc1253b 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -51,6 +51,7 @@
     kubernetes_contrail_network_controller: true
     kubernetes_coredns_enabled: true
     kubernetes_externaldns_enabled: false
+    kubernetes_ingressnginx_enabled: false
 
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster/os-ha-contrail-40/infra/config.yml b/classes/cluster/os-ha-contrail-40/infra/config.yml
index b6f2954..f248234 100644
--- a/classes/cluster/os-ha-contrail-40/infra/config.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/config.yml
@@ -35,8 +35,6 @@
 - system.mysql.client.database.neutron
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
-- system.glance.client.image.cirros
-- system.glance.client.image.ubuntu_xenial
 - system.nova.client.flavor.default
 - cluster.os-ha-contrail-40.openstack.proxy
 - cluster.os-ha-contrail-40
diff --git a/classes/cluster/os-ha-contrail/infra/config.yml b/classes/cluster/os-ha-contrail/infra/config.yml
index d5d40c0..27daba8 100755
--- a/classes/cluster/os-ha-contrail/infra/config.yml
+++ b/classes/cluster/os-ha-contrail/infra/config.yml
@@ -37,8 +37,6 @@
 - system.mysql.client.database.neutron
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
-- system.glance.client.image.cirros
-- system.glance.client.image.ubuntu_xenial
 - system.nova.client.flavor.default
 - cluster.os-ha-contrail.openstack.proxy
 - cluster.os-ha-contrail
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index 1545532..bdb4290 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -18,6 +18,9 @@
         storage-driver: overlay2
   kubernetes:
     pool:
+      proxy:
+        daemon_opts:
+          cluster-cidr: ${_param:calico_private_network}/${_param:calico_private_netmask}
       kubelet:
         address: ${_param:single_address}
         fail_on_swap: ${_param:kubelet_fail_on_swap}
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/control.yml b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
index f078d3f..a55ccd8 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
@@ -57,6 +57,8 @@
           enabled: ${_param:kubernetes_metallb_enabled}
           addresses:
           - ${_param:kubernetes_metallb_addresses_pool}
+        ingress-nginx:
+          enabled: ${_param:kubernetes_ingressnginx_enabled}
     master:
       kubelet:
         address: ${_param:single_address}
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/init.yml b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
index 7babafd..f1123bb 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
@@ -46,6 +46,7 @@
     kubernetes_coredns_enabled: true
     kubernetes_externaldns_enabled: false
     kubernetes_metallb_enabled: false
+    kubernetes_ingressnginx_enabled: false
 
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster/sl-k8s-calico/stacklight/server.yml b/classes/cluster/sl-k8s-calico/stacklight/server.yml
index b4553ed..b5b4729 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/server.yml
@@ -2,7 +2,6 @@
 - system.docker.host
 - system.linux.system.repo.mcp.apt_mirantis.elastic.5x
 - system.linux.system.repo.mcp.apt_mirantis.kibana.5x
-- system.linux.system.repo.mcp.apt_mirantis.influxdb
 - system.linux.system.repo.mcp.apt_mirantis.docker
 # Needed to install Galera packages
 - system.linux.system.repo.mcp.apt_mirantis.openstack
@@ -10,14 +9,10 @@
 - system.elasticsearch.server.curator
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
-- system.haproxy.proxy.listen.stacklight.influxdb_relay
 - system.haproxy.proxy.listen.stacklight.kibana
 - service.haproxy.proxy.single
-- system.influxdb.relay.cluster
 - system.galera.server.cluster
 - system.galera.server.database.grafana
-- system.influxdb.server.single
-- system.influxdb.database.prometheus
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
@@ -25,10 +20,17 @@
 - system.prometheus.alerta
 - system.prometheus.alertmanager.notification.alerta
 - system.prometheus.server.alert.alerta_relabel
-- system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring.prometheus_global
+- system.prometheus.server.target.dns.alertmanager
+- system.prometheus.server.target.dns.prometheus
+- system.prometheus.server.target.dns.pushgateway
+- system.prometheus.server.target.dns.remote_agent
+- system.docker.swarm.stack.monitoring.prometheus
+- system.docker.swarm.stack.monitoring.prometheus.global
+- system.docker.swarm.stack.monitoring.alertmanager
+- system.docker.swarm.stack.monitoring.prometheus_relay
+- system.docker.swarm.stack.monitoring.pushgateway
+- system.docker.swarm.stack.monitoring.remote_agent
 - system.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
 - cluster.sl-k8s-calico
@@ -41,12 +43,10 @@
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:${_param:apt_mk_version}
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:${_param:apt_mk_version}
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:${_param:apt_mk_version}
-    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
     docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}
     docker_image_alerta: docker-prod-virtual.docker.mirantis.net/mirantis/external/alerta-web:${_param:apt_mk_version}
     elasticsearch_version: 5
-    docker_influxdb_image: influxdb:1.2
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
     keepalived_prometheus_vip_password: password
@@ -72,18 +72,6 @@
     grafana_database_type: mysql
     grafana_database_host: ${_param:cluster_vip_address}
     grafana_database_password: ${_param:mysql_grafana_password}
-    # InfluxDB
-    influxdb_admin_password: password
-    influxdb_port: 15016
-    influxdb_stacklight_password: lmapass
-    influxdb_client_host: ${_param:stacklight_monitor_address}
-    influxdb_client_port: ${_param:influxdb_port}
-    influxdb_client_password: ${_param:influxdb_admin_password}
-    prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
-    prometheus_influxdb_db: prometheus
-    prometheus_influxdb_username: lma
-    prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
-    telegraf_remote_agent_influxdb_address: ${_param:stacklight_monitor_address}
   elasticsearch:
     server:
       heap:
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
index 6c1b492..2cf38fa 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
@@ -36,6 +36,8 @@
           enabled: ${_param:kubernetes_externaldns_enabled}
           image: ${_param:kubernetes_externaldns_image}
           provider: ${_param:kubernetes_externaldns_provider}
+        ingress-nginx:
+          enabled: ${_param:kubernetes_ingressnginx_enabled}
     master:
       etcd:
         ssl:
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
index fdc84c0..33b9a1a 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
@@ -26,6 +26,7 @@
     # switches of addons
     kubernetes_coredns_enabled: true
     kubernetes_externaldns_enabled: false
+    kubernetes_ingressnginx_enabled: false
 
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/server.yml b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
index 84ef2a3..cac402c 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
@@ -1,5 +1,4 @@
 classes:
-- system.linux.system.repo.influxdb
 - system.linux.system.repo.elasticsearch.5
 - system.linux.system.repo.kibana.5
 - system.linux.system.repo.docker
@@ -11,13 +10,9 @@
 - system.kibana.server.single
 - system.haproxy.proxy.listen.stacklight.elasticsearch
 - system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb_relay
 - service.haproxy.proxy.single
 - system.galera.server.cluster
 - system.galera.server.database.grafana
-- system.influxdb.relay.cluster
-- system.influxdb.server.single
-- system.influxdb.database.prometheus
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
@@ -25,10 +20,17 @@
 - system.prometheus.alerta
 - system.prometheus.alertmanager.notification.alerta
 - system.prometheus.server.alert.alerta_relabel
-- system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring.prometheus_global
+- system.prometheus.server.target.dns.alertmanager
+- system.prometheus.server.target.dns.prometheus
+- system.prometheus.server.target.dns.pushgateway
+- system.prometheus.server.target.dns.remote_agent
+- system.docker.swarm.stack.monitoring.prometheus
+- system.docker.swarm.stack.monitoring.prometheus.global
+- system.docker.swarm.stack.monitoring.alertmanager
+- system.docker.swarm.stack.monitoring.prometheus_relay
+- system.docker.swarm.stack.monitoring.pushgateway
+- system.docker.swarm.stack.monitoring.remote_agent
 - system.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
 - cluster.sl-k8s-contrail.infra
@@ -41,7 +43,6 @@
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:${_param:apt_mk_version}
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:${_param:apt_mk_version}
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:${_param:apt_mk_version}
-    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
     docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}
     docker_image_alerta: docker-prod-virtual.docker.mirantis.net/mirantis/external/alerta-web:${_param:apt_mk_version}
@@ -66,13 +67,6 @@
     cluster_node02_address: ${_param:stacklight_monitor_node02_address}
     cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
-    influxdb_port: 8086
-    influxdb_admin_password: password
-    influxdb_stacklight_password: lmapass
-    prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
-    prometheus_influxdb_db: prometheus
-    prometheus_influxdb_username: lma
-    prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
     rabbitmq_openstack_password: workshop
     heka_amqp_host: ${_param:kubernetes_control_address}
   elasticsearch:
diff --git a/classes/cluster/sl-os-contrail/stacklight/server.yml b/classes/cluster/sl-os-contrail/stacklight/server.yml
index 7b6b684..8cd2552 100755
--- a/classes/cluster/sl-os-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/server.yml
@@ -26,10 +26,17 @@
 - system.prometheus.alerta
 - system.prometheus.alertmanager.notification.alerta
 - system.prometheus.server.alert.alerta_relabel
-- system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring.prometheus_global
+- system.prometheus.server.target.dns.alertmanager
+- system.prometheus.server.target.dns.prometheus
+- system.prometheus.server.target.dns.pushgateway
+- system.prometheus.server.target.dns.remote_agent
+- system.docker.swarm.stack.monitoring.prometheus
+- system.docker.swarm.stack.monitoring.prometheus.global
+- system.docker.swarm.stack.monitoring.alertmanager
+- system.docker.swarm.stack.monitoring.prometheus_relay
+- system.docker.swarm.stack.monitoring.pushgateway
+- system.docker.swarm.stack.monitoring.remote_agent
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
@@ -58,7 +65,6 @@
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:${_param:apt_mk_version}
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:${_param:apt_mk_version}
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:${_param:apt_mk_version}
-    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
     docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:${_param:apt_mk_version}
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
     docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}
diff --git a/classes/cluster/sl-os-ovs/stacklight/server.yml b/classes/cluster/sl-os-ovs/stacklight/server.yml
index 43376a6..62eaf87 100644
--- a/classes/cluster/sl-os-ovs/stacklight/server.yml
+++ b/classes/cluster/sl-os-ovs/stacklight/server.yml
@@ -23,10 +23,17 @@
 - system.prometheus.alerta
 - system.prometheus.alertmanager.notification.alerta
 - system.prometheus.server.alert.alerta_relabel
-- system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring.prometheus_global
+- system.prometheus.server.target.dns.alertmanager
+- system.prometheus.server.target.dns.prometheus
+- system.prometheus.server.target.dns.pushgateway
+- system.prometheus.server.target.dns.remote_agent
+- system.docker.swarm.stack.monitoring.prometheus
+- system.docker.swarm.stack.monitoring.prometheus.global
+- system.docker.swarm.stack.monitoring.alertmanager
+- system.docker.swarm.stack.monitoring.prometheus_relay
+- system.docker.swarm.stack.monitoring.pushgateway
+- system.docker.swarm.stack.monitoring.remote_agent
 - system.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
 - system.docker.swarm.stack.monitoring.remote_collector
@@ -57,7 +64,6 @@
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:${_param:apt_mk_version}
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:${_param:apt_mk_version}
     docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:${_param:apt_mk_version}
-    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
     docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}
     grafana_admin_password: admin
diff --git a/classes/cluster/sl-pike-dvr/stacklight/server.yml b/classes/cluster/sl-pike-dvr/stacklight/server.yml
index 07324aa..fa6f3c7 100644
--- a/classes/cluster/sl-pike-dvr/stacklight/server.yml
+++ b/classes/cluster/sl-pike-dvr/stacklight/server.yml
@@ -26,10 +26,17 @@
 - system.prometheus.alerta
 - system.prometheus.alertmanager.notification.alerta
 - system.prometheus.server.alert.alerta_relabel
-- system.prometheus.server.remote_write.docker
 - system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring.prometheus_global
+- system.prometheus.server.target.dns.alertmanager
+- system.prometheus.server.target.dns.prometheus
+- system.prometheus.server.target.dns.pushgateway
+- system.prometheus.server.target.dns.remote_agent
+- system.docker.swarm.stack.monitoring.prometheus
+- system.docker.swarm.stack.monitoring.prometheus.global
+- system.docker.swarm.stack.monitoring.alertmanager
+- system.docker.swarm.stack.monitoring.prometheus_relay
+- system.docker.swarm.stack.monitoring.pushgateway
+- system.docker.swarm.stack.monitoring.remote_agent
 - system.docker.swarm.stack.monitoring.remote_collector
 - system.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
@@ -61,7 +68,6 @@
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:${_param:apt_mk_version}
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:${_param:apt_mk_version}
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:${_param:apt_mk_version}
-    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
     docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:${_param:apt_mk_version}
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
     docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index 5ac9e18..0c78e8d 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -18,6 +18,9 @@
         storage-driver: overlay2
   kubernetes:
     pool:
+      proxy:
+        daemon_opts:
+          cluster-cidr: ${_param:calico_private_network}/${_param:calico_private_netmask}
       kubelet:
         address: ${_param:single_address}
         fail_on_swap: ${_param:kubelet_fail_on_swap}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 74b1eb1..8d4d21a 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -60,6 +60,8 @@
           enabled: ${_param:kubernetes_metallb_enabled}
           addresses:
           - ${_param:kubernetes_metallb_addresses_pool}
+        ingress-nginx:
+          enabled: ${_param:kubernetes_ingressnginx_enabled}
     master:
       kubelet:
         address: ${_param:single_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index cc50448..f5b45d0 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -91,6 +91,7 @@
     kubernetes_coredns_enabled: true
     kubernetes_externaldns_enabled: false
     kubernetes_metallb_enabled: false
+    kubernetes_ingressnginx_enabled: false
 
   linux:
     network:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/.env b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/.env
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/.env
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/.env
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/cephfs.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/cephfs.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/cephfs.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/cephfs.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/common.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/common.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/common.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/common.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/init.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/init.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/init.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/mon.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/mon.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/mon.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/mon.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/osd.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/osd.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/osd.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/osd.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgw.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgw.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgw.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgw.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgwproxy.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgwproxy.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgwproxy.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/rgwproxy.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/setup.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/setup.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/ceph/setup.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/ceph/setup.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_ceph.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_ceph.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_ceph.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_ceph.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_common.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_common.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_common.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_common.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_mysql.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_mysql.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_mysql.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_mysql.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/server.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/server.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/server.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/server.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/init.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/infra/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/init.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/infra/init.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/init.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/compute.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/openstack/compute.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/compute.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/openstack/compute.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/dashboard.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/dashboard.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/openstack/dashboard.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/gateway.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/openstack/gateway.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/gateway.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/openstack/gateway.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/init.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/openstack/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/init.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/openstack/init.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/client.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/stacklight/client.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/client.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/stacklight/client.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/init.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/stacklight/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/init.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/stacklight/init.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/proxy.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/stacklight/proxy.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/proxy.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/stacklight/proxy.yml
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml b/classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/cephfs.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/ceph/cephfs.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/cephfs.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/ceph/cephfs.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/common.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/ceph/common.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/common.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/ceph/common.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/init.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/ceph/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/init.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/ceph/init.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/mon.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/ceph/mon.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/mon.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/ceph/mon.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/osd.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/ceph/osd.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/osd.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/ceph/osd.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/setup.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/ceph/setup.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/ceph/setup.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/ceph/setup.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/infra/config.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/infra/config.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/init.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/infra/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/infra/init.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/infra/init.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/init.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/compute.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/openstack/compute.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/compute.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/openstack/compute.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/openstack/control.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/openstack/control.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/dashboard.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/openstack/dashboard.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/dashboard.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/openstack/dashboard.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/gateway.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/openstack/gateway.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/gateway.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/openstack/gateway.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/init.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/openstack/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/init.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/openstack/init.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/client.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/stacklight/client.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/client.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/stacklight/client.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/init.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/stacklight/init.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/init.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/stacklight/init.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/proxy.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/stacklight/proxy.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/proxy.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/stacklight/proxy.yml
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/server.yml b/classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/stacklight/server.yml
similarity index 100%
rename from classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/server.yml
rename to classes/cluster_deprecated/virtual-mcp-pike-ovs-ceph/stacklight/server.yml
diff --git a/classes/system b/classes/system
index 8d78137..4ab3648 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 8d78137fd642fea568ebe7019f0d62c71800cc21
+Subproject commit 4ab36482f850169df3eb3faeff4d07b6f4abe1fd