diff --git a/classes/cluster/k8s-ha-contrail-40/.env b/classes/cluster/k8s-ha-contrail-40/.env
new file mode 100644
index 0000000..8ea2d50
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail-40/.env
@@ -0,0 +1,4 @@
+EXTRA_FORMULAS="barbican linux salt reclass maas openssh ntp \
+        rsyslog glusterfs \
+        devops-portal rsync docker keepalived aptly jenkins \
+        gerrit artifactory nginx collectd opencontrail logrotate"
\ No newline at end of file
diff --git a/classes/cluster/k8s-ha-contrail-40/MAINTAINERS b/classes/cluster/k8s-ha-contrail-40/MAINTAINERS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail-40/MAINTAINERS
diff --git a/classes/cluster/k8s-ha-contrail-40/infra/config.yml b/classes/cluster/k8s-ha-contrail-40/infra/config.yml
new file mode 100644
index 0000000..69a8d1b
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail-40/infra/config.yml
@@ -0,0 +1,135 @@
+classes:
+- system.linux.system.single
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.salt
+- system.openssh.client.lab
+- system.salt.master.pkg
+- system.salt.minion.ca.salt_master
+- system.salt.master.api
+- system.salt.minion.cert.k8s_server
+- system.reclass.storage.salt
+- system.reclass.storage.system.kubernetes_control_cluster
+- cluster.k8s-ha-contrail-40.infra
+
+parameters:
+  _param:
+    salt_master_base_environment: prd
+    reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
+    reclass_data_revision: master
+    reclass_config_master: ${_param:infra_config_deploy_address}
+    single_address: ${_param:infra_config_address}
+    deploy_address: ${_param:infra_config_deploy_address}
+    linux_system_codename: xenial
+    salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
+    salt_master_host: ${_param:infra_config_deploy_address}
+    salt_master_environment_revision: master
+    salt_master_environment_repository: 'https://github.com/salt-formulas'
+  salt:
+    master:
+      reactor:
+        reclass/minion/classify:
+        - salt://reclass/reactor/node_register.sls
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+          pre_up_cmds:
+          - "iptables -t nat -A POSTROUTING -o ens3 -j MASQUERADE"
+          post_down_cmds:
+          - "iptables -t nat -F POSTROUTING"
+    system:
+      kernel:
+        sysctl:
+          net.ipv4.conf.ens3.forwarding: 1
+          net.ipv4.conf.ens3.send_redirects: 0
+  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>>
+            deploy_address:
+              value_template: <<node_deploy_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>>
+        kubernetes_control01:
+          expression: <<node_hostname>>__equals__ctl01
+          cluster_param:
+            kubernetes_control_node01_address:
+              value_template: <<node_control_ip>>
+            kubernetes_control_node01_deploy_address:
+              value_template: <<node_deploy_ip>>
+        kubernetes_control02:
+          expression: <<node_hostname>>__equals__ctl02
+          cluster_param:
+            kubernetes_control_node02_address:
+              value_template: <<node_control_ip>>
+            kubernetes_control_node02_deploy_address:
+              value_template: <<node_deploy_ip>>
+        kubernetes_control03:
+          expression: <<node_hostname>>__equals__ctl03
+          cluster_param:
+            kubernetes_control_node03_address:
+              value_template: <<node_control_ip>>
+            kubernetes_control_node03_deploy_address:
+              value_template: <<node_deploy_ip>>
+        etcd_control01:
+          expression: <<node_hostname>>__equals__ctl01
+          cluster_param:
+            etcd_control_node01_address:
+              value_template: <<node_deploy_ip>>
+        etcd_control02:
+          expression: <<node_hostname>>__equals__ctl02
+          cluster_param:
+            etcd_control_node02_address:
+              value_template: <<node_deploy_ip>>
+        etcd_control03:
+          expression: <<node_hostname>>__equals__ctl03
+          cluster_param:
+            etcd_control_node03_address:
+              value_template: <<node_deploy_ip>>
+        kubernetes_compute:
+          expression: <<node_hostname>>__startswith__cmp
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.kubernetes.compute
+      node:
+        kubernetes_control_node01:
+          params:
+            rabbitmq_cluster_role: master
+            opencontrail_database_id: 1
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.opencontrail.control
+        kubernetes_control_node02:
+          params:
+            rabbitmq_cluster_role: slave
+            opencontrail_database_id: 2
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.opencontrail.control
+        kubernetes_control_node03:
+          params:
+            rabbitmq_cluster_role: slave
+            opencontrail_database_id: 3
+          node_class:
+            value_template:
+              - cluster.<<node_cluster>>.opencontrail.control
diff --git a/classes/cluster/k8s-ha-contrail-40/infra/init.yml b/classes/cluster/k8s-ha-contrail-40/infra/init.yml
new file mode 100644
index 0000000..6254ab0
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail-40/infra/init.yml
@@ -0,0 +1,36 @@
+classes:
+- system.linux.system.single
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.ubuntu
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- cluster.k8s-ha-contrail-40.kubernetes
+- cluster.overrides
+
+parameters:
+  _param:
+    # infra service addresses
+    infra_config_hostname: cfg01
+    infra_config_address: 172.16.10.100
+    infra_config_deploy_address: 192.168.10.90
+
+    cluster_domain: k8s-ha-contrail-40.local
+    cluster_name: k8s-ha-contrail-40
+    apt_mk_version: nightly
+  linux:
+    network:
+      host:
+        self:
+          address: ${_param:single_address}
+          names:
+          - ${linux:system:name}
+          - ${linux:system:name}.${linux:system:domain}
+        cfg01:
+          address: ${_param:infra_config_address}
+          names:
+          - ${_param:infra_config_hostname}
+          - ${_param:infra_config_hostname}.${_param:cluster_domain}
+    system:
+      name: ${_param:infra_config_hostname}
+      domain: ${_param:cluster_domain}
diff --git a/classes/cluster/k8s-ha-contrail-40/init.yml b/classes/cluster/k8s-ha-contrail-40/init.yml
new file mode 100644
index 0000000..26eb15a
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail-40/init.yml
@@ -0,0 +1,10 @@
+parameters:
+  _param:
+    cluster_name: k8s-ha-contrail-40
+    infra_config_hostname: cfg01
+    infra_config_address: 172.16.10.100
+    infra_config_deploy_address: 192.168.10.90
+
+    cluster_domain: k8s-ha-contrail-40.local
+    cluster_name: k8s-ha-contrail-40
+    apt_mk_version: nightly
\ No newline at end of file
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
new file mode 100644
index 0000000..c3addf5
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
@@ -0,0 +1,60 @@
+classes:
+- system.linux.system.repo.docker_legacy
+- system.kubernetes.pool.cluster
+- system.linux.network.hosts
+- system.salt.minion.cert.k8s_client
+- system.salt.minion.cert.etcd_client
+- cluster.k8s-ha-contrail-40.opencontrail.compute
+- cluster.k8s-ha-contrail-40.kubernetes
+
+parameters:
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: manual
+          ipflush_onchange: true
+        vhost0:
+          enabled: true
+          type: eth
+          mtu: 1500
+          address: ${_param:single_address}
+          netmask: '255.255.255.0'
+          pre_up_cmds:
+          - /usr/lib/contrail/if-vhost0
+          use_interfaces:
+          - ens4
+  docker:
+    host:
+      pkgs:
+        - ${_param:kubernetes_docker_package}
+        - python-docker
+      options:
+        bip: 172.31.255.1/24
+  kubernetes:
+    pool:
+      kubelet:
+        address: ${_param:single_address}
+        fail_on_swap: ${_param:kubelet_fail_on_swap}
+      network:
+        opencontrail:
+          enabled: true
+          version: 4.0
+          config:
+            api:
+              host: ${_param:opencontrail_control_address}
+    common:
+      addons:
+        virtlet:
+          enabled: ${_param:kubernetes_virtlet_enabled}
+          namespace: ${_param:kubernetes_addon_namespace}
+          image: ${_param:kubernetes_virtlet_image}
+          criproxy_version: ${_param:kubernetes_criproxy_version}
+          criproxy_source: ${_param:kubernetes_criproxy_checksum}
+          hosts:
+          - ${linux:system:name}
+      hyperkube:
+        image: ${_param:kubernetes_hyperkube_image}
+#        pause_image: ${_param:kubernetes_pause_image}
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
new file mode 100644
index 0000000..161940e
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -0,0 +1,119 @@
+classes:
+- service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
+- system.haproxy.proxy.listen.kubernetes.apiserver
+- system.linux.system.repo.docker_legacy
+- system.kubernetes.pool.cluster
+- system.salt.minion.cert.k8s_client
+- system.salt.minion.cert.etcd_client
+- system.salt.minion.cert.etcd_server
+- system.kubernetes.master.cluster
+- cluster.k8s-ha-contrail-40.infra
+parameters:
+  _param:
+    keepalived_vip_interface: ens4
+    keepalived_vip_virtual_router_id: 60
+
+  linux:
+    network:
+      interface:
+        ens3:
+          enabled: true
+          type: eth
+          mtu: 1500
+          address: ${_param:deploy_address}
+          netmask: '255.255.255.0'
+          
+        ens4:
+          enabled: true
+          type: eth
+          mtu: 1500
+          address: ${_param:single_address}
+          netmask: '255.255.255.0'
+  etcd:
+    server:
+      bind:
+        host: ${_param:deploy_address}
+      source:
+        engine: docker_hybrid
+      ssl:
+        enabled: true
+  kubernetes:
+    pool:
+      kubelet:
+        fail_on_swap: ${_param:kubelet_fail_on_swap}
+      enabled: true
+      network:
+        engine: none
+        opencontrail:
+          enabled: false
+    common:
+      addons:
+        dashboard:
+          enabled: ${_param:kubernetes_dashboard}
+          image: ${_param:kubernetes_dashboard_image}
+        helm:
+          enabled: ${_param:kubernetes_helm_enabled}
+        netchecker:
+          enabled: ${_param:kubernetes_netchecker_enabled}
+          agent_image: ${_param:kubernetes_netchecker_agent_image}
+          server_image: ${_param:kubernetes_netchecker_server_image}
+        dns:
+          enabled: ${_param:kubernetes_dns}
+          kubedns_image: ${_param:kubernetes_kubedns_image}
+          dnsmasq_image: ${_param:kubernetes_dnsmasq_image}
+          sidecar_image: ${_param:kubernetes_sidecar_image}
+          autoscaler:
+            image: ${_param:kubernetes_dns_autoscaler_image}
+        coredns:
+          enabled: ${_param:kubernetes_coredns_enabled}
+        externaldns:
+          enabled: ${_param:kubernetes_externaldns_enabled}
+          image: ${_param:kubernetes_externaldns_image}
+          provider: ${_param:kubernetes_externaldns_provider}
+      hyperkube:
+        image: ${_param:kubernetes_hyperkube_image}
+    master:
+      kubelet:
+        address: ${_param:single_address}
+        fail_on_swap: ${_param:kubelet_fail_on_swap}
+      etcd:
+        ssl:
+          enabled: true
+      network:
+        opencontrail:
+          enabled: true
+          version: 4.0
+          host: ${_param:keepalived_vip_address}
+          port: 8082
+          default_domain: default-domain
+          default_project: default-domain:default
+          public_network: default-domain:default:Public
+          public_ip_range: 185.22.97.128/26
+          public_network: default-domain:default-project:Public
+          private_ip_range: 10.150.0.0/16
+          network_manager:
+            image: docker-prod-local.artifactory.mirantis.com/opencontrail-oc40/opencontrail-kube-manager
+#          config:
+#            api:
+#              host: ${_param:opencontrail_control_address}
+          identity:
+            auth_user: admin
+            auth_password: contrail123
+            auth_tenant: admin
+          message_queue:
+            host: ${_param:single_address}
+          database:
+            members:
+              - host: ${_param:kubernetes_control_node01_address}
+                port: 9161
+              - host: ${_param:kubernetes_control_node02_address}
+                port: 9161
+              - host: ${_param:kubernetes_control_node03_address}
+                port: 9161
+          collector:
+            members:
+              - host: ${_param:kubernetes_control_node01_address}
+              - host: ${_param:kubernetes_control_node02_address}
+              - host: ${_param:kubernetes_control_node03_address}
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
new file mode 100644
index 0000000..d019809
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
@@ -0,0 +1,113 @@
+classes:
+- cluster.overrides
+
+parameters:
+  _param:
+    salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
+    salt_minion_ca_authority: salt_master_ca
+
+    # kubelet
+    kubelet_fail_on_swap: False
+
+    # kubernetes settings
+    kubernetes_admin_user: admin
+    kubernetes_admin_password: sbPfel23ZigJF3Bm
+    kubernetes_admin_token: PpP6Mm3pAoPVqcKOKUu0x1dh7b1959Fi
+    kubernetes_kubelet_token: JJ2PKHxjiU6EYvIt18BqwdSK1HvWh8pt
+    kubernetes_kube-proxy_token: jT0hJk9L6cIw5UpYDNhsRwcj3Z2n62B6
+    kubernetes_scheduler_token: VgkUHfrW07zNxrb0ucFyX7NBnSJN9Xp6
+    kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
+    kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
+    etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
+
+    # docker package version
+    kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
+
+    # component docker images
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+    kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
+    kubernetes_virtlet_image: mirantis/virtlet:v1.0.2
+    kubernetes_criproxy_version: v0.10.0
+    kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
+    kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
+    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_image: mirantis/k8s-netchecker-agent:stable
+    kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
+    kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
+    kubernetes_virtlet_image: mirantis/virtlet:v1.0.2
+    kubernetes_externaldns_image: mirantis/external-dns:latest
+    kubernetes_externaldns_provider: coredns
+
+    # switches of addons
+    kubernetes_addon_namespace: kube-system
+    kubernetes_dns: true
+    kubernetes_dashboard: false
+    kubernetes_helm_enabled: true
+    kubernetes_netchecker_enabled: true
+    kubernetes_calico_policy_enabled: false
+    kubernetes_virtlet_enabled: false
+    kubernetes_contrail_network_controller: true
+    kubernetes_coredns_enabled: false
+    kubernetes_externaldns_enabled: false
+
+    # addresses and hostnames
+    kubernetes_internal_api_address: 10.254.0.1
+    kubernetes_control_hostname: ctl
+    kubernetes_control_address: 172.16.10.253
+    kubernetes_control_node01_hostname: ctl01
+    kubernetes_control_node02_hostname: ctl02
+    kubernetes_control_node03_hostname: ctl03
+    kubernetes_control_node01_address: 172.16.10.101
+    kubernetes_control_node02_address: 172.16.10.102
+    kubernetes_control_node03_address: 172.16.10.103
+    etcd_control_node01_address: ${_param:kubernetes_control_node01_address}
+    etcd_control_node02_address: ${_param:kubernetes_control_node02_address}
+    etcd_control_node03_address: ${_param:kubernetes_control_node03_address}
+    kubernetes_proxy_node01_hostname: prx01
+    kubernetes_proxy_node01_address: 172.16.10.121
+
+    cluster_vip_address: ${_param:kubernetes_control_address}
+    cluster_local_address: ${_param:deploy_address}
+
+    # etcd stuff
+    cluster_node01_hostname: ${_param:kubernetes_control_node01_hostname}
+    cluster_node01_address: ${_param:etcd_control_node01_address}
+    cluster_node01_port: 4001
+    cluster_node02_hostname: ${_param:kubernetes_control_node02_hostname}
+    cluster_node02_address: ${_param:etcd_control_node02_address}
+    cluster_node02_port: 4001
+    cluster_node03_hostname: ${_param:kubernetes_control_node03_hostname}
+    cluster_node03_address: ${_param:etcd_control_node03_address}
+    cluster_node03_port: 4001
+
+  linux:
+    network:
+      host:
+        ctl:
+          address: ${_param:kubernetes_control_address}
+          names:
+          - ${_param:kubernetes_control_hostname}
+          - ${_param:kubernetes_control_hostname}.${_param:cluster_domain}
+        ctl01:
+          address: ${_param:kubernetes_control_node01_address}
+          names:
+          - ${_param:kubernetes_control_node01_hostname}
+          - ${_param:kubernetes_control_node01_hostname}.${_param:cluster_domain}
+        ctl02:
+          address: ${_param:kubernetes_control_node02_address}
+          names:
+          - ${_param:kubernetes_control_node02_hostname}
+          - ${_param:kubernetes_control_node02_hostname}.${_param:cluster_domain}
+        ctl03:
+          address: ${_param:kubernetes_control_node03_address}
+          names:
+          - ${_param:kubernetes_control_node03_hostname}
+          - ${_param:kubernetes_control_node03_hostname}.${_param:cluster_domain}
+        prx01:
+          address: ${_param:kubernetes_proxy_node01_address}
+          names:
+          - ${_param:kubernetes_proxy_node01_hostname}
+          - ${_param:kubernetes_proxy_node01_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
new file mode 100644
index 0000000..447ac9c
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/compute.yml
@@ -0,0 +1,45 @@
+classes:
+- system.linux.system.repo.mcp.contrail
+- system.opencontrail.compute.cluster
+- system.opencontrail.client.cluster
+- system.opencontrail.client.resource.virtual_router
+- system.opencontrail.client.resource.k8s_api
+- system.opencontrail.compute.cluster4_0
+- cluster.k8s-ha-contrail-40.infra
+- cluster.k8s-ha-contrail-40.opencontrail
+
+parameters:
+  _param:
+    opencontrail_compute_address: ${_param:single_address}
+    opencontrail_compute_iface: ens4
+    opencontrail_compute_gateway: 172.16.10.1
+    opencontrail_compute_dns: 8.8.8.8
+  opencontrail:
+    common:
+      identity:
+        engine: k8s
+        host: none
+        token: none
+        password: none
+      network:
+        engine: k8s
+        host: none
+    client:
+      api:
+        host: ${_param:opencontrail_control_address}
+        port: 9100
+      identity:
+        engine: k8s
+        host: none
+        token: none
+        password: none
+        
+  kubernetes:
+    pool:
+      network:
+        hash: 2276df10feae8f09fb50dce3a96fff6c
+  linux:
+    network:
+      concat_iface_files:
+      - src: '/etc/network/interfaces.d/50-cloud-init.cfg'
+        dst: '/etc/network/interfaces'
\ No newline at end of file
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
new file mode 100644
index 0000000..c76cc57
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
@@ -0,0 +1,75 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.cassandra
+- system.linux.system.repo.mcp.contrail
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.opencontrail.client.resource.edge_router
+- system.opencontrail.control.cluster4_0
+- system.opencontrail.client.cluster
+- system.opencontrail.client.resource.control_node
+- system.opencontrail.client.resource.config_node
+- system.opencontrail.client.resource.database_node
+- system.opencontrail.client.resource.analytics_node
+- system.opencontrail.client.resource.global_vrouter_config
+- system.haproxy.proxy.listen.opencontrail.analytics
+- cluster.k8s-ha-contrail-40.infra
+- cluster.k8s-ha-contrail-40.opencontrail
+
+parameters:
+  _param:
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ${_param:opencontrail_control_node01_hostname}
+    cluster_node01_address: ${_param:opencontrail_control_node01_address}
+    cluster_node02_hostname: ${_param:opencontrail_control_node02_hostname}
+    cluster_node02_address: ${_param:opencontrail_control_node02_address}
+    cluster_node03_hostname: ${_param:opencontrail_control_node03_hostname}
+    cluster_node03_address: ${_param:opencontrail_control_node03_address}
+    opencontrail_router01_hostname: vsrx01.${_param:cluster_domain}
+    opencontrail_router01_address: 172.16.10.131
+  linux:
+    network:
+      interface:
+        eth1:
+          enabled: true
+          type: eth
+          proto: dhcp
+
+  opencontrail:
+    compute:
+      enabled: false
+    common:
+      identity:
+        host: none
+        engine: k8s
+      network:
+        engine: k8s
+      contrainer_folders:
+      - /var/lib/config_zookeeper_data
+      - /var/lib/analyticsdb-zookeeper-data
+      - /var/lib/configdb
+      - /var/lib/analyticsdb/
+      - /usr/share/kafka/logs
+    config:
+      network:
+        engine: k8s
+      identity:
+        engine: k8s
+        region: none
+        host: none
+      multi_tenancy: false
+      message_queue:
+        host: ${_param:opencontrail_control_address}
+    web:
+      http: 
+        port: 8095
+      https: 
+        port: 8143
+      network:
+        engine: k8s
+      identity:
+        engine: k8s
+        host: none
+      bind:
+        address: ${_param:single_address}
\ No newline at end of file
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
new file mode 100644
index 0000000..0e57868
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
@@ -0,0 +1,27 @@
+parameters:
+  _param:
+    opencontrail_version: 4.0
+    linux_repo_contrail_component: oc40
+    opencontrail_control_node01_hostname: ctl01
+    opencontrail_control_node02_hostname: ctl02
+    opencontrail_control_node03_hostname: ctl03
+
+    opencontrail_control_address: 172.16.10.252
+    opencontrail_control_node01_address: 172.16.10.101
+    opencontrail_control_node02_address: 172.16.10.102
+    opencontrail_control_node03_address: 172.16.10.103
+    opencontrail_control_interface_name: ens4
+    opencontrail_analytics_address: ${_param:opencontrail_control_address}
+    opencontrail_analytics_node01_address: ${_param:opencontrail_control_node01_address}
+    opencontrail_analytics_node02_address: ${_param:opencontrail_control_node02_address}
+    opencontrail_analytics_node03_address: ${_param:opencontrail_control_node03_address}
+    opencontrail_message_queue_node01_address: ${_param:opencontrail_control_node01_address}
+    opencontrail_message_queue_node02_address: ${_param:opencontrail_control_node02_address}
+    opencontrail_message_queue_node03_address: ${_param:opencontrail_control_node03_address}
+
+    keystone_admin_password: none
+    opencontrail_stats_password: password
+    keystone_service_token: none
+    openstack_version: none
+    openstack_control_address: none
+    keystone_admin_password: none
diff --git a/classes/cluster/os-aio-contrail/openstack/proxy.yml b/classes/cluster/os-aio-contrail/openstack/proxy.yml
index c0688c2..1d61a39 100755
--- a/classes/cluster/os-aio-contrail/openstack/proxy.yml
+++ b/classes/cluster/os-aio-contrail/openstack/proxy.yml
@@ -15,3 +15,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/os-aio-ovs/openstack/proxy.yml b/classes/cluster/os-aio-ovs/openstack/proxy.yml
index 142a984..cd409a4 100644
--- a/classes/cluster/os-aio-ovs/openstack/proxy.yml
+++ b/classes/cluster/os-aio-ovs/openstack/proxy.yml
@@ -14,3 +14,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/os-ha-contrail-40/init.yml b/classes/cluster/os-ha-contrail-40/init.yml
index ca9b37a..dcdaab6 100644
--- a/classes/cluster/os-ha-contrail-40/init.yml
+++ b/classes/cluster/os-ha-contrail-40/init.yml
@@ -11,6 +11,8 @@
 - cluster.os-ha-contrail-40.openstack
 - cluster.overrides
 parameters:
+  _param:
+    ssh_banner_company_name: Mirantis Inc.
   salt:
     minion:
       trusted_ca_minions:
@@ -23,3 +25,7 @@
           names:
           - vsrx1
           - vsrx1.${_param:cluster_domain}
+  openssh:
+    server:
+      alive:
+        interval: 0
diff --git a/classes/cluster/os-ha-contrail-40/openstack/proxy.yml b/classes/cluster/os-ha-contrail-40/openstack/proxy.yml
index cb9aff6..aeb0bb7 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/proxy.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/proxy.yml
@@ -15,3 +15,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/proxy.yml b/classes/cluster/os-ha-contrail-ironic/openstack/proxy.yml
index f31a4fe..e402994 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/proxy.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/proxy.yml
@@ -15,3 +15,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/os-ha-contrail/init.yml b/classes/cluster/os-ha-contrail/init.yml
index 0fe368b..05de4a8 100755
--- a/classes/cluster/os-ha-contrail/init.yml
+++ b/classes/cluster/os-ha-contrail/init.yml
@@ -11,6 +11,8 @@
 - cluster.os-ha-contrail.openstack
 - cluster.overrides
 parameters:
+  _param:
+    ssh_banner_company_name: Mirantis Inc.
   salt:
     minion:
       trusted_ca_minions:
@@ -23,4 +25,7 @@
           names:
           - vsrx1
           - vsrx1.${_param:cluster_domain}
-
+  openssh:
+    server:
+      alive:
+        interval: 0
diff --git a/classes/cluster/os-ha-contrail/openstack/proxy.yml b/classes/cluster/os-ha-contrail/openstack/proxy.yml
index f3dc4f1..9521511 100755
--- a/classes/cluster/os-ha-contrail/openstack/proxy.yml
+++ b/classes/cluster/os-ha-contrail/openstack/proxy.yml
@@ -17,3 +17,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/proxy.yml b/classes/cluster/os-ha-ovs-ceph/openstack/proxy.yml
index a34bc1b..67badc5 100644
--- a/classes/cluster/os-ha-ovs-ceph/openstack/proxy.yml
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/proxy.yml
@@ -14,3 +14,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/proxy.yml b/classes/cluster/os-ha-ovs-pike/openstack/proxy.yml
index ead28d0..31b3ab6 100644
--- a/classes/cluster/os-ha-ovs-pike/openstack/proxy.yml
+++ b/classes/cluster/os-ha-ovs-pike/openstack/proxy.yml
@@ -15,3 +15,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${linux:system:domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/proxy.yml b/classes/cluster/os-ha-ovs-syndic/openstack/proxy.yml
index 9469837..09e5fe9 100644
--- a/classes/cluster/os-ha-ovs-syndic/openstack/proxy.yml
+++ b/classes/cluster/os-ha-ovs-syndic/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/os-ha-ovs/openstack/proxy.yml b/classes/cluster/os-ha-ovs/openstack/proxy.yml
index 3f32322..6ffbf34 100644
--- a/classes/cluster/os-ha-ovs/openstack/proxy.yml
+++ b/classes/cluster/os-ha-ovs/openstack/proxy.yml
@@ -15,3 +15,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${linux:system:domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/sl-k8s-calico/stacklight/proxy.yml b/classes/cluster/sl-k8s-calico/stacklight/proxy.yml
index de4e28c..ff816c5 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/proxy.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/proxy.yml
@@ -2,6 +2,7 @@
 - system.nginx.server.single
 - system.nginx.server.proxy.stacklight.grafana
 - system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.alerta
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/sl-k8s-calico/stacklight/server.yml b/classes/cluster/sl-k8s-calico/stacklight/server.yml
index a1aaf26..eabdb79 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/server.yml
@@ -21,10 +21,15 @@
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
+- system.mongodb.server.cluster
+- 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.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
 - cluster.sl-k8s-calico
 parameters:
@@ -39,6 +44,7 @@
     docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
     docker_image_grafana: grafana/grafana:5.1.3
+    docker_image_alerta: docker-prod-local.artifactory.mirantis.com/mirantis/external/alerta-web:latest
     docker_influxdb_image: influxdb:1.2
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/proxy.yml b/classes/cluster/sl-k8s-contrail/stacklight/proxy.yml
index 0c20e5e..8b7090b 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/proxy.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/proxy.yml
@@ -2,6 +2,7 @@
 - system.nginx.server.single
 - system.nginx.server.proxy.stacklight.grafana
 - system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.alerta
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/server.yml b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
index 98f421f..3ed3bd4 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
@@ -21,10 +21,15 @@
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
+- system.mongodb.server.cluster
+- 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.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
 - cluster.sl-k8s-contrail.infra
 parameters:
@@ -39,6 +44,7 @@
     docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
     docker_image_grafana: grafana/grafana:5.1.3
+    docker_image_alerta: docker-prod-local.artifactory.mirantis.com/mirantis/external/alerta-web:latest
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
     keepalived_prometheus_vip_password: password
diff --git a/classes/cluster/sl-os-contrail/openstack/proxy.yml b/classes/cluster/sl-os-contrail/openstack/proxy.yml
index d517b17..a7d3fb5 100755
--- a/classes/cluster/sl-os-contrail/openstack/proxy.yml
+++ b/classes/cluster/sl-os-contrail/openstack/proxy.yml
@@ -15,3 +15,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/sl-os-contrail/stacklight/proxy.yml b/classes/cluster/sl-os-contrail/stacklight/proxy.yml
index 9410ad0..08a8475 100755
--- a/classes/cluster/sl-os-contrail/stacklight/proxy.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/proxy.yml
@@ -2,6 +2,7 @@
 - system.nginx.server.single
 - system.nginx.server.proxy.stacklight.grafana
 - system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.alerta
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/sl-os-contrail/stacklight/server.yml b/classes/cluster/sl-os-contrail/stacklight/server.yml
index 0e6065f..9ca52be 100755
--- a/classes/cluster/sl-os-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/server.yml
@@ -22,11 +22,16 @@
 - system.influxdb.database.ceilometer
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
+- system.mongodb.server.cluster
+- 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.docker.swarm.stack.monitoring.remote_collector
+- system.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
 - cluster.sl-os-contrail
 parameters:
@@ -47,6 +52,7 @@
     cluster_node03_hostname: mon03
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
     docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+    docker_image_alerta: docker-prod-local.artifactory.mirantis.com/mirantis/external/alerta-web:latest
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
diff --git a/classes/cluster/sl-os-ovs/openstack/proxy.yml b/classes/cluster/sl-os-ovs/openstack/proxy.yml
index c40845b..e4132a2 100644
--- a/classes/cluster/sl-os-ovs/openstack/proxy.yml
+++ b/classes/cluster/sl-os-ovs/openstack/proxy.yml
@@ -13,3 +13,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/sl-os-ovs/stacklight/proxy.yml b/classes/cluster/sl-os-ovs/stacklight/proxy.yml
index 8efba79..5e0f747 100644
--- a/classes/cluster/sl-os-ovs/stacklight/proxy.yml
+++ b/classes/cluster/sl-os-ovs/stacklight/proxy.yml
@@ -2,6 +2,7 @@
 - system.nginx.server.single
 - system.nginx.server.proxy.stacklight.grafana
 - system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.alerta
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/sl-os-ovs/stacklight/server.yml b/classes/cluster/sl-os-ovs/stacklight/server.yml
index a84b974..6729d88 100644
--- a/classes/cluster/sl-os-ovs/stacklight/server.yml
+++ b/classes/cluster/sl-os-ovs/stacklight/server.yml
@@ -19,10 +19,15 @@
 - system.influxdb.database.prometheus
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
+- system.mongodb.server.cluster
+- 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.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
 - system.docker.swarm.stack.monitoring.remote_collector
 - cluster.sl-os-ovs.stacklight.client
@@ -47,6 +52,7 @@
     cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
     docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+    docker_image_alerta: docker-prod-local.artifactory.mirantis.com/mirantis/external/alerta-web:latest
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
diff --git a/classes/cluster/sl-pike-dvr/openstack/proxy.yml b/classes/cluster/sl-pike-dvr/openstack/proxy.yml
index 507d1e5..8b75dd7 100644
--- a/classes/cluster/sl-pike-dvr/openstack/proxy.yml
+++ b/classes/cluster/sl-pike-dvr/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/sl-pike-dvr/stacklight/proxy.yml b/classes/cluster/sl-pike-dvr/stacklight/proxy.yml
index 957e5cb..d226622 100644
--- a/classes/cluster/sl-pike-dvr/stacklight/proxy.yml
+++ b/classes/cluster/sl-pike-dvr/stacklight/proxy.yml
@@ -2,6 +2,7 @@
 - system.nginx.server.single
 - system.nginx.server.proxy.stacklight.grafana
 - system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.alerta
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/sl-pike-dvr/stacklight/server.yml b/classes/cluster/sl-pike-dvr/stacklight/server.yml
index a6e2477..984bc40 100644
--- a/classes/cluster/sl-pike-dvr/stacklight/server.yml
+++ b/classes/cluster/sl-pike-dvr/stacklight/server.yml
@@ -23,11 +23,16 @@
 - system.influxdb.database.ceilometer
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
+- system.mongodb.server.cluster
+- 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.docker.swarm.stack.monitoring.remote_collector
+- system.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
 - cluster.sl-pike-dvr
 parameters:
@@ -48,6 +53,7 @@
     cluster_node03_hostname: mon03
     cluster_node03_address: ${_param:stacklight_monitor_node03_address}
     docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+    docker_image_alerta: docker-prod-local.artifactory.mirantis.com/mirantis/external/alerta-web:latest
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml
index 1aaf437..50d564a 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/proxy.yml
index 149abc1..4d32753 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml
index 64f6c6a..cfe273e 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/proxy.yml
index 1354e85..98cc9a0 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/proxy.yml
index 03d3685..170aea0 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/proxy.yml
index d5b6ba6..834a475 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/proxy.yml
index 1f7a6ca..bcf9f77 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/proxy.yml
index 66e2ae6..4f0cb81 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/proxy.yml
index 64a1e0e..6d64763 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/proxy.yml
index 92a4c1b..cd0e7a0 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml
index 93bfd56..9123a18 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_common.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_common.yml
new file mode 100644
index 0000000..79b8f6b
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_common.yml
@@ -0,0 +1,40 @@
+classes:
+- system.backupninja.client.single
+- system.openssh.client.root
+parameters:
+  _param:
+    backupninja_backup_host: ${_param:openstack_control_node03_address}
+    root_private_key: |
+      -----BEGIN RSA PRIVATE KEY-----
+      MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
+      k0C6AYpJnIyEm93pMj5cLm08qRqMW+2pdOhYjcH69yg5MrX5SkRk8jCmIHIYoIbh
+      Qnwbnj3dd3I39ZdfU2FO7u2vlbglVou6ZoQxlJDItuLNtzq6EG+w9eF19e7+OsC6
+      6iUItp618zfw1l3J/8nKvCGe2RYDf7mJW6XwCl/DwryJmwwzvPgYJ3QMuDD8/HFj
+      lrJ3xjFTXj4b4Ws1XIoy78fFbtiLr4OwqCYkho03u2E5rOOP1qZxZB63sivHMLMO
+      MM5bOAQKbulFNoyALADGYfc7sf0bZ4u9XXDXxQIDAQABAoIBAQCfmc2MJRT97KW1
+      yqpCpX9BrAiymuiNHf+cjEcSZxEUyHkjIRFmJt+9WB0W7ba1anM92vCUiPDojSzH
+      dig9Oi578JxR20NrK8uqv4jUHzrknynzLveVI3CUEcOSnglfJQijbxDFKfOCFPvV
+      FUyE1UATMNBh6+LNfMprgu+exuMWOPnDyUiYQ+WZ0JfuZY8fuaZte4woJJOb9LUu
+      5rsMG/smIzjpgZ0Z9ZVDMurfq565qhpaXRAqKeIuyht8pacTo31iMQdHB78AvY/3
+      g0z21Gk8k3z0Kr/YFKr2r4FmXY5m/gAUvZly2ZrVQM5XsbTVCzq/JpI5fssNvSbU
+      AKmXzf4RAoGBAOO3d4/cstxERzW6hyOTjZIN1ppR52CsnZTsVPbfd0pCtmzmVZce
+      CtHKdcXSbTwZvvkK09QSWAp3MoSpd0gIOiLU8Wx/R/RIZsu9BlhTS3r3EQLnk72d
+      H/1TTA+j4T/LIYLSojQ1RxvIrHetAD44j732aTwKAHj/SybEAVqNkOB/AoGBAN0u
+      gLcrgqIHGrk4VjWSvlCGymfF40equcx+ud7XhfZDGETUOSahW4dPZ52cjPAkrCBQ
+      MMfcDwSVGsOAjd+mNt11BHUKobnhXwFaWWuyqyn9NmWFbjMbICVh7E3Of5aVN38o
+      lrmo/7LuKMVG7XRwphCv5NkaJmQG4njDyUQWlaW7AoGADCd8wDb9bPhP/LQqBmIX
+      ylXmwHHisaxE9O/wUQT4bwREjGd25gv6c9wkkRx8LBsLsGs9hzI7dMOL9Ly+2x9l
+      SvqmsC3S/1zl77X1Ir2/Z57MT6Vgo1xBmtnZU3Rhz2/eKAdqFPNLClaZrgGT475N
+      HcyLLWMzR0IJFtabY+Puea0CgYA8Zb5wRkldxWLewSuJZZDinGwY+kieAVjLJq/K
+      0j+ah6fQ48LXcah0wpIgz+cMjHcUO9GWQdk3/x9X03rqX5EL2DBnZYfUIl63F9zj
+      M97ZkHOSNWVqPzX//0Vv2butewG0j3jZKfTo/2/SrxOYgEpYtC9huWpSVi7xm0US
+      erhSkQKBgFIf9JEsfgE57ANhvITZ3ZI0uZXNxZkXQaVg8jvScDi79IIhy9iPzhKC
+      aIIQoDNIlWv1ftCRZ5AlBvVXgvQ/QNrwy48JiQTzWZlb9Ezg8w+olQmSbG6fq7Y+
+      7r3i+QUZ7RBdOb24QcQ618q54ozNTCB7OywY78ptFzeoBeptiNr1
+      -----END RSA PRIVATE KEY-----
+  # for salt-master backup
+  backupninja:
+    client:
+      target:
+        home_dir: /srv/volumes/backup/backupninja
+        engine_opts: "-av --delete --recursive --safe-links"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_mysql.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_mysql.yml
new file mode 100644
index 0000000..9d0cace
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/client_mysql.yml
@@ -0,0 +1,37 @@
+classes:
+- system.xtrabackup.client.single
+parameters:
+  _param:
+    xtrabackup_remote_server: ${_param:openstack_control_node03_address}
+    root_private_key: |
+      -----BEGIN RSA PRIVATE KEY-----
+      MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
+      k0C6AYpJnIyEm93pMj5cLm08qRqMW+2pdOhYjcH69yg5MrX5SkRk8jCmIHIYoIbh
+      Qnwbnj3dd3I39ZdfU2FO7u2vlbglVou6ZoQxlJDItuLNtzq6EG+w9eF19e7+OsC6
+      6iUItp618zfw1l3J/8nKvCGe2RYDf7mJW6XwCl/DwryJmwwzvPgYJ3QMuDD8/HFj
+      lrJ3xjFTXj4b4Ws1XIoy78fFbtiLr4OwqCYkho03u2E5rOOP1qZxZB63sivHMLMO
+      MM5bOAQKbulFNoyALADGYfc7sf0bZ4u9XXDXxQIDAQABAoIBAQCfmc2MJRT97KW1
+      yqpCpX9BrAiymuiNHf+cjEcSZxEUyHkjIRFmJt+9WB0W7ba1anM92vCUiPDojSzH
+      dig9Oi578JxR20NrK8uqv4jUHzrknynzLveVI3CUEcOSnglfJQijbxDFKfOCFPvV
+      FUyE1UATMNBh6+LNfMprgu+exuMWOPnDyUiYQ+WZ0JfuZY8fuaZte4woJJOb9LUu
+      5rsMG/smIzjpgZ0Z9ZVDMurfq565qhpaXRAqKeIuyht8pacTo31iMQdHB78AvY/3
+      g0z21Gk8k3z0Kr/YFKr2r4FmXY5m/gAUvZly2ZrVQM5XsbTVCzq/JpI5fssNvSbU
+      AKmXzf4RAoGBAOO3d4/cstxERzW6hyOTjZIN1ppR52CsnZTsVPbfd0pCtmzmVZce
+      CtHKdcXSbTwZvvkK09QSWAp3MoSpd0gIOiLU8Wx/R/RIZsu9BlhTS3r3EQLnk72d
+      H/1TTA+j4T/LIYLSojQ1RxvIrHetAD44j732aTwKAHj/SybEAVqNkOB/AoGBAN0u
+      gLcrgqIHGrk4VjWSvlCGymfF40equcx+ud7XhfZDGETUOSahW4dPZ52cjPAkrCBQ
+      MMfcDwSVGsOAjd+mNt11BHUKobnhXwFaWWuyqyn9NmWFbjMbICVh7E3Of5aVN38o
+      lrmo/7LuKMVG7XRwphCv5NkaJmQG4njDyUQWlaW7AoGADCd8wDb9bPhP/LQqBmIX
+      ylXmwHHisaxE9O/wUQT4bwREjGd25gv6c9wkkRx8LBsLsGs9hzI7dMOL9Ly+2x9l
+      SvqmsC3S/1zl77X1Ir2/Z57MT6Vgo1xBmtnZU3Rhz2/eKAdqFPNLClaZrgGT475N
+      HcyLLWMzR0IJFtabY+Puea0CgYA8Zb5wRkldxWLewSuJZZDinGwY+kieAVjLJq/K
+      0j+ah6fQ48LXcah0wpIgz+cMjHcUO9GWQdk3/x9X03rqX5EL2DBnZYfUIl63F9zj
+      M97ZkHOSNWVqPzX//0Vv2butewG0j3jZKfTo/2/SrxOYgEpYtC9huWpSVi7xm0US
+      erhSkQKBgFIf9JEsfgE57ANhvITZ3ZI0uZXNxZkXQaVg8jvScDi79IIhy9iPzhKC
+      aIIQoDNIlWv1ftCRZ5AlBvVXgvQ/QNrwy48JiQTzWZlb9Ezg8w+olQmSbG6fq7Y+
+      7r3i+QUZ7RBdOb24QcQ618q54ozNTCB7OywY78ptFzeoBeptiNr1
+      -----END RSA PRIVATE KEY-----
+  xtrabackup:
+    server:
+      enabled: false
+      backup_dir: /srv/volumes/backup/xtrabackup
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/server.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/server.yml
new file mode 100644
index 0000000..8f84903
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/backup/server.yml
@@ -0,0 +1,15 @@
+classes:
+- system.backupninja.server.single
+- system.xtrabackup.server.single
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.backup
+parameters:
+  _param:
+    backupninja_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
+    xtrabackup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
+  backupninja:
+    server:
+      home_dir: /srv/volumes/backup/backupninja
+  xtrabackup:
+    server:
+      backup_dir: /srv/volumes/backup/xtrabackup
\ No newline at end of file
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 f4ac726..96c4ca8 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,7 +5,6 @@
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.openssh.client.lab
 - system.salt.master.pkg
 - system.salt.master.api
 - system.reclass.storage.salt
@@ -30,6 +29,7 @@
 - system.reclass.storage.system.stacklightv2_server_cluster
 - cluster.virtual-mcp-pike-dvr-ceph-rgw.openstack.proxy
 - cluster.virtual-mcp-pike-dvr-ceph-rgw.stacklight.proxy
+- cluster.virtual-mcp-pike-dvr-ceph-rgw.infra.backup.client_common
 - cluster.virtual-mcp-pike-dvr-ceph-rgw
 parameters:
   _param:
@@ -62,9 +62,12 @@
           enabled: false
   salt:
     master:
+      backup: true
       reactor:
         reclass/minion/classify:
         - salt://reclass/reactor/node_register.sls
+    minion:
+      backup: true
   reclass:
     storage:
       class_mapping:
@@ -191,6 +194,7 @@
       node:
         openstack_control_node01:
           classes:
+          - cluster.virtual-mcp-pike-dvr-ceph-rgw.infra.backup.client_mysql
           - service.galera.master.cluster
           params:
             mysql_cluster_role: master
@@ -203,6 +207,7 @@
             linux_system_codename: xenial
         openstack_control_node03:
           classes:
+          - cluster.virtual-mcp-pike-dvr-ceph-rgw.infra.backup.server
           - service.galera.slave.cluster
           params:
             mysql_cluster_role: slave
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
index 922bcf4..8ad6fe3 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
@@ -14,6 +14,7 @@
 - system.glusterfs.client.volume.keystone
 - system.glusterfs.server.volume.glance
 - system.glusterfs.server.volume.keystone
+- system.glusterfs.server.volume.backup
 - system.glusterfs.server.cluster
 - system.glance.control.cluster
 - system.nova.control.cluster
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml
index 8de7a84..a178d05 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml
@@ -14,4 +14,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
index 69159d4..fe85d74 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
@@ -14,3 +14,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${linux:system:domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
index 0abc6b8..1a50bb6 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
@@ -14,3 +14,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${linux:system:domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml
index d6ea854..dd30f35 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml
@@ -14,3 +14,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
index fc0856e..01ee8f0 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
@@ -13,4 +13,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
index 83edc51..2305418 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
@@ -14,3 +14,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp05-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp05-dvr/openstack/proxy.yml
index 3c03b07..391f22d 100644
--- a/classes/cluster/virtual-mcp05-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp05-dvr/openstack/proxy.yml
@@ -13,3 +13,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp05-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp05-ovs/openstack/proxy.yml
index fdfd00e..0369787 100644
--- a/classes/cluster/virtual-mcp05-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp05-ovs/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml b/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml
index 3c3838a..8b85a6c 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml
@@ -15,6 +15,12 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
   linux:
     system:
       package:
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp10-dvr/openstack/proxy.yml
index 600819d..2fbbbbd 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/proxy.yml
@@ -13,6 +13,12 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
   linux:
     system:
       package:
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp10-ovs/openstack/proxy.yml
index 8916abc..43741cd 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/proxy.yml
@@ -13,6 +13,12 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
   linux:
     system:
       package:
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/proxy.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/proxy.yml
index 85377e2..360979b 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/proxy.yml
@@ -15,3 +15,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/proxy.yml b/classes/cluster/virtual-mcp11-contrail/openstack/proxy.yml
index 690389b..0422b38 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/proxy.yml
@@ -15,3 +15,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp11-dvr/openstack/proxy.yml
index cd7bbd6..2ce252d 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/proxy.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/proxy.yml
index 914b123..c11be1b 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/proxy.yml
@@ -2,6 +2,7 @@
 - system.nginx.server.single
 - system.nginx.server.proxy.stacklight.grafana
 - system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.alerta
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index f7e6fcc..be86da7 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -21,9 +21,14 @@
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
+- system.mongodb.server.cluster
+- 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.alerta
 - system.docker.swarm.stack.monitoring.prometheus_global
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp11-k8s-calico
@@ -33,6 +38,7 @@
     cluster_public_host: mon
     cluster_local_address: ${_param:single_address}
     docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+    docker_image_alerta: docker-prod-local.artifactory.mirantis.com/mirantis/external/alerta-web:latest
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml
index 5bea43d..4c3afbf 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml
@@ -2,6 +2,7 @@
 - system.nginx.server.single
 - system.nginx.server.proxy.stacklight.grafana
 - system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.alerta
 - system.nginx.server.proxy.monitoring.prometheus_server
 - system.nginx.server.proxy.monitoring.prometheus_alertmanager
 - system.salt.minion.cert.proxy
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index 97ccf76..b6f61ed 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -21,10 +21,15 @@
 - system.salt.minion.cert.prometheus_server
 - system.keepalived.cluster.instance.prometheus_server_vip
 - system.telegraf.agent.remote
+- system.mongodb.server.cluster
+- 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.docker.swarm.stack.monitoring.alerta
 - system.docker.swarm.stack.dashboard
 - cluster.virtual-mcp11-k8s-contrail
 parameters:
@@ -33,6 +38,7 @@
     cluster_vip_address: ${_param:stacklight_monitor_address}
     cluster_local_address: ${_param:single_address}
     docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+    docker_image_alerta: docker-prod-local.artifactory.mirantis.com/mirantis/external/alerta-web:latest
     docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
     docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
     docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/proxy.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/proxy.yml
index be66fa7..c12de32 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/proxy.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/proxy.yml
index eb1e5d4..31f80f3 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/proxy.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/proxy.yml
index cff2a88..4025d89 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp11-ovs/openstack/proxy.yml
index 1943969..77365d5 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/proxy.yml
@@ -12,4 +12,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/proxy.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/proxy.yml
index 8243ba9..e1bf876 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/proxy.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/proxy.yml
@@ -13,4 +13,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
index f7319b6..aa34b49 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
@@ -13,4 +13,10 @@
       authority: ${_param:salt_minion_ca_authority}
       engine: salt
       mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+    salt_minion_ca_host: cfg01.${_param:cluster_domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"
diff --git a/classes/cluster/virtual-offline-ssl/openstack/proxy.yml b/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
index bea4384..59b941d 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
@@ -14,3 +14,9 @@
       engine: salt
       mode: secure
     salt_minion_ca_host: cfg01.${linux:system:domain}
+  nginx:
+    server:
+      site:
+        nginx_ssl_redirect_openstack_web:
+          host:
+            name: "$host"