diff --git a/tcp_tests/templates/heat-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml b/tcp_tests/templates/heat-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml
deleted file mode 100644
index c4b85a6..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml
+++ /dev/null
@@ -1,218 +0,0 @@
-default_context:
-  jenkins_cfg_admin_password: r00tme
-  auditd_enabled: 'False'
-  backup_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-----
-  backup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
-  bmk_enabled: 'False'
-  calico_cni_image: docker-prod-local.artifactory.mirantis.com/mirantis/projectcalico/calico/cni:latest
-  calico_enable_nat: 'True'
-  calico_image: docker-prod-local.artifactory.mirantis.com/mirantis/projectcalico/calico/node:latest
-  calico_netmask: '16'
-  calico_network: 192.168.0.0
-  calicoctl_image: docker-prod-local.artifactory.mirantis.com/mirantis/projectcalico/calico/ctl:latest
-  ceph_enabled: 'False'
-  cicd_control_node01_address: ==IPV4_NET_CONTROL_PREFIX==.91
-  cicd_control_node01_hostname: cid01
-  cicd_control_node02_address: ==IPV4_NET_CONTROL_PREFIX==.92
-  cicd_control_node02_hostname: cid02
-  cicd_control_node03_address: ==IPV4_NET_CONTROL_PREFIX==.93
-  cicd_control_node03_hostname: cid03
-  cicd_control_vip_address: ==IPV4_NET_CONTROL_PREFIX==.90
-  cicd_control_vip_hostname: cid
-  cicd_enabled: 'True'
-  cicd_private_key: |-
-    -----BEGIN RSA PRIVATE KEY-----
-    MIIEpAIBAAKCAQEAv64AnFbEuuOQHLlmMkmaZ+Hh/8hJ+VfFpJ/MzW1wWzYyhis7
-    3A8rxNFWJ/I1/LJSsFI8qU0DpxjFjS9LMTTFXhDPPpuzgRLwfVusEmuQdXjOiT34
-    AIs07Q4w1nlvJ2+/l788ie1AEfnewd9erUHOs8Wt/PT3OOM/0ikY7EibvYF4L1Lb
-    xGRKYnUkY7G3eal9XcQpsTzAFRXoK3WafbCFBFsfzEWOhx1T+tn1SwaxPYJDt1OB
-    B1s77enFtBwbmbd0m1F1ufSXmdWea2xF3+5caS6tps/hwhCoOSJUQb7+dK4ri8og
-    q2YIhfEptrMP1R+nVqEY76P31aa/YSw4zOvcQwIDAQABAoIBAQCLKOzQlD4n4ObT
-    s9Z6U+2B1gCaDvOFzy9yoYGy8u1Li0GLHwBKd8kzDzgZsEN5vo1B7bKUx5ELU3S5
-    V8ijZMiVzmZn8eqUnwdyO4flp6otXxOzmAXhfy9hm5fhXjBQ1VSn+vMcv95wLpSG
-    9IBsEQbchXwX1lFWP8Yp8iRiByTqoz6A7qSxRzIOtq1/coYS9Vcy7VZDMiUjqvuc
-    pYvwYHvrgeYqxLXyDRzbZX1BbkSoNI/5VwxLb9IMG901IXph0r4V3uVgnnq+Xzkk
-    MoOfmB3cyOrvtWblZAjkyA+jzTs/QNALRUeI7wUeh4FvlwEGHE6v5G4G28zOS0vL
-    7IEhCqThAoGBAOeyDO07b060l+NOO+Jkv+NV31VD0w3S4TMyLPVSxXsrRPoHM9RM
-    udi6lewmALE4wk2Lc1Il6n0UrUGVbXxf55NJp2BQoSic+ZK2nTki0cZ/CkUDVNwY
-    R0WtWE0i3J+eF3e8j9VYm1mIlv0aDoYeH4qCp5is/JanvLy4MUl6tM7/AoGBANPJ
-    XheDO5lmqq1ejDTo3GAzYuAs44dQLDs0znEuuaUKZ4MKgQ4ax0L9n0MxvsuUGVcN
-    Nm7fZS4uMY3zLCOLcAXyD1jXY210gmOgFdXeYrH+2kSmqfflV8KHOLCatxLzRtbe
-    KBflcrEnrpUVNGKlpZaYr+4AyapXeMuXIxwveva9AoGAYtoDS9/UwHaqau+A+zlS
-    6TJFA8LZNAepz0b0CYLUAJXYavhRs508mWwZ9NPN7c6yj5UUkZLdtZnxxY50VOEy
-    ExQUljIwX/yBOogxEiR57b9b6U/fj7vIBMFNcDOUf4Far9pCX5rbRNrS2I+abLxD
-    ZrwRt0Duz3QnQTkwxhHVPI8CgYAaIjQJJLl7AW84O32DneRrvouJ7CAbd2ot2CNN
-    Vh20XudNBUPNkMJb4t3/Nak8h8bktg2sesaKf0rAIGym6jLlmOwJ43IydHkOgBeR
-    r4JwQml+pS4+F7/Pkk4NhNnobbqlEv7RjA+uCp6BaP9w2M3pGmhDLzezXF3ciYbc
-    mINM5QKBgQCyM9ZWwSiA0D3oitnhs7C4eC0IHBfnSoa7f40osKm4VvmqKBFgRu8L
-    qYK9qX++pUm4sk0q7poGUscc1udMlejAkfc/HLIlUi6MM+S7ZQ2NHtnZ7COZa5O4
-    9fG8FTiigLvMHka9ihYXtPbyGvusCaqyHp3D9VyOT+WsyM5eJe40lA==
-    -----END RSA PRIVATE KEY-----
-  cicd_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/rgCcVsS645AcuWYySZpn4eH/yEn5V8Wkn8zNbXBbNjKGKzvcDyvE0VYn8jX8slKwUjypTQOnGMWNL0sxNMVeEM8+m7OBEvB9W6wSa5B1eM6JPfgAizTtDjDWeW8nb7+XvzyJ7UAR+d7B316tQc6zxa389Pc44z/SKRjsSJu9gXgvUtvEZEpidSRjsbd5qX1dxCmxPMAVFegrdZp9sIUEWx/MRY6HHVP62fVLBrE9gkO3U4EHWzvt6cW0HBuZt3SbUXW59JeZ1Z5rbEXf7lxpLq2mz+HCEKg5IlRBvv50riuLyiCrZgiF8Sm2sw/VH6dWoRjvo/fVpr9hLDjM69xD
-  cluster_domain: heat-cicd-k8s-calico-sl.local
-  cluster_name: heat-cicd-k8s-calico-sl
-  context_seed: T3sbEdCaBfxrg9ysyA6LIaift250Ktb389rpcISKbdqPi5j0WHKiKAhBftYueBKl
-  control_network_netmask: 255.255.255.0
-  control_network_subnet: ==IPV4_NET_CONTROL_PREFIX==.0/24
-  control_vlan: '10'
-  cookiecutter_template_branch: ''
-  jenkins_pipelines_branch: 'release/2019.2.0'
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
-  deploy_network_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
-  deploy_network_netmask: 255.255.255.0
-  deploy_network_subnet: ==IPV4_NET_ADMIN_PREFIX==.0/24
-  deployment_type: physical
-  dns_server01: 172.18.176.6
-  dns_server02: 172.18.224.6
-  email_address: ddmitriev@mirantis.com
-  etcd_ssl: 'True'
-  stacklight_ssl_enabled: 'True'
-  infra_bond_mode: active-backup
-  infra_deploy_nic: eth0
-  infra_kvm01_control_address: ==IPV4_NET_CONTROL_PREFIX==.241
-  infra_kvm01_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.91
-  infra_kvm01_hostname: kvm01
-  infra_kvm02_control_address: ==IPV4_NET_CONTROL_PREFIX==.242
-  infra_kvm02_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.92
-  infra_kvm02_hostname: kvm02
-  infra_kvm03_control_address: ==IPV4_NET_CONTROL_PREFIX==.243
-  infra_kvm03_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.93
-  infra_kvm03_hostname: kvm03
-  infra_kvm_vip_address: ==IPV4_NET_CONTROL_PREFIX==.240
-  infra_primary_first_nic: eth1
-  infra_primary_second_nic: eth2
-  internal_proxy_enabled: 'False'
-  kqueen_custom_mail_enabled: 'False'
-  kqueen_enabled: 'False'
-  kubernetes_control_address: ==IPV4_NET_CONTROL_PREFIX==.10
-  kubernetes_control_node01_address: ==IPV4_NET_CONTROL_PREFIX==.11
-  kubernetes_control_node01_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.11
-  kubernetes_control_node01_hostname: ctl01
-  kubernetes_control_node02_address: ==IPV4_NET_CONTROL_PREFIX==.12
-  kubernetes_control_node02_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.12
-  kubernetes_control_node02_hostname: ctl02
-  kubernetes_control_node03_address: ==IPV4_NET_CONTROL_PREFIX==.13
-  kubernetes_control_node03_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.13
-  kubernetes_control_node03_hostname: ctl03
-  kubernetes_compute_count: 4
-  kubernetes_compute_rack01_hostname: cmp
-  kubernetes_compute_deploy_address_ranges: ==IPV4_NET_ADMIN_PREFIX==.101-==IPV4_NET_ADMIN_PREFIX==.104
-  kubernetes_compute_single_address_ranges: ==IPV4_NET_CONTROL_PREFIX==.101-==IPV4_NET_CONTROL_PREFIX==.104
-  kubernetes_compute_tenant_address_ranges: ==IPV4_NET_TENANT_PREFIX==.101-==IPV4_NET_TENANT_PREFIX==.104
-  kubernetes_enabled: 'True'
-  kubernetes_externaldns_enabled: 'False'
-  kubernetes_keepalived_vip_interface: br_ctl
-  kubernetes_network_calico_enabled: 'True'
-  kubernetes_virtlet_enabled: 'True'
-  kubernetes_proxy_hostname: prx
-  kubernetes_proxy_node01_hostname: prx01
-  kubernetes_proxy_node02_hostname: prx02
-  kubernetes_proxy_address: ==IPV4_NET_CONTROL_PREFIX==.220
-  kubernetes_proxy_node01_address: ==IPV4_NET_CONTROL_PREFIX==.221
-  kubernetes_proxy_node02_address: ==IPV4_NET_CONTROL_PREFIX==.222
-  kubernetes_metallb_enabled: 'True'
-  metallb_addresses: 172.17.16.150-172.17.16.190
-  kubernetes_ingressnginx_enabled: 'True'
-  kubernetes_ingressnginx_controller_replicas: 2
-  local_repositories: 'False'
-  maas_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.15
-  maas_deploy_range_end: ==IPV4_NET_ADMIN_PREFIX==.199
-  maas_deploy_range_start: ==IPV4_NET_ADMIN_PREFIX==.180
-  maas_enabled: 'False'
-  maas_deploy_vlan: '0'
-  maas_fabric_name: deploy-fabric0
-  maas_hostname: cfg01
-  mcp_common_scripts_branch: ''
-  mcp_version: proposed
-  offline_deployment: 'False'
-  opencontrail_enabled: 'False'
-  openldap_domain: ${_param:cluster_name}.local
-  openldap_enabled: 'True'
-  openldap_organisation: ${_param:cluster_name}
-  openssh_groups: cicd
-  openstack_enabled: 'False'
-  oss_enabled: 'False'
-  oss_node03_address: ${_param:stacklight_monitor_node03_address}
-  oss_webhook_app_id: '24'
-  oss_pushkin_email_sender_password: password
-  oss_pushkin_smtp_port: '587'
-  oss_webhook_login_id: '13'
-  platform: kubernetes_enabled
-  public_host: ${_param:infra_config_address}
-  publication_method: email
-  reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
-  salt_api_password: LTlVnap35hqpRVbB5QjA27EuKh9Ttl3k
-  salt_api_password_hash: $6$RKagUPuQ$Javpjz7b.hqKOOr1rai7uGQd/FnqlOH59tXn12/0G.LkVyunYmgBkSC5zTjoqZvIS1fOOOqsmCb9Q4HcGUbXS.
-  salt_master_address: ==IPV4_NET_CONTROL_PREFIX==.15
-  salt_master_hostname: cfg01
-  salt_master_management_address: ==IPV4_NET_ADMIN_PREFIX==.15
-  shared_reclass_branch: 'proposed'
-  shared_reclass_url: https://gerrit.mcp.mirantis.com/salt-models/reclass-system.git
-  stacklight_enabled: 'True'
-  stacklight_log_address: ==IPV4_NET_CONTROL_PREFIX==.60
-  stacklight_log_hostname: log
-  stacklight_log_node01_address: ==IPV4_NET_CONTROL_PREFIX==.61
-  stacklight_log_node01_hostname: log01
-  stacklight_log_node02_address: ==IPV4_NET_CONTROL_PREFIX==.62
-  stacklight_log_node02_hostname: log02
-  stacklight_log_node03_address: ==IPV4_NET_CONTROL_PREFIX==.63
-  stacklight_log_node03_hostname: log03
-  stacklight_long_term_storage_type: prometheus
-  stacklight_monitor_address: ==IPV4_NET_CONTROL_PREFIX==.70
-  stacklight_monitor_hostname: mon
-  stacklight_monitor_node01_address: ==IPV4_NET_CONTROL_PREFIX==.71
-  stacklight_monitor_node01_hostname: mon01
-  stacklight_monitor_node02_address: ==IPV4_NET_CONTROL_PREFIX==.72
-  stacklight_monitor_node02_hostname: mon02
-  stacklight_monitor_node03_address: ==IPV4_NET_CONTROL_PREFIX==.73
-  stacklight_monitor_node03_hostname: mon03
-  stacklight_telemetry_address: ==IPV4_NET_CONTROL_PREFIX==.85
-  stacklight_telemetry_hostname: mtr
-  stacklight_telemetry_node01_address: ==IPV4_NET_CONTROL_PREFIX==.86
-  stacklight_telemetry_node01_hostname: mtr01
-  stacklight_telemetry_node02_address: ==IPV4_NET_CONTROL_PREFIX==.87
-  stacklight_telemetry_node02_hostname: mtr02
-  stacklight_telemetry_node03_address: ==IPV4_NET_CONTROL_PREFIX==.88
-  stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
-  static_ips_on_deploy_network_enabled: 'False'
-  tenant_network_gateway: ==IPV4_NET_TENANT_PREFIX==.1
-  tenant_network_netmask: 255.255.255.0
-  tenant_network_subnet: ==IPV4_NET_TENANT_PREFIX==.0/24
-  tenant_vlan: '20'
-  upstream_proxy_enabled: 'False'
-  use_default_network_scheme: 'False'
-  vnf_onboarding_enabled: 'False'
-  secrets_encryption_enabled: 'True'
-  secrets_encryption_key_id: 'F5CB2ADC36159B03'
-  # Used on CI only.
-  secrets_encryption_private_key: ''
-  kubernetes_helm_enabled: 'True'
diff --git a/tcp_tests/templates/heat-cicd-k8s-calico-sl/encryption-key.asc b/tcp_tests/templates/heat-cicd-k8s-calico-sl/encryption-key.asc
deleted file mode 100644
index 381eb77..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-calico-sl/encryption-key.asc
+++ /dev/null
@@ -1,56 +0,0 @@
------BEGIN PGP PRIVATE KEY BLOCK-----
-
-lQcYBFyBRcUBEACmP/muUIwbEg6Z7dA3c9I2NadcjDHXKg/ViXwaOB4KSd9/FC0o
-KSBPccWb+1sm+zdUy2f/LC5r8RvU7yZd4Mbzz8R1DQncXg4nG7bppW7oAcHpc0jk
-pV/SvdMYxuXsrbKbpoGEquwVkbb4oTv2MLSBfGfFzBeQfiwGEWm1xPLSeXc4biLC
-FatCU7w4LS1U4BEOqRCp6lW/hQFLoX+j6rNT8TwC5AeFpKgUWuQZGOO4fZKpbvo2
-sCvF5VA1HSVXlZtzum6pL1yzLL/SoyLrYOy1KrZQmSBHG9htCZQVmvYK7U5WtWE4
-Ws5IAj+HwvgKyzXE2Srsirj1NqauQRsk+1riQk3rpDrX2BeXNUSoHR5M/RDY0gCc
-8P6heanQRnyFtjUSoovkQsydY77+QVxe0MCs+lZlg31fL+wJVG7FIbIKKwR5sj8i
-/JqhWE+t2ZzIrQ/7o7fRk7hv/u69Vb/t/Nt7fkbn53zoubqi3kNgXf6hwhTUtfW/
-lE9cc4JTzis4i/RnILUDnAwos1c0Z+tGCUo4pbiP71VfU8L259g+clPFXOIkqA9t
-L9JSZQfhH/lRj3Abs57OvZjN7/D1h8PWB+8nTB8bkoUt45SubgQb0Y9maWUcwjxw
-AcJSIk6mq8vVdBu7zOuslDjMnoUZbtJwcSwQQOnb9UUppjs3CjbcH80ttQARAQAB
-AA/9ExdprtDlJf6u2pJqxNNyInOK4p/e4VydMOJ28/PZz0iod8lzXhdK9JSWItF8
-qD9VHVG2gaErO44Wqh9EgqdbcYg8gUycA0hxy5/tI2uyDsaU5CAvEMLE/Eh8Q24j
-3UgdKK64VOnj7p4rKuYpIp55PB1zNU24rwkuOQwq3Yreb7kvLbXIHA2s+xLunGzj
-tcl9a/eSSFD2w+WcPnkvVT2QlmUvhQ12p6w++QdvBkrLa9ZPz1FFPp6AiFtLGK5e
-KW6uyV1xc9BSjujmpmPBkNIynKNpCFxtTn0uH2doMAr5kkuqIV726SfUZISNkyOa
-pHKtnAtsWHmdv9skzQIBAgAzcXTBGbdDxRj6QR+ohqbsCzfu3z9QHSbXUmxezti9
-bQqpsU1SIg8z2oDARFR6KlRzhnfpPvan+Gp9TvYsvxrXe61HpxRMdLj6Gt2Ibruf
-YHCtr1S9J5CzTTOurlIKpACUYIqgVXfgIkQzqiYX8e56PiDTUB++OqEg66i0orXB
-nbHAD2vu16CNvcaNqsak3DWkHMwmEfsuxqyUXNte0eYu9SCHtnNoYT/D7A72gK4b
-Gqg80J8ZCpo1ilIX3xUq8WsH+CoXs0X7hy6Cbi22AqnHFRYmrgoIWmRzJonp393b
-yqmTV+QsKQRpmwdX4hiH78zJLnLEUQMn8CuHAGwaJCzk4okIAMKNrIQZhkdbCCe4
-IrLuMKn4aQj3c22SMXNmu78/0cP9Rtsm3ChjzzelLO7NjvPm0nIvEcThFSIZIXCv
-iWGZCXFCKn3WtA5xWuMFNXsEQcc3AG/qRODdDSeFpo+VH/9IwppAc3zI2jxe1PRD
-G2DnheLaLIKgHunsCYxpftJDod/vRqRHeU7ulMVJfEKVxdzrCbKGiIOXSyS6KowQ
-JOxF/80ocq/25Zc/oH25Y2r/0y+xzDpOHBgU0ndrCZf2z8oOuECJTxcq83UDyJzT
-HrG/hTrU83YsQMZ0AwBrYxpzUfdH7b6y60VE19FrwmMDK6Fz8I/x4Ai0sNkI3QLR
-NntY9fsIANrB3QM8CtsdxXsFvdTEwNLsG8LMdn3loCH6Cq3ejkEKa69Uua+sB6ND
-wYOXWzyksLZJyfxIXux/hMlK/kO3ohGcEFiMUaDZndJy8IKUlDrhwcUZqm7dXMDU
-CIf0T3rOEzOXbNu3UTds3j/ruSvA5KmjzOa4Qnb41CyL5Fh7x0R8Rux3NzAn6Ecx
-Y+nAWRtI/Yz7zdL8zuHaJfbVuxAPJ+ImcXAS7cX6T9dM3tWRlam1+0Ezhdb4F8i5
-lcY7sMu95scDwhV7qOmln6wtGSkBPZgE0+TqRuELZrPvlcIRRIM42UwPWhYO2PG8
-kKd2i5teweDnhzN8+E87VV2BQhP9DA8H/0+ZiXsvaG60JGqNmWzVbB6U1qgwrFOR
-VcuzIWpdZyQR8Ok63GXuA0odoqReolba9R6fVlXchj6INBz2WY2F0twwCRPx7tRg
-Pyq4PaTA8ZYYjAVWVCd9k97gY2i80p4MPzQCnE8g4n6OWGY47pcTwSkm4HBoGoam
-igIRn3Soz7CXGF+PvSGi1T0jpwM5IWfM3IwEUPdPTIJuA2iD/9zSKDvhsP+trJ1Y
-TMe9CW3Llf5mFbHLRZ7LfMOLIngKOIxBAxHiT8wUrIRaH78wHdz8ALDsC+LNP6rK
-hKb8h/VHXaqmf0BlNjGpO7XZXfxXWJ0oTUG5Z+jKz2Ir14HYLZI1GlOA8bQlZXhh
-bXBsZS5jb20gPHNhbHQtbWFzdGVyQGV4YW1wbGUuY29tPokCTgQTAQgAOBYhBLaR
-Vrvqyq56MiGjUvXLKtw2FZsDBQJcgUXFAhsvBQsJCAcCBhUKCQgLAgQWAgMBAh4B
-AheAAAoJEPXLKtw2FZsDpi4P/1kmvlpkbOhrL73zAPyMzYa4Yo2Pi/BoMbyEKNKO
-K3wLCdP6xLGecVIt8pANosksDSGlWAnWj36/jfgt/aZisx1u6MTYaOEHkXahxOX4
-ghDW1cTbdtz7Uy5Ah9O3WNI+ejmOpCtuc3P/XOkdttKZLuCNCs6ocgCsejpNHcFK
-vMhOhnRKV8kcBrG2QLyfSyafBtM/zV+NR4Wrng71Za8fiXHlDanmrAIyuSnD538r
-hTwSFe0C9HntwuF6W+UShN7c+jPJaKQjKbZy9fuFp33NcTSPCB5dH9yrhQvOeFQo
-dFzEabMDFVGPfUVWR+TH39dWYOsq5zFmgQAbOB/vHdmEtrYNrxX0AiCZZHQHTUb9
-oBK68V8eVeFdoRLcMORBZ2RCqkQTOQoAF7o772knltjtsymnI0XNvVC/XCnZv89Q
-/eoivrd/rMMpTFOGcys6EAnSUWx0ZG/JCkezQqnx9U219BvqKNOZ60aOeOYHKpsX
-Ha8Nr72YRmtm0UMsDjEUyLOj+o06XnN7uafMv2bZpjWh2hfOrkAbxe41z6t+78ho
-P+C5vSvp01OmAt71iq+62MXVcLVKEWDpiuZSj8m83RlY5AGIaPaGX9LKPcHdGxKw
-QSczgB/jI3G08vWaq82he6UJuYexbYe1iJXfvcx8kThwZ1nXQJm+7UsISUsh8/NZ
-x0n/
-=uxDD
------END PGP PRIVATE KEY BLOCK-----
diff --git a/tcp_tests/templates/heat-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml b/tcp_tests/templates/heat-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml
deleted file mode 100644
index 2d4689c..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml
+++ /dev/null
@@ -1,244 +0,0 @@
-nodes:
-    cfg01:
-      reclass_storage_name: infra_config_node01
-      roles:
-      - infra_config
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_static_ctl
-
-    kvm01:
-      reclass_storage_name: infra_kvm_node01
-      roles:
-      - infra_kvm
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    kvm02:
-      reclass_storage_name: infra_kvm_node02
-      roles:
-      - infra_kvm
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    kvm03:
-      reclass_storage_name: infra_kvm_node03
-      roles:
-      - infra_kvm
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    cid01:
-      reclass_storage_name: cicd_control_node01
-      roles:
-      - cicd_control_leader
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    cid02:
-      reclass_storage_name: cicd_control_node02
-      roles:
-      - cicd_control_manager
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    cid03:
-      reclass_storage_name: cicd_control_node03
-      roles:
-      - cicd_control_manager
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    ctl01:
-      reclass_storage_name: kubernetes_control_node01
-      roles:
-      - kubernetes_control
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl_calico
-
-    ctl02:
-      reclass_storage_name: kubernetes_control_node02
-      roles:
-      - kubernetes_control
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl_calico
-
-    ctl03:
-      reclass_storage_name: kubernetes_control_node03
-      roles:
-      - kubernetes_control
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl_calico
-
-    prx01:
-      reclass_storage_name: kubernetes_proxy_node01
-      roles:
-      - kubernetes_proxy
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    prx02:
-      reclass_storage_name: kubernetes_proxy_node02
-      roles:
-      - kubernetes_proxy
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    # Generator-based computes. For compatibility only
-    cmp<<count>>:
-      reclass_storage_name: kubernetes_compute_rack01
-      roles:
-      - kubernetes_compute
-      - linux_system_codename_xenial
-      - salt_master_host
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl_calico
-
-    mon01:
-      reclass_storage_name: stacklight_server_node01
-      roles:
-      - stacklightv2_server_leader
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    mon02:
-      reclass_storage_name: stacklight_server_node02
-      roles:
-      - stacklightv2_server
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    mon03:
-      reclass_storage_name: stacklight_server_node03
-      roles:
-      - stacklightv2_server
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    mtr01:
-      reclass_storage_name: stacklight_telemetry_node01
-      roles:
-      - stacklight_telemetry_leader
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    mtr02:
-      reclass_storage_name: stacklight_telemetry_node02
-      roles:
-      - stacklight_telemetry
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    mtr03:
-      reclass_storage_name: stacklight_telemetry_node03
-      roles:
-      - stacklight_telemetry
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    log01:
-      reclass_storage_name: stacklight_log_node01
-      roles:
-      - stacklight_log_leader_v2
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    log02:
-      reclass_storage_name: stacklight_log_node02
-      roles:
-      - stacklight_log
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    log03:
-      reclass_storage_name: stacklight_log_node03
-      roles:
-      - stacklight_log
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
diff --git a/tcp_tests/templates/heat-cicd-k8s-calico-sl/salt.yaml b/tcp_tests/templates/heat-cicd-k8s-calico-sl/salt.yaml
deleted file mode 100644
index 745b97c..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-calico-sl/salt.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-{% set HOSTNAME_CFG01='cfg01.heat-cicd-k8s-calico-sl.local' %}
-{% set LAB_CONFIG_NAME='heat-cicd-k8s-calico-sl' %}
-{% set DOMAIN_NAME='heat-cicd-k8s-calico-sl.local' %}
-{% set SALT_MODELS_REPOSITORY = os_env('SALT_MODELS_REPOSITORY','https://gerrit.mcp.mirantis.com/salt-models/mcp-virtual-lab') %}
-# Other salt model repository parameters see in shared-salt.yaml
-
-{% import 'shared-salt.yaml' as SHARED with context %}
-
-{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
-
-{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
-
-{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
-
-- description: "Share custom key from cfg to give each node acces with key from cfg01"
-  cmd: |
-    set -e;
-    set -x;
-    key=$(ssh-keygen -y -f /root/.ssh/id_rsa);
-    salt '*' cmd.run "echo $key >> /root/.ssh/authorized_keys";
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: true
diff --git a/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay--user-data-foundation.yaml b/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay--user-data-foundation.yaml
deleted file mode 100644
index 1677dcd..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay--user-data-foundation.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-#cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
-ssh_pwauth: True
-users:
-  - name: root
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    shell: /bin/bash
-  - name: jenkins
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFSxeuXh2sO4VYL8N2dlNFVyNcr2RvoH4MeDD/cV2HThfU4/BcH6IOOWXSDibIU279bWVKCL7QUp3mf0Vf7HPuyFuC12QM+l7MwT0jCYh5um3hmAvM6Ga0nkhJygHexe9/rLEYzZJkIjP9/IS/YXSv8rhHg484wQ6qkEuq15nyMqil8tbDQCq0XQ+AWEpNpIa4pUoKmFMsOP8lq10KZXIXsJyZxizadr6Bh4Lm9LWrk8YCw7qP3rmgWxK/s8qXQh1ISZe6ONfcmk6p03qbh4H3CwKyWzxmnIHQvE6PgN/O+PuAZj3PbR2mkkJjYX4jNPlxvj8uTStaVPhAwfR9Spdx jenkins@cz8133
-
-disable_root: false
-chpasswd:
-  list: |
-    root:r00tme
-    jenkins:qalab
-  expire: False
-
-packages:
-  - openjdk-8-jre-headless
-  - libyaml-dev
-  - libffi-dev
-  - libvirt-dev
-  - python-dev
-  - python-pip
-  - python-virtualenv
-  #- python-psycopg2
-  - pkg-config
-  - vlan
-  - bridge-utils
-  - ebtables
-
-bootcmd:
-  # Enable root access
-  - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
-  - service sshd restart
-output:
-  all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
-
-runcmd:
-  # Create swap
-  - fallocate -l 16G /swapfile
-  - chmod 600 /swapfile
-  - mkswap /swapfile
-  - swapon /swapfile
-  - echo "/swapfile   none    swap    defaults   0   0" >> /etc/fstab
-
-write_files:
-  - path: /etc/default/grub.d/97-enable-grub-menu.cfg
-    content: |
-      GRUB_RECORDFAIL_TIMEOUT=30
-      GRUB_TIMEOUT=3
-      GRUB_TIMEOUT_STYLE=menu
-
-  - path: /etc/network/interfaces
-    content: |
-      auto ens3
-      iface ens3 inet dhcp
-
-  - path: /etc/bash_completion.d/fuel_devops30_activate
-    content: |
-      source /home/jenkins/fuel-devops30/bin/activate
diff --git a/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay-userdata.yaml b/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay-userdata.yaml
deleted file mode 100644
index 8c1f248..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay-userdata.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-#cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
-ssh_pwauth: True
-users:
-   - name: root
-     sudo: ALL=(ALL) NOPASSWD:ALL
-     shell: /bin/bash
-
-disable_root: false
-chpasswd:
-   list: |
-    root:r00tme
-   expire: False
-
-bootcmd:
-   # Enable root access
-   - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
-   - service sshd restart
-output:
-    all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
-
-runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
-   - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
-
-   - export TERM=linux
-   - export LANG=C
-   # Configure dhclient
-   - sudo resolvconf -u
-   #- sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
-   # Enable grub menu using updated config below
-   - update-grub
-
-   # Prepare network connection
-   - sudo ifup ens3
-   #- sudo route add default gw {gateway} {interface_name}
-
-write_files:
-   - path: /etc/default/grub.d/97-enable-grub-menu.cfg
-     content: |
-         GRUB_RECORDFAIL_TIMEOUT=30
-         GRUB_TIMEOUT=3
-         GRUB_TIMEOUT_STYLE=menu
-
-   - path: /etc/network/interfaces
-     content: |
-          auto ens3
-          iface ens3 inet dhcp
-
-   - path: /usr/share/growlvm/image-layout.yml
-     content: |
-       root:
-         size: '65%VG'
-       home:
-         size: '1%VG'
-       var_log:
-         size: '10%VG'
-       var_log_audit:
-         size: '5%VG'
-       var_tmp:
-         size: '10%VG'
-       tmp:
-         size: '5%VG'
-     owner: root:root
-
-growpart:
-    mode: auto
-    devices:
-      - '/'
-      - '/dev/vda3'
-    ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot b/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot
deleted file mode 100644
index bc57945..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot
+++ /dev/null
@@ -1,639 +0,0 @@
----
-
-heat_template_version: queens
-
-description: MCP environment for heat-cicd-k8s-calico-sl
-
-parameters:
-  instance_domain:
-    type: string
-    default: heat-cicd-k8s-calico-sl.local
-  mcp_version:
-    type: string
-  env_name:
-    type: string
-  control_subnet_cidr:
-    type: string
-    default: "10.6.0.0/24"
-  tenant_subnet_cidr:
-    type: string
-    default: "10.8.0.0/24"
-  external_subnet_cidr:
-    type: string
-    default: "192.168.200.0/24"
-  management_subnet_cidr:
-    type: string
-    default: "10.7.0.0/24"
-  management_subnet_cfg01_ip:
-    type: string
-    default: 10.7.0.15
-  management_subnet_gateway_ip:
-    type: string
-    default: 10.7.0.1
-  management_subnet_pool_start:
-    type: string
-    default: 10.7.0.20
-  management_subnet_pool_end:
-    type: string
-    default: 10.7.0.90
-  salt_master_control_ip:
-    type: string
-    default: 10.6.0.15
-  key_pair:
-    type: string
-
-  ctl_flavor:
-    type: string
-  cfg_flavor:
-    type: string
-  cid_flavor:
-    type: string
-  kvm_fake_flavor:
-    type: string
-  mon_flavor:
-    type: string
-  log_flavor:
-    type: string
-  mtr_flavor:
-    type: string
-  cmp_flavor:
-    type: string
-  foundation_flavor:
-    type: string
-
-  net_public:
-    type: string
-
-  foundation_image:
-    type: string
-
-  bm_availability_zone:
-    type: string
-  vm_availability_zone:
-    type: string
-
-resources:
-  networks:
-    type: MCP::Networks
-    properties:
-      stack_name: { get_param: "OS::stack_name" }
-      env_name: { get_param: env_name }
-  subnets:
-    depends_on: [networks]
-    type: MCP::Subnets
-    properties:
-      stack_name: { get_param: "OS::stack_name" }
-      env_name: { get_param: env_name }
-      management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
-      control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
-      tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
-      external_net: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
-      control_subnet_cidr: { get_param: control_subnet_cidr }
-      tenant_subnet_cidr: { get_param: tenant_subnet_cidr }
-      external_subnet_cidr: { get_param: external_subnet_cidr }
-      management_subnet_cidr: { get_param: management_subnet_cidr }
-      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
-      management_subnet_pool_start: { get_param: management_subnet_pool_start }
-      management_subnet_pool_end: { get_param: management_subnet_pool_end }
-
-  #flavors:
-  #  type: MCP::Flavors
-
-  cfg01_node:
-    type: MCP::MasterNode
-    depends_on: [subnets]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      cfg01_flavor: { get_param: cfg_flavor }
-      availability_zone: { get_param: bm_availability_zone }
-      management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
-      control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
-      tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
-      external_net: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
-      salt_master_control_ip: { get_param: salt_master_control_ip }
-      management_subnet_cfg01_ip: { get_param: management_subnet_cfg01_ip }
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '15' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '15' ]
-      instance_name: cfg01
-      instance_domain: {get_param: instance_domain}
-
-  control_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [cfg01_node]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: ctl01
-      instance02_name: ctl02
-      instance03_name: ctl03
-      instance01_role: k8s_controller
-      instance_flavor: {get_param: ctl_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '11' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '12' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '13' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '11' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '12' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '13' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '11' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '12' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '13' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  fake_kvm_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [control_cluster]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: kvm01
-      instance02_name: kvm02
-      instance03_name: kvm03
-      instance_flavor: {get_param: kvm_fake_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '241' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '242' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '243' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '241' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '242' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '243' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '241' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '242' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '243' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  cicd_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [fake_kvm_cluster]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: cid01
-      instance02_name: cid02
-      instance03_name: cid03
-      instance_flavor: {get_param: cid_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '91' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '92' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '93' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '91' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '92' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '93' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '91' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '92' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '93' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  stacklight_monitor_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [cicd_cluster]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: mon01
-      instance02_name: mon02
-      instance03_name: mon03
-      instance_flavor: {get_param: mon_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '71' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '72' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '73' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '71' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '72' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '73' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '71' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '72' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '73' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  stacklight_log_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [stacklight_monitor_cluster]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: log01
-      instance02_name: log02
-      instance03_name: log03
-      instance_flavor: {get_param: log_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '61' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '62' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '63' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '61' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '62' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '63' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '61' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '62' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '63' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  stacklight_mtr_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [stacklight_log_cluster]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: mtr01
-      instance02_name: mtr02
-      instance03_name: mtr03
-      instance_flavor: {get_param: mtr_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '86' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '87' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '88' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '86' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '87' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '88' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '86' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '87' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '88' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  prx01_virtual:
-    type: MCP::SingleInstance
-    depends_on: [stacklight_mtr_cluster]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: prx01
-      instance_flavor: {get_param: cid_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '221' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '221' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '221' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  prx02_virtual:
-    type: MCP::SingleInstance
-    depends_on: [prx01_virtual]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: prx02
-      instance_flavor: {get_param: cid_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '222' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '222' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '222' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  cmp001_virtual:
-    type: MCP::Compute
-    depends_on: [prx02_virtual]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: cmp001
-      instance_flavor: {get_param: cmp_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '101' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '101' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '101' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  cmp002_virtual:
-    type: MCP::Compute
-    depends_on: [cmp001_virtual]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: cmp002
-      instance_flavor: {get_param: cmp_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '102' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '102' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '102' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  cmp003_virtual:
-    type: MCP::Compute
-    depends_on: [cmp002_virtual]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: cmp003
-      instance_flavor: {get_param: cmp_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '103' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '103' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '103' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  cmp004_virtual:
-    type: MCP::Compute
-    depends_on: [cmp003_virtual]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: cmp004
-      instance_flavor: {get_param: cmp_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '104' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '104' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '104' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  foundation_node:
-    type: MCP::FoundationNode
-    depends_on: [subnets]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: foundation
-      instance_image: { get_param: foundation_image }
-      instance_flavor: {get_param: foundation_flavor}
-      availability_zone: { get_param: bm_availability_zone }
-      management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
-      control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
-      tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
-      external_net: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
-      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
-      underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
-      management_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, management_net_prefix] }, '5' ]
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '5' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '5' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '5' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-outputs:
-  foundation_public_ip:
-    description: foundation node IP address (floating) from external network
-    value:
-      get_attr:
-      - foundation_node
-      - instance_floating_address
-...
diff --git a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/salt-context-cookiecutter-k8s-contrail.yaml b/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/salt-context-cookiecutter-k8s-contrail.yaml
deleted file mode 100644
index fa4f114..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/salt-context-cookiecutter-k8s-contrail.yaml
+++ /dev/null
@@ -1,378 +0,0 @@
-default_context:
-  jenkins_cfg_admin_password: r00tme
-  alertmanager_notification_email_enabled: 'False'
-  auditd_enabled: 'False'
-  backend_network_netmask: 255.255.255.0
-  backend_network_subnet: ==IPV4_NET_TENANT_PREFIX==.0/24
-  backend_vlan: '30'
-  backup_private_key: '-----BEGIN RSA PRIVATE KEY-----
-
-    MIIEpAIBAAKCAQEAwMkoTAEV2WkPsAqltD9lc3rp2UUNpCqIvnkziuVDsxE0f6YG
-
-    MTlM3ADK7BKryPaNQNHtbrW5J6iQq98FcZYj6n5qGKmisxjSOFodlTFgnLz/JTHt
-
-    Orctn/Ds/IS8PgzQUPp9hhrwGCmufmrOG+FhlIRcQOBdfHYesSO4998rXHBYTN5j
-
-    oinmeEN6QSmxT7JjragZ/pyDhnMZfw1piOteu8WJp3PMgrkTsmzpaNUgCOlaO1Ho
-
-    21pNRb0l47SwoAq6B2VQYGB1KyP4LGDUOmOxm9yvHDZ4GpT8CjUaSQdz4ilcdnyu
-
-    NcN3mc0VJAim4MCWxx/Xa+rXa4ilL1/72KKrpwIDAQABAoIBAQCUyOq7tb66GvZL
-
-    g/wc3yyZ8kuWLk/32gfNENcxo/0arvWYanau+K0TwdzaUxKXN4kOdLXM0p0COXrl
-
-    2mpmHly7tjKFtC3oEQj1Cr94DDKm5Mn5V83hmcuxe4w62uo47US8qoXDwPh5fXm5
-
-    AQ7uv4PCzmAwhbhAvRy004AGdQsO/CKQzrdwFpi+4k462cuFgJA1MqLTtW/4vXWY
-
-    voOpC8zzqpw0I87wq+uo/tg6/5cjPRXOxc2xXTDj+Ns6YSkbqfkh1oywTEXsDV7S
-
-    4VDVGns1u3LB6MDA/ORcJIiNpj05uz2sK1Vly4FDv4OXx9pVegU5MABriYOZ6TAL
-
-    9dgsoi2RAoGBAN7bA9H+FOLHe/b4jPYgzu99WawE4oVOXadGGen+JojSXXMpKHWI
-
-    WenbsfKZiAO6EehRKi/SujtcL0z9jgmBxloMhezWcM6PeCI/HDEwHT6Yotq3r9Q4
-
-    hDhM3UJ23eRqzWvxPvArehuduDOpgW1CsIVsVNZDPjtCc46pBNwK5xpPAoGBAN11
-
-    RM+wgz9LzJ/PEBamrQufIZ75GkcIBMWy7M4U9SloOM9h0FUZChW5qk+c1cMoVA5f
-
-    gBjrvZJPDnTF/8OA3hsDsjvG/eryAHpW+C5VHxXTh3LaU8J9l/kJLvvnFQWdSW2Q
-
-    qN5sG8f9B3dj8nXLscfbb+qsaEkducaTClQe7PspAoGBAKah5sJelGlZNYTeJjBn
-
-    KbQC60jnQiThCr/nd7rxsQh/GybfsIPpVym4ft7iE8SNnZQzFDM8AsodzLRpponP
-
-    QmvUj1MeqKyas/4PaFoTGtrSMHsP++XX+G1Mc+idjp6biUvbz+6u45fAn5npdYAn
-
-    7GtnLCwljWOr9VHHaX3KnTCbAoGATsfy7LdsWU4LwyYUIRq2IJZBjZ4sPOybVgEq
-
-    wL0v4cUTwKKZTEyWC9h6v8uZN83W6S4MEdF7JNs+10fAjrn/STjtZNqLZdMlXGAn
-
-    9cOORWN0oeUNOvkW4R7lOfOgxNiJUJLPoCBxWZmn2E8T59fIrMJhc+hVSP1sIzoX
-
-    yIkf4NECgYBNoO9aXYWROcyj7RtGc86e7Zvf0PxVP+n669uJ4G6V5ZEy/rn76Bvs
-
-    d9UY7sJPxy6iNdYJAF0TK7pzKY3cD/g/uopvMaJSkSULTxtQd194ZpeV333XlLTS
-
-    B9Loynqu/foofBhVAeUpot+Xo6lvqJW0LwIS0cqAcsEoY6OnGEYYuw==
-
-    -----END RSA PRIVATE KEY-----'
-  backup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAyShMARXZaQ+wCqW0P2VzeunZRQ2kKoi+eTOK5UOzETR/pgYxOUzcAMrsEqvI9o1A0e1utbknqJCr3wVxliPqfmoYqaKzGNI4Wh2VMWCcvP8lMe06ty2f8Oz8hLw+DNBQ+n2GGvAYKa5+as4b4WGUhFxA4F18dh6xI7j33ytccFhM3mOiKeZ4Q3pBKbFPsmOtqBn+nIOGcxl/DWmI6167xYmnc8yCuROybOlo1SAI6Vo7UejbWk1FvSXjtLCgCroHZVBgYHUrI/gsYNQ6Y7Gb3K8cNngalPwKNRpJB3PiKVx2fK41w3eZzRUkCKbgwJbHH9dr6tdriKUvX/vYoqun
-  bmk_enabled: 'False'
-  cc_opencontrail_tls_xmpp_enabled: 'True'
-  ceph_cluster_network: ==IPV4_NET_TENANT_PREFIX==.0/24
-  ceph_enabled: 'True'
-  ceph_hyper_converged: 'False'
-  ceph_mon_node01_address: ==IPV4_NET_CONTROL_PREFIX==.66
-  ceph_mon_node01_hostname: cmn01
-  ceph_mon_node02_address: ==IPV4_NET_CONTROL_PREFIX==.67
-  ceph_mon_node02_hostname: cmn02
-  ceph_mon_node03_address: ==IPV4_NET_CONTROL_PREFIX==.68
-  ceph_mon_node03_hostname: cmn03
-  ceph_osd_backend: bluestore
-  ceph_osd_backend_address_ranges: ==IPV4_NET_TENANT_PREFIX==.200-==IPV4_NET_TENANT_PREFIX==.202
-  ceph_osd_block_db_size: '3'
-  ceph_osd_bond_mode: active-backup
-  ceph_osd_data_disks: /dev/vdb
-  ceph_osd_journal_or_block_db_disks: /dev/vdb
-  ceph_osd_node_count: '3'
-  ceph_osd_primary_first_nic: eth1
-  ceph_osd_primary_second_nic: eth2
-  ceph_osd_rack01_hostname: osd
-  ceph_osd_single_address_ranges: ==IPV4_NET_CONTROL_PREFIX==.200-==IPV4_NET_CONTROL_PREFIX==.202
-  ceph_public_network: ==IPV4_NET_CONTROL_PREFIX==.0/24
-  ceph_rgw_address: ==IPV4_NET_CONTROL_PREFIX==.75
-  ceph_rgw_hostname: rgw
-  ceph_rgw_node01_address: ==IPV4_NET_CONTROL_PREFIX==.76
-  ceph_rgw_node01_hostname: rgw01
-  ceph_rgw_node02_address: ==IPV4_NET_CONTROL_PREFIX==.77
-  ceph_rgw_node02_hostname: rgw02
-  ceph_rgw_node03_address: ==IPV4_NET_CONTROL_PREFIX==.78
-  ceph_rgw_node03_hostname: rgw03
-  ceph_version: luminous
-  cfg_failsafe_ssh_public_key: ''
-  cicd_control_node01_address: ==IPV4_NET_CONTROL_PREFIX==.91
-  cicd_control_node01_hostname: cid01
-  cicd_control_node02_address: ==IPV4_NET_CONTROL_PREFIX==.92
-  cicd_control_node02_hostname: cid02
-  cicd_control_node03_address: ==IPV4_NET_CONTROL_PREFIX==.93
-  cicd_control_node03_hostname: cid03
-  cicd_control_vip_address: ==IPV4_NET_CONTROL_PREFIX==.90
-  cicd_control_vip_hostname: cid
-  cicd_enabled: 'True'
-  cicd_private_key: '-----BEGIN RSA PRIVATE KEY-----
-
-    MIIEowIBAAKCAQEAu3t9TSN9QQcWPJOtVZuxIu3t5ahXsffcN+QFO5Aa6NA5n9Ei
-
-    ZWVtIf1+RIIMPm7A7ghp6VmwTZsHNbI1fFmjrNBhaULBMyggIaAzAt0v61VD9bEW
-
-    xctg8akrLkrnKLuLZNLA36DAgucMzt+WjJ7stc+SS2cnntS83YRI0GOb9fRmRZiN
-
-    XpckceyyXo3ZPmlGHO0nNfXTWXbiblAp/5+caQCSCnzZmuZv3VRdjuz+biWIQRCJ
-
-    TixS3aCdu6qCULW2+CcKw3R0V33SJCz6SJJc7/RJ6AuP5QMdYRBNNbgH1Keka8nz
-
-    S2qXaONJ/GwNUvfZxiqKgHmOmctpMxZLBLSxTwIDAQABAoIBAFmvpm5bVtTfxgRu
-
-    hNHaK+/QsChX0rPBJWjbPKGUuzq6OYa5beHhlkZXVKsDJ0ZKhyKXhcrqa8uEKPvH
-
-    54w3+XN3L9JB69hEDrLnRt/M3dqPLHaBI6q1MwgH7C82B8TVisZNh5Sy+sTkMJ1a
-
-    GlPkxsnmpU5K54o0rLCvUoHV1MrgMM4+zq/0pdn1UkvI8G11gjoTeVIPTdIrP0vA
-
-    SL4Y3OsCCyJqnxil7bNt90aa5emOITV0yJVpA8wGoGGoiyrVcz0YSO2coMX8FaXz
-
-    NzPwQOJZl7pSXKY5kI7YP9qFIcHDd/rZL5YMl5aN5BOXlTbr7dVK35GxRV+YuaIS
-
-    jNcZjykCgYEA4GNtJU5eRwV3cOrcx1abwChaKd2oadFj40QOvTM5EdE9bZNn87kX
-
-    eNw7vx6+eKgRiINV1nhF9evMeCCweerRFCzS8KRsuoAdlwkfzp/R2KvzAPVyyTWh
-
-    0Px0bpZG7YIAkBJuv4lkeOfRBPZOdu43xVDxa2rMSGG+pF5DVCx4/30CgYEA1eUM
-
-    COc+jtU4rEYHFbDqBADK2OnuUQfl6R4wsqLCWOGzwdyXHnFqtGT9ILD7ilnXtteK
-
-    dLGVHynPA/w4tqQPnnyM9X/SHZZe4vUn7ZEPUwvtijU4INIIfbOnTc7A4wBwgK35
-
-    oLWvKIvzxBOqRCMjcv9c9h8RkFKrQNgWvVAJJbsCgYBR1VDv4xXU9vRpdO4RsM9a
-
-    lBzV2eXauaehMafibnTov5OUi8bEhwM9a6xKdk7mt/y0+Zjrf6+cEWPfh6R0wiOA
-
-    JRzE8GJK3gBsncJA295vE76q4dj78phSHE/mKN4zLk9AO8iyB8xhn8GF+sIA873Z
-
-    MzzofOmFmEgrr8kEQLfcDQKBgDYH7PlWyMO18uH5spJ1JTgrpxISTcQkVZyEptKJ
-
-    MMTZBtqCyZ3EEqtNE3AtpOz28vnaCrydm0jK++NK1Fy2psdnOQhO6JnWwVNdkF9/
-
-    lDprOe7+sJYB2GlAd5O9FZaCJukqiXNiUcPRTpuKSCl8ItlKzoXRpVMqvt3beCsM
-
-    S7M/AoGBAMKTqbPWbX3a3zv+5CAG5PXg4u9vQYs+qpl0X7AjpgMMon4E1ilnaQ3T
-
-    cxwLk/N/4Pq0o96rQAcTy4sdo7FrlRhzczohVj/OYH++/sxcSUD+BnmrJpxog8/2
-
-    lqe3dnOSd58WuGNjVCsGbnO+5sI6YnKXjuAHdPbIkCxU5R5gUw7n
-
-    -----END RSA PRIVATE KEY-----'
-  cicd_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7e31NI31BBxY8k61Vm7Ei7e3lqFex99w35AU7kBro0Dmf0SJlZW0h/X5Eggw+bsDuCGnpWbBNmwc1sjV8WaOs0GFpQsEzKCAhoDMC3S/rVUP1sRbFy2DxqSsuSucou4tk0sDfoMCC5wzO35aMnuy1z5JLZyee1LzdhEjQY5v19GZFmI1elyRx7LJejdk+aUYc7Sc19dNZduJuUCn/n5xpAJIKfNma5m/dVF2O7P5uJYhBEIlOLFLdoJ27qoJQtbb4JwrDdHRXfdIkLPpIklzv9EnoC4/lAx1hEE01uAfUp6RryfNLapdo40n8bA1S99nGKoqAeY6Zy2kzFksEtLFP
-  cluster_domain: heat-cicd-k8s-contrail41-sl.local
-  cluster_name: heat-cicd-k8s-contrail41-sl
-  context_seed: Z1hp7dK6uV7w6GnkL8D5gMAZ2WuAgGzX0bK6D7V0l377qPfYq822m4U46Dz2E7q0n1gFfNZi3AP5PZIAIiI3VKAA
-  control_network_netmask: 255.255.255.0
-  control_network_subnet: ==IPV4_NET_CONTROL_PREFIX==.0/24
-  control_vlan: '10'
-  cookiecutter_template_branch: ''
-  jenkins_pipelines_branch: 'release/2019.2.0'
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: ssh://gerrit.mcp.mirantis.net:29418/mk/cookiecutter-templates.git
-  deploy_network_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
-  deploy_network_netmask: 255.255.255.0
-  deploy_network_subnet: ==IPV4_NET_ADMIN_PREFIX==.0/24
-  deployment_type: physical
-  dns_server01: 8.8.8.8
-  dns_server02: 1.1.1.1
-  email_address: sgudz@mirantis.com
-  etcd_ssl: 'True'
-  stacklight_ssl_enabled: 'True'
-  gainsight_service_enabled: 'False'
-  infra_bond_mode: active-backup
-  infra_deploy_nic: eth0
-  infra_kvm01_control_address: ==IPV4_NET_CONTROL_PREFIX==.240
-  infra_kvm01_hostname: kvm01
-  infra_kvm02_control_address: ==IPV4_NET_CONTROL_PREFIX==.241
-  infra_kvm02_hostname: kvm02
-  infra_kvm03_control_address: ==IPV4_NET_CONTROL_PREFIX==.242
-  infra_kvm03_hostname: kvm03
-  infra_kvm_vip_address: ==IPV4_NET_CONTROL_PREFIX==.239
-  infra_primary_first_nic: eth1
-  infra_primary_second_nic: eth2
-  internal_proxy_enabled: 'False'
-  keycloak_enabled: 'False'
-  kubernetes_cloudprovider_enabled: 'False'
-  kubernetes_cmp_deploy_nic: eth0
-  kubernetes_cmp_network_scheme: physical
-  kubernetes_cmp_primary_first_nic: eth1
-  kubernetes_cmp_primary_second_nic: eth2
-  kubernetes_compute_control_address_ranges: ==IPV4_NET_CONTROL_PREFIX==.101-==IPV4_NET_CONTROL_PREFIX==.200
-  kubernetes_compute_count: '2'
-  kubernetes_compute_rack01_hostname: cmp
-  kubernetes_compute_tenant_address_ranges: ==IPV4_NET_TENANT_PREFIX==.101-==IPV4_NET_TENANT_PREFIX==.200
-  kubernetes_control_address: ==IPV4_NET_CONTROL_PREFIX==.10
-  kubernetes_control_node01_address: ==IPV4_NET_CONTROL_PREFIX==.11
-  kubernetes_control_node01_hostname: ctl01
-  kubernetes_control_node01_tenant_address: ==IPV4_NET_TENANT_PREFIX==.11
-  kubernetes_control_node02_address: ==IPV4_NET_CONTROL_PREFIX==.12
-  kubernetes_control_node02_hostname: ctl02
-  kubernetes_control_node02_tenant_address: ==IPV4_NET_TENANT_PREFIX==.12
-  kubernetes_control_node03_address: ==IPV4_NET_CONTROL_PREFIX==.13
-  kubernetes_control_node03_hostname: ctl03
-  kubernetes_control_node03_tenant_address: ==IPV4_NET_TENANT_PREFIX==.13
-  kubernetes_coredns_enabled: 'True'
-  kubernetes_ctl_deploy_nic: ens3
-  kubernetes_ctl_network_scheme: physical
-  kubernetes_ctl_on_kvm: 'False'
-  kubernetes_ctl_primary_first_nic: ens4
-  kubernetes_ctl_primary_second_nic: ens5
-  kubernetes_enabled: 'True'
-  kubernetes_externaldns_enabled: 'False'
-  kubernetes_externaldns_provider: coredns
-  kubernetes_helm_enabled: 'False'
-  kubernetes_ingressnginx_enabled: 'False'
-  kubernetes_keepalived_vip_interface: ens4
-  kubernetes_kubedns_enabled: 'False'
-  kubernetes_metallb_enabled: 'False'
-  kubernetes_metrics_server_enabled: 'False'
-  kubernetes_network_calico_enabled: 'False'
-  kubernetes_network_flannel_enabled: 'False'
-  kubernetes_network_genie_enabled: 'False'
-  kubernetes_network_opencontrail_enabled: 'True'
-  kubernetes_network_sriov_enabled: 'False'
-  kubernetes_rbd_enabled: 'False'
-  kubernetes_virtlet_enabled: 'True'
-  kubernetes_proxy_hostname: prx
-  kubernetes_proxy_node01_hostname: prx01
-  kubernetes_proxy_node02_hostname: prx02
-  kubernetes_proxy_address: ==IPV4_NET_CONTROL_PREFIX==.220
-  kubernetes_proxy_node01_address: ==IPV4_NET_CONTROL_PREFIX==.221
-  kubernetes_proxy_node02_address: ==IPV4_NET_CONTROL_PREFIX==.222
-  local_repositories: 'False'
-  maas_enabled: 'False'
-  mcp_common_scripts_branch: ''
-  mcp_docker_registry: default
-  mcp_version: 2019.2.0
-  motd_company_name: MirantisTestDeployment
-  no_platform: 'False'
-  octavia_private_key: '-----BEGIN RSA PRIVATE KEY-----
-
-    MIIEpAIBAAKCAQEAr7sXg16gk5mcYzszCAJMh7bnBiniELeuKn7C8chbSf0Gkipt
-
-    LAb+LEpDQOOSsqBx0uidtfsF4BwVXIPLtzShL4qK3IFkoqNf0ADShdmi2X84vot1
-
-    a1OmvDzvAnZVlAaZH8lYHMHY9E2dYcB0c0aH7OLrDlx+6WCWNfqswdK7XUrJ4VN/
-
-    ZAYI2BkYk/jnmjgQvhtzJd0Hy8YqRbamBpkmrcrz4cIRfujQo51LSlXCqWr7te2q
-
-    wYMKSAMAMMfKnIMxJI8iviCaiFB6E0xbyFtYUSc4OrPv9u5Lftw+vu6kdnpg/lHK
-
-    1P+ocgSuiWTzZvcPH3jBCLLghJ+uoYBCy5rUjwIDAQABAoIBAFwMC8zsDABEPf5c
-
-    S+auDZgo3eoElj1beQcZTtOGtwqSVpbJUlX1c72PSJr8mSKnl/d5kOJ5kiJJk4ba
-
-    IiLclnFoiEPoIuZt3Qn+5EboMLzsPrTQJ7kIIBYJdMg9Y6YdrqdPt6+YeiO9Y+qH
-
-    /HdFQn16ftUO7gsgZI3xt/vufeXnH33kGo7R19A90m4SXQ0+/I4PMgZBMCeOs8jY
-
-    8Uo5yi9EErxtE8+ElU+cDQ62gWPVvbGQP9roksJm7o21kZ8/LGbhCulJ7oBWN9Jo
-
-    ONquRoqPmLrML5otgVN/sg+J/BBtrlYOdnUluHjlLuyAiFHjvRjCD20KqWqee6fW
-
-    fPmZLQECgYEA6itDCIFgWayeInE2WycJ3dSB05Z0Wy8PpUMCT2QKSaTLUOiD98Px
-
-    Sz4LBE4lqO/0lI1W4CNw2n+AfAjSxnuMN6zRWZt32Vlprtkv+7LrAMptN6/ige3p
-
-    kqSnrSiRlqEoHqs1r0zYRoB6zTehhs8XhsvyCwVzlTOEZ4SCDBtRWp8CgYEAwB0h
-
-    KnB8Ox23b8DDTQjWL/OYT2WA97fd3r4ANa3e1ZHe/OCLejm9rL2tvuFvCm8iCF1I
-
-    r6/3POLd6GjWDsWepp1n3L79xXY4Kye8PTiGd3AhIRk/uQosbemHwKoj7srO5cO2
-
-    LM5m4Nmh7KRlbJM/xXGpIh9zY3/SJdXsGdAKMBECgYEA4NNMdrwQj8hlw1fDAl1G
-
-    4c6IH2fSq0FR2i+t5h98qRwpgLLdEWL1JnKZDTcifUJ1JrNU97nPPlkwOOYXyC0S
-
-    gNnR3iCgPvPTveYUZapwar/vgInEBU8w9HRV8LCEp4RvCpMC5h33gCkWvjVtRgtK
-
-    4UaqSt6fDF77/o+AdLM9tq0CgYB1SlORYZO3U/FGnV2fjqGWLRb0gng2xV8EOuRN
-
-    4ZWGtsR5h24gdVhEOpn1TBVLPYZ9rNZPzRMZbTkmR7tI0YaHGtrqfwDYqdCpKF1Y
-
-    00XlbeQMHSo2guuVP1rOWhIOHGwtA0waFvnglX6yx7vUiiIJHdexKZp9SPC4gN7g
-
-    848EwQKBgQCaecIjkTyDKeGmtA7FFHqgH2Aq8V6wZ0vuoHJKAe2ilEPLZ7/wQnqC
-
-    OJDpEB4CF82ZctNlKXYEfswUMj7WVzVfcogrvlrVQ2Q7QwMazBqtz37BJuhtB4J7
-
-    Iayq1c0TNY8F/LnKJ7Qc0IglUZ2gV0fE/ip2DWqW5EFEFkS4ZEwUnQ==
-
-    -----END RSA PRIVATE KEY-----'
-  octavia_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvuxeDXqCTmZxjOzMIAkyHtucGKeIQt64qfsLxyFtJ/QaSKm0sBv4sSkNA45KyoHHS6J21+wXgHBVcg8u3NKEviorcgWSio1/QANKF2aLZfzi+i3VrU6a8PO8CdlWUBpkfyVgcwdj0TZ1hwHRzRofs4usOXH7pYJY1+qzB0rtdSsnhU39kBgjYGRiT+OeaOBC+G3Ml3QfLxipFtqYGmSatyvPhwhF+6NCjnUtKVcKpavu17arBgwpIAwAwx8qcgzEkjyK+IJqIUHoTTFvIW1hRJzg6s+/27kt+3D6+7qR2emD+UcrU/6hyBK6JZPNm9w8feMEIsuCEn66hgELLmtSP
-  offline_deployment: 'False'
-  opencontrail_analytics_address: ==IPV4_NET_CONTROL_PREFIX==.30
-  opencontrail_analytics_hostname: nal
-  opencontrail_analytics_node01_address: ==IPV4_NET_CONTROL_PREFIX==.31
-  opencontrail_analytics_node01_hostname: nal01
-  opencontrail_analytics_node02_address: ==IPV4_NET_CONTROL_PREFIX==.32
-  opencontrail_analytics_node02_hostname: nal02
-  opencontrail_analytics_node03_address: ==IPV4_NET_CONTROL_PREFIX==.33
-  opencontrail_analytics_node03_hostname: nal03
-  opencontrail_compute_iface_mask: '24'
-  opencontrail_control_address: ==IPV4_NET_CONTROL_PREFIX==.20
-  opencontrail_control_hostname: ntw
-  opencontrail_control_node01_address: ==IPV4_NET_CONTROL_PREFIX==.21
-  opencontrail_control_node01_hostname: ntw01
-  opencontrail_control_node02_address: ==IPV4_NET_CONTROL_PREFIX==.22
-  opencontrail_control_node02_hostname: ntw02
-  opencontrail_control_node03_address: ==IPV4_NET_CONTROL_PREFIX==.23
-  opencontrail_control_node03_hostname: ntw03
-  opencontrail_enabled: 'True'
-  opencontrail_private_ip_range: 10.150.0.0/16
-  opencontrail_public_ip_range: 10.151.0.0/16
-  opencontrail_router01_address: ==IPV4_NET_CONTROL_PREFIX==.100
-  opencontrail_router01_hostname: rtr01
-  opencontrail_router02_address: ==IPV4_NET_CONTROL_PREFIX==.101
-  opencontrail_router02_hostname: rtr02
-  opencontrail_version: '4.0'
-  openldap_domain: heat-cicd-k8s-contrail41-sl.local
-  openldap_enabled: 'True'
-  openldap_organisation: ${_param:cluster_name}
-  openscap_enabled: 'False'
-  openssh_groups: ''
-  openstack_enabled: 'False'
-  osd_padding_with_zeros: 'True'
-  platform: kubernetes_enabled
-  publication_method: email
-  reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
-  salt_api_password: D6p4ybYA34qzDDYnTu2HMxqb8Vyx1CT0z3MlEGkZwh0A
-  salt_api_password_hash: $6$IiHKYaKTcYQF$KezBFPSJ7BWRmM0zldR9J/FhLYqlxjClibJrAFvDI1RPK/8eX2d27S9dFpMGW6Ic/5f/xec84mimfV7AodT6v/
-  salt_master_address: ==IPV4_NET_CONTROL_PREFIX==.15
-  salt_master_hostname: cfg01
-  salt_master_management_address: ==IPV4_NET_ADMIN_PREFIX==.15
-  secrets_encryption_enabled: 'False'
-  sf_notifications_enabled: 'False'
-  shared_reclass_branch: ''
-  shared_reclass_url: https://github.com/Mirantis/reclass-system-salt-model.git
-  sriov_network_subnet: 10.55.0.0/16
-  stacklight_enabled: 'True'
-  stacklight_log_address: ==IPV4_NET_CONTROL_PREFIX==.60
-  stacklight_log_hostname: log
-  stacklight_log_node01_address: ==IPV4_NET_CONTROL_PREFIX==.61
-  stacklight_log_node01_hostname: log01
-  stacklight_log_node02_address: ==IPV4_NET_CONTROL_PREFIX==.62
-  stacklight_log_node02_hostname: log02
-  stacklight_log_node03_address: ==IPV4_NET_CONTROL_PREFIX==.63
-  stacklight_log_node03_hostname: log03
-  stacklight_long_term_storage_type: prometheus
-  stacklight_monitor_address: ==IPV4_NET_CONTROL_PREFIX==.70
-  stacklight_monitor_hostname: mon
-  stacklight_monitor_node01_address: ==IPV4_NET_CONTROL_PREFIX==.71
-  stacklight_monitor_node01_hostname: mon01
-  stacklight_monitor_node02_address: ==IPV4_NET_CONTROL_PREFIX==.72
-  stacklight_monitor_node02_hostname: mon02
-  stacklight_monitor_node03_address: ==IPV4_NET_CONTROL_PREFIX==.73
-  stacklight_monitor_node03_hostname: mon03
-  stacklight_telemetry_address: ==IPV4_NET_CONTROL_PREFIX==.85
-  stacklight_telemetry_hostname: mtr
-  stacklight_telemetry_node01_address: ==IPV4_NET_CONTROL_PREFIX==.86
-  stacklight_telemetry_node01_hostname: mtr01
-  stacklight_telemetry_node02_address: ==IPV4_NET_CONTROL_PREFIX==.87
-  stacklight_telemetry_node02_hostname: mtr02
-  stacklight_telemetry_node03_address: ==IPV4_NET_CONTROL_PREFIX==.88
-  stacklight_telemetry_node03_hostname: mtr03
-  static_ips_on_deploy_network_enabled: 'False'
-  tenant_network_gateway: ==IPV4_NET_TENANT_PREFIX==.1
-  tenant_network_netmask: 255.255.255.0
-  tenant_network_subnet: ==IPV4_NET_TENANT_PREFIX==.0/24
-  tenant_vlan: '20'
-  upstream_proxy_enabled: 'False'
-  use_default_network_scheme: 'True'
-  vnf_onboarding_enabled: 'False'
diff --git a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/salt-context-environment.yaml b/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/salt-context-environment.yaml
deleted file mode 100644
index 609c1ec..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/salt-context-environment.yaml
+++ /dev/null
@@ -1,324 +0,0 @@
-nodes:
-    cfg01:
-      reclass_storage_name: infra_config_node01
-      roles:
-      - infra_config
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_static_mgm
-        ens4:
-          role: single_static_ctl
-
-    cid01:
-      reclass_storage_name: cicd_control_node01
-      roles:
-      - cicd_control_leader
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    cid02:
-      reclass_storage_name: cicd_control_node02
-      roles:
-      - cicd_control_manager
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    cid03:
-      reclass_storage_name: cicd_control_node03
-      roles:
-      - cicd_control_manager
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    ctl01:
-      reclass_storage_name: kubernetes_control_node01
-      roles:
-      - kubernetes_control_contrail
-      - linux_system_codename_xenial
-      classes:
-      - system.linux.system.repo.mcp.apt_mirantis.docker
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    ctl02:
-      reclass_storage_name: kubernetes_control_node02
-      roles:
-      - kubernetes_control_contrail
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    ctl03:
-      reclass_storage_name: kubernetes_control_node03
-      roles:
-      - kubernetes_control_contrail
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    prx01:
-      reclass_storage_name: kubernetes_proxy_node01
-      roles:
-      - kubernetes_proxy
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    prx02:
-      reclass_storage_name: kubernetes_proxy_node02
-      roles:
-      - kubernetes_proxy
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    mon01:
-      reclass_storage_name: stacklight_server_node01
-      roles:
-      - stacklightv2_server_leader
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    mon02:
-      reclass_storage_name: stacklight_server_node02
-      roles:
-      - stacklightv2_server
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    mon03:
-      reclass_storage_name: stacklight_server_node03
-      roles:
-      - stacklightv2_server
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    mtr01:
-      reclass_storage_name: stacklight_telemetry_node01
-      roles:
-      - stacklight_telemetry
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    mtr02:
-      reclass_storage_name: stacklight_telemetry_node02
-      roles:
-      - stacklight_telemetry
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    mtr03:
-      reclass_storage_name: stacklight_telemetry_node03
-      roles:
-      - stacklight_telemetry
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    log01:
-      reclass_storage_name: stacklight_log_node01
-      roles:
-      - stacklight_log_leader_v2
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    log02:
-      reclass_storage_name: stacklight_log_node02
-      roles:
-      - stacklight_log
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    log03:
-      reclass_storage_name: stacklight_log_node03
-      roles:
-      - stacklight_log
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    kvm01:
-      reclass_storage_name: infra_kvm_node01
-      roles:
-      - infra_kvm
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    kvm02:
-      reclass_storage_name: infra_kvm_node02
-      roles:
-      - infra_kvm
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    kvm03:
-      reclass_storage_name: infra_kvm_node03
-      roles:
-      - infra_kvm
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    cmn01:
-      reclass_storage_name: ceph_mon_node01
-      roles:
-      - ceph_mon
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    cmn02:
-      reclass_storage_name: ceph_mon_node02
-      roles:
-      - ceph_mon
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    cmn03:
-      reclass_storage_name: ceph_mon_node03
-      roles:
-      - ceph_mon
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    rgw01:
-      reclass_storage_name: ceph_rgw_node01
-      roles:
-      - ceph_rgw
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    rgw02:
-      reclass_storage_name: ceph_rgw_node02
-      roles:
-      - ceph_rgw
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    rgw03:
-      reclass_storage_name: ceph_rgw_node03
-      roles:
-      - ceph_rgw
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    osd<<count>>:
-      reclass_storage_name: ceph_osd_rack01
-      roles:
-      - ceph_osd
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    cmp<<count>>:
-      reclass_storage_name: kubernetes_compute_rack01
-      roles:
-      - salt_master_host
-      - kubernetes_compute
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens5:
-          role: bond0_ab_contrail_single
-        ens4:
-          role: single_ctl
diff --git a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/salt.yaml b/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/salt.yaml
deleted file mode 100644
index 51204e8..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/salt.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-{% set HOSTNAME_CFG01='cfg01.heat-cicd-k8s-contrail41-sl.local' %}
-{% set LAB_CONFIG_NAME='heat-cicd-k8s-contrail41-sl' %}
-{% set DOMAIN_NAME='heat-cicd-k8s-contrail41-sl.local' %}
-
-# Other salt model repository parameters see in shared-salt.yaml
-
-{% import 'shared-salt.yaml' as SHARED with context %}
-
-{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
-
-{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
-
-{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
-
diff --git a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay--user-data-foundation.yaml b/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay--user-data-foundation.yaml
deleted file mode 100644
index 1677dcd..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay--user-data-foundation.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-#cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
-ssh_pwauth: True
-users:
-  - name: root
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    shell: /bin/bash
-  - name: jenkins
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFSxeuXh2sO4VYL8N2dlNFVyNcr2RvoH4MeDD/cV2HThfU4/BcH6IOOWXSDibIU279bWVKCL7QUp3mf0Vf7HPuyFuC12QM+l7MwT0jCYh5um3hmAvM6Ga0nkhJygHexe9/rLEYzZJkIjP9/IS/YXSv8rhHg484wQ6qkEuq15nyMqil8tbDQCq0XQ+AWEpNpIa4pUoKmFMsOP8lq10KZXIXsJyZxizadr6Bh4Lm9LWrk8YCw7qP3rmgWxK/s8qXQh1ISZe6ONfcmk6p03qbh4H3CwKyWzxmnIHQvE6PgN/O+PuAZj3PbR2mkkJjYX4jNPlxvj8uTStaVPhAwfR9Spdx jenkins@cz8133
-
-disable_root: false
-chpasswd:
-  list: |
-    root:r00tme
-    jenkins:qalab
-  expire: False
-
-packages:
-  - openjdk-8-jre-headless
-  - libyaml-dev
-  - libffi-dev
-  - libvirt-dev
-  - python-dev
-  - python-pip
-  - python-virtualenv
-  #- python-psycopg2
-  - pkg-config
-  - vlan
-  - bridge-utils
-  - ebtables
-
-bootcmd:
-  # Enable root access
-  - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
-  - service sshd restart
-output:
-  all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
-
-runcmd:
-  # Create swap
-  - fallocate -l 16G /swapfile
-  - chmod 600 /swapfile
-  - mkswap /swapfile
-  - swapon /swapfile
-  - echo "/swapfile   none    swap    defaults   0   0" >> /etc/fstab
-
-write_files:
-  - path: /etc/default/grub.d/97-enable-grub-menu.cfg
-    content: |
-      GRUB_RECORDFAIL_TIMEOUT=30
-      GRUB_TIMEOUT=3
-      GRUB_TIMEOUT_STYLE=menu
-
-  - path: /etc/network/interfaces
-    content: |
-      auto ens3
-      iface ens3 inet dhcp
-
-  - path: /etc/bash_completion.d/fuel_devops30_activate
-    content: |
-      source /home/jenkins/fuel-devops30/bin/activate
diff --git a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay-userdata.yaml b/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay-userdata.yaml
deleted file mode 100644
index 763ee01..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay-userdata.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-#cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
-ssh_pwauth: True
-users:
-   - name: root
-     sudo: ALL=(ALL) NOPASSWD:ALL
-     shell: /bin/bash
-
-disable_root: false
-chpasswd:
-   list: |
-    root:r00tme
-   expire: False
-
-bootcmd:
-   # Enable root access
-   - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
-   - service sshd restart
-output:
-    all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
-
-runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
-   - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
-
-   - export TERM=linux
-   - export LANG=C
-   # Configure dhclient
-   - sudo resolvconf -u
-   #- sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
-   # Enable grub menu using updated config below
-   - update-grub
-
-   # Prepare network connection
-   - sudo ifup ens3
-   #- sudo route add default gw {gateway} {interface_name}
-
-   # Create swap
-   - fallocate -l 2G /swapfile
-   - chmod 600 /swapfile
-   - mkswap /swapfile
-   - swapon /swapfile
-   - echo "/swapfile   none    swap    defaults   0   0" >> /etc/fstab
-
-write_files:
-   - path: /etc/default/grub.d/97-enable-grub-menu.cfg
-     content: |
-         GRUB_RECORDFAIL_TIMEOUT=30
-         GRUB_TIMEOUT=3
-         GRUB_TIMEOUT_STYLE=menu
-
-   - path: /etc/network/interfaces
-     content: |
-          auto ens3
-          iface ens3 inet dhcp
-
-   - path: /usr/share/growlvm/image-layout.yml
-     content: |
-       root:
-         size: '65%VG'
-       home:
-         size: '1%VG'
-       var_log:
-         size: '10%VG'
-       var_log_audit:
-         size: '5%VG'
-       var_tmp:
-         size: '10%VG'
-       tmp:
-         size: '5%VG'
-     owner: root:root
-
-growpart:
-    mode: auto
-    devices:
-      - '/'
-      - '/dev/vda3'
-    ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay.hot b/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay.hot
deleted file mode 100644
index 3d9275d..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay.hot
+++ /dev/null
@@ -1,749 +0,0 @@
----
-
-heat_template_version: queens
-
-description: MCP environment for heat-cicd-k8s-contrail41-sl
-
-parameters:
-  instance_domain:
-    type: string
-    default: heat-cicd-k8s-contrail41-sl.local
-  mcp_version:
-    type: string
-  env_name:
-    type: string
-  control_subnet_cidr:
-    type: string
-    default: "10.6.0.0/24"
-  tenant_subnet_cidr:
-    type: string
-    default: "10.8.0.0/24"
-  external_subnet_cidr:
-    type: string
-    default: "192.168.200.0/24"
-  management_subnet_cidr:
-    type: string
-    default: "10.7.0.0/24"
-  management_subnet_cfg01_ip:
-    type: string
-    default: 10.7.0.15
-  management_subnet_gateway_ip:
-    type: string
-    default: 10.7.0.1
-  management_subnet_pool_start:
-    type: string
-    default: 10.7.0.20
-  management_subnet_pool_end:
-    type: string
-    default: 10.7.0.90
-  salt_master_control_ip:
-    type: string
-    default: 10.6.0.15
-
-  key_pair:
-    type: string
-
-  ctl_flavor:
-    type: string
-  cfg_flavor:
-    type: string
-  cid_flavor:
-    type: string
-  kvm_fake_flavor:
-    type: string
-  mon_flavor:
-    type: string
-  log_flavor:
-    type: string
-  mtr_flavor:
-    type: string
-  cmp_flavor:
-    type: string
-  cmn_flavor:
-    type: string
-  rgw_flavor:
-    type: string
-  osd_flavor:
-    type: string
-  foundation_flavor:
-    type: string
-
-  net_public:
-    type: string
-
-  foundation_image:
-    type: string
-
-  bm_availability_zone:
-    type: string
-  vm_availability_zone:
-    type: string
-
-resources:
-  networks:
-    type: MCP::Networks
-    properties:
-      stack_name: { get_param: "OS::stack_name" }
-      env_name: { get_param: env_name }
-  subnets:
-    depends_on: [networks]
-    type: MCP::Subnets
-    properties:
-      stack_name: { get_param: "OS::stack_name" }
-      env_name: { get_param: env_name }
-      management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
-      control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
-      tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
-      external_net: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
-      control_subnet_cidr: { get_param: control_subnet_cidr }
-      tenant_subnet_cidr: { get_param: tenant_subnet_cidr }
-      external_subnet_cidr: { get_param: external_subnet_cidr }
-      management_subnet_cidr: { get_param: management_subnet_cidr }
-      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
-      management_subnet_pool_start: { get_param: management_subnet_pool_start }
-      management_subnet_pool_end: { get_param: management_subnet_pool_end }
-
-  #flavors:
-  #  type: MCP::Flavors
-
-  cfg01_node:
-    type: MCP::MasterNode
-    depends_on: [subnets]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      cfg01_flavor: { get_param: cfg_flavor }
-      availability_zone: { get_param: bm_availability_zone }
-      management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
-      control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
-      tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
-      external_net: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
-      salt_master_control_ip: { get_param: salt_master_control_ip }
-      management_subnet_cfg01_ip: { get_param: management_subnet_cfg01_ip }
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '15' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '15' ]
-      instance_name: cfg01
-      instance_domain: {get_param: instance_domain}
-
-  control_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [cfg01_node]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: ctl01
-      instance02_name: ctl02
-      instance03_name: ctl03
-      instance01_role: k8s_controller
-      instance_flavor: {get_param: ctl_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '11' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '12' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '13' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '11' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '12' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '13' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '11' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '12' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '13' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  fake_kvm_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [cfg01_node]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: kvm01
-      instance02_name: kvm02
-      instance03_name: kvm03
-      instance_flavor: {get_param: kvm_fake_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '241' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '242' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '243' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '241' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '242' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '243' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '241' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '242' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '243' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  cicd_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [cfg01_node]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: cid01
-      instance02_name: cid02
-      instance03_name: cid03
-      instance_flavor: {get_param: cid_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '91' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '92' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '93' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '91' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '92' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '93' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '91' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '92' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '93' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  stacklight_monitor_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [openstack_message_queue_cluster]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: mon01
-      instance02_name: mon02
-      instance03_name: mon03
-      instance_flavor: {get_param: mon_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '71' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '72' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '73' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '71' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '72' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '73' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '71' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '72' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '73' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  stacklight_log_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [stacklight_monitor_cluster]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: log01
-      instance02_name: log02
-      instance03_name: log03
-      instance_flavor: {get_param: log_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '61' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '62' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '63' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '61' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '62' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '63' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '61' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '62' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '63' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  stacklight_mtr_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [stacklight_log_cluster]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: mtr01
-      instance02_name: mtr02
-      instance03_name: mtr03
-      instance_flavor: {get_param: mtr_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '86' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '87' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '88' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '86' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '87' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '88' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '86' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '87' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '88' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  ceph_cmn_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [cfg01_node]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: cmn01
-      instance02_name: cmn02
-      instance03_name: cmn03
-      instance_flavor: {get_param: cmn_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '66' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '67' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '68' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '66' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '67' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '68' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '66' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '67' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '68' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  ceph_rgw_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [cfg01_node]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: rgw01
-      instance02_name: rgw02
-      instance03_name: rgw03
-      instance_flavor: {get_param: rgw_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '76' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '77' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '78' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '76' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '77' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '78' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '76' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '77' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '78' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  ceph_osd_cluster:
-    type: MCP::MultipleInstance2Volumes
-    depends_on: [cfg01_node]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: osd001
-      instance02_name: osd002
-      instance03_name: osd003
-      instance_flavor: {get_param: osd_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '201' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '202' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '203' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '201' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '202' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '203' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '201' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '202' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '203' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  prx01_virtual:
-    type: MCP::SingleInstance
-    depends_on: [control_cluster]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: prx01
-      instance_flavor: {get_param: cid_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '221' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '221' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '221' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  prx02_virtual:
-    type: MCP::SingleInstance
-    depends_on: [control_cluster]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: prx02
-      instance_flavor: {get_param: cid_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '222' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '222' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '222' ]
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  cmp001_virtual:
-    type: MCP::Compute
-    depends_on: [cfg01_node]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: cmp001
-      instance_flavor: {get_param: cmp_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '101' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '101' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '101' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  cmp002_virtual:
-    type: MCP::Compute
-    depends_on: [cfg01_node]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: cmp002
-      instance_flavor: {get_param: cmp_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '102' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '102' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '102' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  foundation_node:
-    type: MCP::FoundationNode
-    depends_on: [subnets]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: foundation
-      instance_image: { get_param: foundation_image }
-      instance_flavor: {get_param: foundation_flavor}
-      availability_zone: { get_param: bm_availability_zone }
-      management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
-      control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
-      tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
-      external_net: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
-      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
-      underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
-      management_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, management_net_prefix] }, '5' ]
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '5' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '5' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '5' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-outputs:
-  foundation_public_ip:
-    description: foundation node IP address (floating) from external network
-    value:
-      get_attr:
-      - foundation_node
-      - instance_floating_address
-...
diff --git a/tcp_tests/templates/heat-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml b/tcp_tests/templates/heat-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
deleted file mode 100644
index f208038..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
-default_context:
-  jenkins_cfg_admin_password: r00tme
-  auditd_enabled: 'False'
-  bmk_enabled: 'False'
-  calico_cni_image: docker-prod-local.artifactory.mirantis.com/mirantis/projectcalico/calico/cni:latest
-  calico_enable_nat: 'True'
-  calico_image: docker-prod-local.artifactory.mirantis.com/mirantis/projectcalico/calico/node:latest
-  calico_netmask: '16'
-  calico_network: 192.168.0.0
-  calicoctl_image: docker-prod-local.artifactory.mirantis.com/mirantis/projectcalico/calico/ctl:latest
-  ceph_enabled: 'False'
-  cicd_control_node01_address: ==IPV4_NET_CONTROL_PREFIX==.91
-  cicd_control_node01_hostname: cid01
-  cicd_control_node02_address: ==IPV4_NET_CONTROL_PREFIX==.92
-  cicd_control_node02_hostname: cid02
-  cicd_control_node03_address: ==IPV4_NET_CONTROL_PREFIX==.93
-  cicd_control_node03_hostname: cid03
-  cicd_control_vip_address: ==IPV4_NET_CONTROL_PREFIX==.90
-  cicd_control_vip_hostname: cid
-  cicd_enabled: 'True'
-  cluster_domain: heat-cicd-k8s-genie.local
-  cluster_name: heat-cicd-k8s-genie
-  context_seed: T3sbEdCaBfxrg9ysyA6LIaift250Ktb389rpcISKbdqPi5j0WHKiKAhBftYueBKl
-  control_network_netmask: 255.255.255.0
-  control_network_subnet: ==IPV4_NET_CONTROL_PREFIX==.0/24
-  control_vlan: '10'
-  cookiecutter_template_branch: ''
-  jenkins_pipelines_branch: 'release/2019.2.0'
-  cookiecutter_template_credentials: gerrit
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
-  deploy_network_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
-  deploy_network_netmask: 255.255.255.0
-  deploy_network_subnet: ==IPV4_NET_ADMIN_PREFIX==.0/24
-  deployment_type: physical
-  dns_server01: 172.18.176.6
-  dns_server02: 172.18.224.6
-  email_address: ddmitriev@mirantis.com
-  etcd_ssl: 'True'
-  stacklight_ssl_enabled: 'True'
-  infra_bond_mode: active-backup
-  infra_deploy_nic: eth0
-  infra_kvm01_control_address: ==IPV4_NET_CONTROL_PREFIX==.241
-  infra_kvm01_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.91
-  infra_kvm01_hostname: kvm01
-  infra_kvm02_control_address: ==IPV4_NET_CONTROL_PREFIX==.242
-  infra_kvm02_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.92
-  infra_kvm02_hostname: kvm02
-  infra_kvm03_control_address: ==IPV4_NET_CONTROL_PREFIX==.243
-  infra_kvm03_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.93
-  infra_kvm03_hostname: kvm03
-  infra_kvm_vip_address: ==IPV4_NET_CONTROL_PREFIX==.240
-  infra_primary_first_nic: eth1
-  infra_primary_second_nic: eth2
-  internal_proxy_enabled: 'False'
-  kqueen_custom_mail_enabled: 'False'
-  kqueen_enabled: 'False'
-  kubernetes_control_address: ==IPV4_NET_CONTROL_PREFIX==.10
-  kubernetes_control_node01_address: ==IPV4_NET_CONTROL_PREFIX==.11
-  kubernetes_control_node01_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.11
-  kubernetes_control_node01_hostname: ctl01
-  kubernetes_control_node02_address: ==IPV4_NET_CONTROL_PREFIX==.12
-  kubernetes_control_node02_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.12
-  kubernetes_control_node02_hostname: ctl02
-  kubernetes_control_node03_address: ==IPV4_NET_CONTROL_PREFIX==.13
-  kubernetes_control_node03_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.13
-  kubernetes_control_node03_hostname: ctl03
-  kubernetes_compute_count: 4
-  kubernetes_compute_rack01_hostname: cmp
-  kubernetes_compute_deploy_address_ranges: ==IPV4_NET_ADMIN_PREFIX==.101-==IPV4_NET_ADMIN_PREFIX==.104
-  kubernetes_compute_single_address_ranges: ==IPV4_NET_CONTROL_PREFIX==.101-==IPV4_NET_CONTROL_PREFIX==.104
-  kubernetes_compute_tenant_address_ranges: ==IPV4_NET_TENANT_PREFIX==.101-==IPV4_NET_TENANT_PREFIX==.104
-  kubernetes_enabled: 'True'
-  kubernetes_externaldns_enabled: 'False'
-  kubernetes_keepalived_vip_interface: br_ctl
-  kubernetes_network_calico_enabled: 'True'
-  kubernetes_proxy_hostname: prx
-  kubernetes_proxy_node01_hostname: prx01
-  kubernetes_proxy_node02_hostname: prx02
-  kubernetes_proxy_address: ==IPV4_NET_CONTROL_PREFIX==.220
-  kubernetes_proxy_node01_address: ==IPV4_NET_CONTROL_PREFIX==.221
-  kubernetes_proxy_node02_address: ==IPV4_NET_CONTROL_PREFIX==.222
-  kubernetes_metallb_enabled: 'True'
-  metallb_addresses: 172.17.16.150-172.17.16.190
-  kubernetes_ingressnginx_enabled: 'True'
-  kubernetes_ingressnginx_controller_replicas: 2
-  local_repositories: 'False'
-  maas_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.15
-  maas_enabled: 'False'
-  maas_deploy_range_end: ==IPV4_NET_ADMIN_PREFIX==.199
-  maas_deploy_range_start: ==IPV4_NET_ADMIN_PREFIX==.180
-  maas_deploy_vlan: '0'
-  maas_fabric_name: deploy-fabric0
-  maas_hostname: cfg01
-  mcp_common_scripts_branch: ''
-  mcp_version: proposed
-  offline_deployment: 'False'
-  opencontrail_enabled: 'False'
-  openldap_domain: ${_param:cluster_name}.local
-  openldap_enabled: 'True'
-  openldap_organisation: ${_param:cluster_name}
-  openssh_groups: cicd
-  openstack_enabled: 'False'
-  oss_enabled: 'False'
-  oss_node03_address: ${_param:stacklight_monitor_node03_address}
-  platform: kubernetes_enabled
-  public_host: ${_param:infra_config_address}
-  publication_method: email
-  reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
-  salt_api_password: LTlVnap35hqpRVbB5QjA27EuKh9Ttl3k
-  salt_api_password_hash: $6$RKagUPuQ$Javpjz7b.hqKOOr1rai7uGQd/FnqlOH59tXn12/0G.LkVyunYmgBkSC5zTjoqZvIS1fOOOqsmCb9Q4HcGUbXS.
-  salt_master_address: ==IPV4_NET_CONTROL_PREFIX==.15
-  salt_master_hostname: cfg01
-  salt_master_management_address: ==IPV4_NET_ADMIN_PREFIX==.15
-  shared_reclass_branch: 'proposed'
-  shared_reclass_url: https://gerrit.mcp.mirantis.com/salt-models/reclass-system.git
-  stacklight_enabled: 'False'
-  stacklight_version: '2'
-  static_ips_on_deploy_network_enabled: 'False'
-  tenant_network_gateway: ==IPV4_NET_TENANT_PREFIX==.1
-  tenant_network_netmask: 255.255.255.0
-  tenant_network_subnet: ==IPV4_NET_TENANT_PREFIX==.0/24
-  tenant_vlan: '20'
-  upstream_proxy_enabled: 'False'
-  use_default_network_scheme: 'False'
-  vnf_onboarding_enabled: 'False'
-  kubernetes_network_flannel_enabled: 'True'
-  flannel_network: 10.20.0.0/16
-  kubernetes_network_genie_enabled: 'True'
-  kubernetes_genie_default_plugin: 'calico'
-  kubernetes_virtlet_enabled: 'True'
-  kubernetes_helm_enabled: 'True'
diff --git a/tcp_tests/templates/heat-cicd-k8s-genie/environment-context-k8s-genie.yaml b/tcp_tests/templates/heat-cicd-k8s-genie/environment-context-k8s-genie.yaml
deleted file mode 100644
index d13627b..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-genie/environment-context-k8s-genie.yaml
+++ /dev/null
@@ -1,145 +0,0 @@
-nodes:
-    cfg01:
-      reclass_storage_name: infra_config_node01
-      roles:
-      - infra_config
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_static_ctl
-
-    kvm01:
-      reclass_storage_name: infra_kvm_node01
-      roles:
-      - infra_kvm
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    kvm02:
-      reclass_storage_name: infra_kvm_node02
-      roles:
-      - infra_kvm
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    kvm03:
-      reclass_storage_name: infra_kvm_node03
-      roles:
-      - infra_kvm
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    cid01:
-      reclass_storage_name: cicd_control_node01
-      roles:
-      - cicd_control_leader
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    cid02:
-      reclass_storage_name: cicd_control_node02
-      roles:
-      - cicd_control_manager
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    cid03:
-      reclass_storage_name: cicd_control_node03
-      roles:
-      - cicd_control_manager
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    ctl01:
-      reclass_storage_name: kubernetes_control_node01
-      roles:
-      - kubernetes_control
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl_calico
-
-    ctl02:
-      reclass_storage_name: kubernetes_control_node02
-      roles:
-      - kubernetes_control
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl_calico
-
-    ctl03:
-      reclass_storage_name: kubernetes_control_node03
-      roles:
-      - kubernetes_control
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl_calico
-
-    prx01:
-      reclass_storage_name: kubernetes_proxy_node01
-      roles:
-      - kubernetes_proxy
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    prx02:
-      reclass_storage_name: kubernetes_proxy_node02
-      roles:
-      - kubernetes_proxy
-      - linux_system_codename_xenial
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl
-
-    # Generator-based computes. For compatibility only
-    cmp<<count>>:
-      reclass_storage_name: kubernetes_compute_rack01
-      roles:
-      - kubernetes_compute
-      - linux_system_codename_xenial
-      - salt_master_host
-      interfaces:
-        ens3:
-          role: single_dhcp
-        ens4:
-          role: single_ctl_calico
diff --git a/tcp_tests/templates/heat-cicd-k8s-genie/salt.yaml b/tcp_tests/templates/heat-cicd-k8s-genie/salt.yaml
deleted file mode 100644
index fbac1ee..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-genie/salt.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-{% set HOSTNAME_CFG01='cfg01.heat-cicd-k8s-genie.local' %}
-{% set LAB_CONFIG_NAME='heat-cicd-k8s-genie' %}
-{% set DOMAIN_NAME='heat-cicd-k8s-genie.local' %}
-{% set SALT_MODELS_REPOSITORY = os_env('SALT_MODELS_REPOSITORY','https://gerrit.mcp.mirantis.com/salt-models/mcp-virtual-lab') %}
-# Other salt model repository parameters see in shared-salt.yaml
-
-{% import 'shared-salt.yaml' as SHARED with context %}
-
-{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
-
-{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
-
-{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
-
-- description: "Share custom key from cfg to give each node acces with key from cfg01"
-  cmd: |
-    set -e;
-    set -x;
-    key=$(ssh-keygen -y -f /root/.ssh/id_rsa);
-    salt '*' cmd.run "echo $key >> /root/.ssh/authorized_keys";
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: true
diff --git a/tcp_tests/templates/heat-cicd-k8s-genie/underlay--user-data-foundation.yaml b/tcp_tests/templates/heat-cicd-k8s-genie/underlay--user-data-foundation.yaml
deleted file mode 100644
index 1677dcd..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-genie/underlay--user-data-foundation.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-#cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
-ssh_pwauth: True
-users:
-  - name: root
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    shell: /bin/bash
-  - name: jenkins
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    shell: /bin/bash
-    ssh_authorized_keys:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFSxeuXh2sO4VYL8N2dlNFVyNcr2RvoH4MeDD/cV2HThfU4/BcH6IOOWXSDibIU279bWVKCL7QUp3mf0Vf7HPuyFuC12QM+l7MwT0jCYh5um3hmAvM6Ga0nkhJygHexe9/rLEYzZJkIjP9/IS/YXSv8rhHg484wQ6qkEuq15nyMqil8tbDQCq0XQ+AWEpNpIa4pUoKmFMsOP8lq10KZXIXsJyZxizadr6Bh4Lm9LWrk8YCw7qP3rmgWxK/s8qXQh1ISZe6ONfcmk6p03qbh4H3CwKyWzxmnIHQvE6PgN/O+PuAZj3PbR2mkkJjYX4jNPlxvj8uTStaVPhAwfR9Spdx jenkins@cz8133
-
-disable_root: false
-chpasswd:
-  list: |
-    root:r00tme
-    jenkins:qalab
-  expire: False
-
-packages:
-  - openjdk-8-jre-headless
-  - libyaml-dev
-  - libffi-dev
-  - libvirt-dev
-  - python-dev
-  - python-pip
-  - python-virtualenv
-  #- python-psycopg2
-  - pkg-config
-  - vlan
-  - bridge-utils
-  - ebtables
-
-bootcmd:
-  # Enable root access
-  - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
-  - service sshd restart
-output:
-  all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
-
-runcmd:
-  # Create swap
-  - fallocate -l 16G /swapfile
-  - chmod 600 /swapfile
-  - mkswap /swapfile
-  - swapon /swapfile
-  - echo "/swapfile   none    swap    defaults   0   0" >> /etc/fstab
-
-write_files:
-  - path: /etc/default/grub.d/97-enable-grub-menu.cfg
-    content: |
-      GRUB_RECORDFAIL_TIMEOUT=30
-      GRUB_TIMEOUT=3
-      GRUB_TIMEOUT_STYLE=menu
-
-  - path: /etc/network/interfaces
-    content: |
-      auto ens3
-      iface ens3 inet dhcp
-
-  - path: /etc/bash_completion.d/fuel_devops30_activate
-    content: |
-      source /home/jenkins/fuel-devops30/bin/activate
diff --git a/tcp_tests/templates/heat-cicd-k8s-genie/underlay-userdata.yaml b/tcp_tests/templates/heat-cicd-k8s-genie/underlay-userdata.yaml
deleted file mode 100644
index 8c1f248..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-genie/underlay-userdata.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-#cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
-ssh_pwauth: True
-users:
-   - name: root
-     sudo: ALL=(ALL) NOPASSWD:ALL
-     shell: /bin/bash
-
-disable_root: false
-chpasswd:
-   list: |
-    root:r00tme
-   expire: False
-
-bootcmd:
-   # Enable root access
-   - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
-   - service sshd restart
-output:
-    all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
-
-runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
-   - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
-
-   - export TERM=linux
-   - export LANG=C
-   # Configure dhclient
-   - sudo resolvconf -u
-   #- sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
-   # Enable grub menu using updated config below
-   - update-grub
-
-   # Prepare network connection
-   - sudo ifup ens3
-   #- sudo route add default gw {gateway} {interface_name}
-
-write_files:
-   - path: /etc/default/grub.d/97-enable-grub-menu.cfg
-     content: |
-         GRUB_RECORDFAIL_TIMEOUT=30
-         GRUB_TIMEOUT=3
-         GRUB_TIMEOUT_STYLE=menu
-
-   - path: /etc/network/interfaces
-     content: |
-          auto ens3
-          iface ens3 inet dhcp
-
-   - path: /usr/share/growlvm/image-layout.yml
-     content: |
-       root:
-         size: '65%VG'
-       home:
-         size: '1%VG'
-       var_log:
-         size: '10%VG'
-       var_log_audit:
-         size: '5%VG'
-       var_tmp:
-         size: '10%VG'
-       tmp:
-         size: '5%VG'
-     owner: root:root
-
-growpart:
-    mode: auto
-    devices:
-      - '/'
-      - '/dev/vda3'
-    ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/heat-cicd-k8s-genie/underlay.hot b/tcp_tests/templates/heat-cicd-k8s-genie/underlay.hot
deleted file mode 100644
index f95340f..0000000
--- a/tcp_tests/templates/heat-cicd-k8s-genie/underlay.hot
+++ /dev/null
@@ -1,485 +0,0 @@
----
-
-heat_template_version: queens
-
-description: MCP environment for heat-cicd-k8s-genie
-
-parameters:
-  instance_domain:
-    type: string
-    default: heat-cicd-k8s-genie.local
-  mcp_version:
-    type: string
-  env_name:
-    type: string
-  control_subnet_cidr:
-    type: string
-    default: "10.6.0.0/24"
-  tenant_subnet_cidr:
-    type: string
-    default: "10.8.0.0/24"
-  external_subnet_cidr:
-    type: string
-    default: "192.168.200.0/24"
-  management_subnet_cidr:
-    type: string
-    default: "10.7.0.0/24"
-  management_subnet_cfg01_ip:
-    type: string
-    default: 10.7.0.15
-  management_subnet_gateway_ip:
-    type: string
-    default: 10.7.0.1
-  management_subnet_pool_start:
-    type: string
-    default: 10.7.0.20
-  management_subnet_pool_end:
-    type: string
-    default: 10.7.0.90
-  salt_master_control_ip:
-    type: string
-    default: 10.6.0.15
-
-  key_pair:
-    type: string
-
-  ctl_flavor:
-    type: string
-  cfg_flavor:
-    type: string
-  cid_flavor:
-    type: string
-  kvm_fake_flavor:
-    type: string
-  mon_flavor:
-    type: string
-  log_flavor:
-    type: string
-  mtr_flavor:
-    type: string
-  cmp_flavor:
-    type: string
-  foundation_flavor:
-    type: string
-
-  net_public:
-    type: string
-
-  foundation_image:
-    type: string
-
-  bm_availability_zone:
-    type: string
-  vm_availability_zone:
-    type: string
-
-resources:
-  networks:
-    type: MCP::Networks
-    properties:
-      stack_name: { get_param: "OS::stack_name" }
-      env_name: { get_param: env_name }
-
-  subnets:
-    depends_on: [networks]
-    type: MCP::Subnets
-    properties:
-      stack_name: { get_param: "OS::stack_name" }
-      env_name: { get_param: env_name }
-      management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
-      control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
-      tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
-      external_net: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
-      control_subnet_cidr: { get_param: control_subnet_cidr }
-      tenant_subnet_cidr: { get_param: tenant_subnet_cidr }
-      external_subnet_cidr: { get_param: external_subnet_cidr }
-      management_subnet_cidr: { get_param: management_subnet_cidr }
-      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
-      management_subnet_pool_start: { get_param: management_subnet_pool_start }
-      management_subnet_pool_end: { get_param: management_subnet_pool_end }
-
-  #flavors:
-  #  type: MCP::Flavors
-
-  cfg01_node:
-    type: MCP::MasterNode
-    depends_on: [subnets]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      cfg01_flavor: { get_param: cfg_flavor }
-      availability_zone: { get_param: bm_availability_zone }
-      management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
-      control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
-      tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
-      external_net: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
-      salt_master_control_ip: { get_param: salt_master_control_ip }
-      management_subnet_cfg01_ip: { get_param: management_subnet_cfg01_ip }
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '15' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '15' ]
-      instance_name: cfg01
-      instance_domain: {get_param: instance_domain}
-
-  control_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [cfg01_node]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: ctl01
-      instance02_name: ctl02
-      instance03_name: ctl03
-      instance01_role: [k8s_controller]
-      instance_flavor: {get_param: ctl_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '11' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '12' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '13' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '11' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '12' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '13' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '11' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '12' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '13' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  fake_kvm_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [control_cluster]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: kvm01
-      instance02_name: kvm02
-      instance03_name: kvm03
-      instance_flavor: {get_param: kvm_fake_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '241' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '242' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '243' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '241' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '242' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '243' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '241' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '242' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '243' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  cicd_cluster:
-    type: MCP::MultipleInstance
-    depends_on: [fake_kvm_cluster]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance01_name: cid01
-      instance02_name: cid02
-      instance03_name: cid03
-      instance_flavor: {get_param: cid_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      instance01_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '91' ]
-      instance02_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '92' ]
-      instance03_control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '93' ]
-      instance01_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '91' ]
-      instance02_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '92' ]
-      instance03_tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '93' ]
-      instance01_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '91' ]
-      instance02_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '92' ]
-      instance03_external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '93' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  prx01_virtual:
-    type: MCP::SingleInstance
-    depends_on: [cicd_cluster]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: prx01
-      instance_flavor: {get_param: cid_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '221' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '221' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '221' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  prx02_virtual:
-    type: MCP::SingleInstance
-    depends_on: [prx01_virtual]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: prx02
-      instance_flavor: {get_param: cid_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '222' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '222' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '222' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  cmp001_virtual:
-    type: MCP::Compute
-    depends_on: [prx02_virtual]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: cmp001
-      instance_flavor: {get_param: cmp_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '101' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '101' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '101' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  cmp002_virtual:
-    type: MCP::Compute
-    depends_on: [cmp001_virtual]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: cmp002
-      instance_flavor: {get_param: cmp_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '102' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '102' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '102' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  cmp003_virtual:
-    type: MCP::Compute
-    depends_on: [cmp002_virtual]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: cmp003
-      instance_flavor: {get_param: cmp_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '103' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '103' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '103' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  cmp004_virtual:
-    type: MCP::Compute
-    depends_on: [cmp003_virtual]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: cmp004
-      instance_flavor: {get_param: cmp_flavor}
-      availability_zone: { get_param: vm_availability_zone }
-      underlay_userdata: { get_file: ./underlay-userdata.yaml }
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '104' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '104' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '104' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-  foundation_node:
-    type: MCP::FoundationNode
-    depends_on: [subnets]
-    properties:
-      env_name: { get_param: env_name }
-      mcp_version: { get_param: mcp_version }
-      instance_domain: {get_param: instance_domain}
-      instance_name: foundation
-      instance_image: { get_param: foundation_image }
-      instance_flavor: {get_param: foundation_flavor}
-      availability_zone: { get_param: bm_availability_zone }
-      management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
-      control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
-      tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
-      external_net: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
-      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
-      underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
-      management_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, management_net_prefix] }, '5' ]
-      control_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, control_net_prefix] }, '5' ]
-      tenant_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, tenant_net_prefix] }, '5' ]
-      external_net_static_ip:
-        list_join:
-        - '.'
-        - [ { get_attr: [subnets, external_net_prefix] }, '5' ]
-
-      instance_config_host: { get_attr: [cfg01_node, instance_address] }
-
-outputs:
-  foundation_public_ip:
-    description: foundation node IP address (floating) from external network
-    value:
-      get_attr:
-      - foundation_node
-      - instance_floating_address
-...
diff --git a/tcp_tests/templates/k8s-ha-calico/core.yaml b/tcp_tests/templates/k8s-ha-calico/core.yaml
deleted file mode 100644
index e5ff52e..0000000
--- a/tcp_tests/templates/k8s-ha-calico/core.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-{% from 'k8s-ha-calico/underlay.yaml' import HOSTNAME_CFG01 with context %}
-
-# Install support services
-- description: Create and distribute SSL certificates for services using salt state
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False '*'
-    state.sls salt.minion.cert
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 10}
-  skip_fail: true
-
-- description: Install docker
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@docker:host' state.sls docker.host
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: true
-
-- description: Check docker
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@docker:host' cmd.run 'docker ps'
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: true
-
-- description:  Install keepalived on first node
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@keepalived:cluster and *01*' state.sls keepalived
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 10}
-  skip_fail: true
-
-- description:  Install keepalived on whole cluster
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@keepalived:cluster' state.sls keepalived
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 10}
-  skip_fail: true
-
-- description: Install haproxy
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@haproxy:proxy' state.sls haproxy
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
-
-- description: Install haproxy.service
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@haproxy:proxy' service.status haproxy
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
-
-- description: Restart rsyslog on haproxy nodes
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@haproxy:proxy' service.restart rsyslog
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
diff --git a/tcp_tests/templates/k8s-ha-calico/k8s-update.yaml b/tcp_tests/templates/k8s-ha-calico/k8s-update.yaml
deleted file mode 100644
index 7162657..0000000
--- a/tcp_tests/templates/k8s-ha-calico/k8s-update.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-{% from 'k8s-ha-calico/underlay.yaml' import HOSTNAME_CFG01 with context %}
-{% from 'k8s-ha-calico/underlay.yaml' import HOSTNAME_CTL01 with context %}
-
-# Kubernetes upgrade
-- description: Update hypercube image
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-     -C 'I@kubernetes:pool' state.sls kubernetes.pool
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
-
-- description: Update the Kubernetes Master nodes and restart the services
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-     -C 'I@kubernetes:master' state.sls kubernetes exclude=kubernetes.master.setup
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
-
-- desciption: Print kubernetes version
-  cmd: kubectl version
-  node_name: {{ HOSTNAME_CTL01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: true
diff --git a/tcp_tests/templates/k8s-ha-calico/k8s.yaml b/tcp_tests/templates/k8s-ha-calico/k8s.yaml
deleted file mode 100644
index 88075db..0000000
--- a/tcp_tests/templates/k8s-ha-calico/k8s.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-{% from 'k8s-ha-calico/underlay.yaml' import HOSTNAME_CFG01 with context %}
-
-# Kubernetes
-- description: Install etcd
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-     -C 'I@etcd:server' state.sls etcd.server.service
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
-
-- description: Check the etcd health
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-     -C 'I@etcd:server' cmd.run '. /var/lib/etcd/configenv && etcdctl cluster-health'
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
-
-- description: Install Kubernetes addons
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-     -C 'I@kubernetes:master' state.sls kubernetes.master.kube-addons
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
-
-- description: Install Kubernetes and Calico
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-     -C 'I@kubernetes:pool' state.sls kubernetes.pool
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 5}
-  skip_fail: false
-
-- description: Setup NAT for Calico
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@etcd:server and *01*' state.sls etcd.server.setup
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
-
-- description: Run whole master to check consistency
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-     -C 'I@kubernetes:master' state.sls kubernetes exclude=kubernetes.master.setup
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: true
-
-- description: Register addons
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@kubernetes:master' state.sls kubernetes.master.setup
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
-
-- description: Restart kubelet
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@kubernetes:pool' service.restart kubelet
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
-
-- description: Renew hosts file on a whole cluster
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False -C '*' state.sls linux.network.host;
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
-
-- description: Get kubeconfig
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@kubernetes:control and *01*' cmd.run 'cat /etc/kubernetes/admin-kube-config && echo "Salt command execution success"'
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
-
-- description: Install tiller client
-  cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@helm:client' test.ping && salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@helm:client' state.sls helm
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 3, delay: 15}
-  skip_fail: true
diff --git a/tcp_tests/templates/k8s-ha-calico/salt.yaml b/tcp_tests/templates/k8s-ha-calico/salt.yaml
deleted file mode 100644
index b066fc2..0000000
--- a/tcp_tests/templates/k8s-ha-calico/salt.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-{% from 'k8s-ha-calico/underlay.yaml' import HOSTNAME_CFG01 with context %}
-{% from 'k8s-ha-calico/underlay.yaml' import LAB_CONFIG_NAME with context %}
-{% from 'k8s-ha-calico/underlay.yaml' import DOMAIN_NAME with context %}
-
-{% set SALT_MODELS_REPOSITORY = os_env('SALT_MODELS_REPOSITORY','https://gerrit.mcp.mirantis.com/salt-models/mcp-virtual-lab') %}
-# Other salt model repository parameters see in shared-salt.yaml
-
-{% import 'shared-salt.yaml' as SHARED with context %}
-
-{{ SHARED.MACRO_INSTALL_SALT_MASTER() }}
-
-{{ SHARED.MACRO_CLONE_RECLASS_MODELS() }}
-
-{{ SHARED.MACRO_CONFIGURE_RECLASS(FORMULA_SERVICES='"linux" "reclass" "salt" "openssh" "ntp" "git" "nginx" "collectd" "sensu" "heka" "sphinx" "keystone" "mysql" "grafana" "haproxy" "rsyslog" "horizon" "prometheus" "telegraf" "elasticsearch" "logrotate"') }}
-
-{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
-
-{{ SHARED.MACRO_RUN_SALT_MASTER_UNDERLAY_STATES() }}
-
-{{ SHARED.ADJUST_K8S_OPTS() }}
-
-{{ SHARED.REGISTER_COMPUTE_NODES() }}
-
-{{ SHARED.MACRO_GENERATE_INVENTORY() }}
-
-{{ SHARED.MACRO_BOOTSTRAP_ALL_MINIONS() }}
-
-{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
-
-{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
diff --git a/tcp_tests/templates/k8s-ha-calico/underlay--meta-data.yaml b/tcp_tests/templates/k8s-ha-calico/underlay--meta-data.yaml
deleted file mode 100644
index 3699401..0000000
--- a/tcp_tests/templates/k8s-ha-calico/underlay--meta-data.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-| # All the data below will be stored as a string object
-  instance-id: iid-local1
-  hostname: {hostname}
-  local-hostname: {hostname}
diff --git a/tcp_tests/templates/k8s-ha-calico/underlay--user-data-cfg01.yaml b/tcp_tests/templates/k8s-ha-calico/underlay--user-data-cfg01.yaml
deleted file mode 100644
index dc9f8cd..0000000
--- a/tcp_tests/templates/k8s-ha-calico/underlay--user-data-cfg01.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-| # All the data below will be stored as a string object
-  #cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
-  ssh_pwauth: True
-  users:
-   - name: root
-     sudo: ALL=(ALL) NOPASSWD:ALL
-     shell: /bin/bash
-     ssh_authorized_keys:
-     {% for key in config.underlay.ssh_keys %}
-      - ssh-rsa {{ key['public'] }}
-     {% endfor %}
-
-  disable_root: false
-  chpasswd:
-   list: |
-    root:r00tme
-   expire: False
-
-  bootcmd:
-   # Enable root access
-   - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
-   - service sshd restart
-  output:
-    all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
-
-  runcmd:
-   # Configure dhclient
-   - sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
-   - sudo resolvconf -u
-
-   # Prepare network connection
-   - sudo ifdown ens3
-   - sudo ip r d default || true  # remove existing default route to get it from dhcp
-   - sudo ifup ens3
-   #- sudo route add default gw {gateway} {interface_name}
-   - sudo ifdown ens4
-   - sudo ifup ens4
-
-   # Create swap
-   - fallocate -l 4G /swapfile
-   - chmod 600 /swapfile
-   - mkswap /swapfile
-   - swapon /swapfile
-   - echo "/swapfile   none    swap    defaults    0   0" >> /etc/fstab
-
-   - mkdir -p /srv/salt/reclass/nodes
-   - systemctl enable salt-master
-   - systemctl enable salt-minion
-   - systemctl start salt-master
-   - systemctl start salt-minion
-   - salt-call -l info --timeout=120 test.ping
-
-  write_files:
-   - path: /etc/network/interfaces
-     content: |
-          auto ens3
-          iface ens3 inet dhcp
-          auto ens4
-          iface ens4 inet dhcp
-
-   - path: /root/.ssh/config
-     owner: root:root
-     permissions: '0600'
-     content: |
-          Host *
-            ServerAliveInterval 300
-            ServerAliveCountMax 10
-            StrictHostKeyChecking no
-            UserKnownHostsFile /dev/null
diff --git a/tcp_tests/templates/k8s-ha-calico/underlay--user-data1604.yaml b/tcp_tests/templates/k8s-ha-calico/underlay--user-data1604.yaml
deleted file mode 100644
index ec9df27..0000000
--- a/tcp_tests/templates/k8s-ha-calico/underlay--user-data1604.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-| # All the data below will be stored as a string object
-  #cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
-  ssh_pwauth: True
-  users:
-   - name: root
-     sudo: ALL=(ALL) NOPASSWD:ALL
-     shell: /bin/bash
-     ssh_authorized_keys:
-     {% for key in config.underlay.ssh_keys %}
-      - ssh-rsa {{ key['public'] }}
-     {% endfor %}
-
-  disable_root: false
-  chpasswd:
-   list: |
-    root:r00tme
-   expire: False
-
-  bootcmd:
-   # Enable root access
-   - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
-   - service sshd restart
-  output:
-    all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
-
-  runcmd:
-   - if lvs vg0; then pvresize /dev/vda3; fi
-   - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
-
-   - export TERM=linux
-   - export LANG=C
-   # Configure dhclient
-   - sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
-   - sudo resolvconf -u
-
-   # Prepare network connection
-   - sudo ifup ens3
-   #- sudo route add default gw {gateway} {interface_name}
-   - sudo ifup ens4
-
-   # Create swap
-   - fallocate -l 4G /swapfile
-   - chmod 600 /swapfile
-   - mkswap /swapfile
-   - swapon /swapfile
-   - echo "/swapfile   none    swap    defaults   0   0" >> /etc/fstab
-
-  write_files:
-   - path: /etc/network/interfaces
-     content: |
-          auto ens3
-          iface ens3 inet dhcp
-          auto ens4
-          iface ens4 inet dhcp
-
-   - path: /usr/share/growlvm/image-layout.yml
-     content: |
-       root:
-         size: '30%VG'
-       home:
-         size: '1G'
-       var_log:
-         size: '11%VG'
-       var_log_audit:
-         size: '5G'
-       var_tmp:
-         size: '11%VG'
-       tmp:
-         size: '5G'
-     owner: root:root
-
-  growpart:
-    mode: auto
-    devices:
-      - '/'
-      - '/dev/vda3'
-    ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/k8s-ha-calico/underlay.yaml b/tcp_tests/templates/k8s-ha-calico/underlay.yaml
deleted file mode 100644
index ac11a62..0000000
--- a/tcp_tests/templates/k8s-ha-calico/underlay.yaml
+++ /dev/null
@@ -1,286 +0,0 @@
-# Set the repository suite, one of the: 'nightly', 'testing', 'stable', or any other required
-{% set REPOSITORY_SUITE = os_env('REPOSITORY_SUITE', 'testing') %}
-
-{% import 'k8s-ha-calico/underlay--meta-data.yaml' as CLOUDINIT_META_DATA with context %}
-{% import 'k8s-ha-calico/underlay--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 with context %}
-{% import 'k8s-ha-calico/underlay--user-data1604.yaml' as CLOUDINIT_USER_DATA_1604 with context %}
-
----
-aliases:
- - &interface_model {{ os_env('INTERFACE_MODEL', 'virtio') }}
- - &cloudinit_meta_data {{ CLOUDINIT_META_DATA }}
- - &cloudinit_user_data_cfg01 {{ CLOUDINIT_USER_DATA_CFG01 }}
- - &cloudinit_user_data_1604 {{ CLOUDINIT_USER_DATA_1604 }}
-
-{% set LAB_CONFIG_NAME = os_env('LAB_CONFIG_NAME', 'k8s-ha-calico.local') %}
-{% set DOMAIN_NAME = os_env('DOMAIN_NAME', LAB_CONFIG_NAME) + '.local' %}
-{% set HOSTNAME_CFG01 = os_env('HOSTNAME_CFG01', 'cfg01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CTL01 = os_env('HOSTNAME_CTL01', 'ctl01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CTL02 = os_env('HOSTNAME_CTL02', 'ctl02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CTL03 = os_env('HOSTNAME_CTL03', 'ctl03.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CMP01 = os_env('HOSTNAME_CMP01', 'cmp0.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CMP02 = os_env('HOSTNAME_CMP02', 'cmp1.' + DOMAIN_NAME) %}
-
-template:
-  devops_settings:
-    env_name: {{ os_env('ENV_NAME', 'k8s-ha-calico_' + REPOSITORY_SUITE + "_" + os_env('BUILD_NUMBER', '')) }}
-
-    address_pools:
-      admin-pool01:
-        net: {{ os_env('ADMIN_ADDRESS_POOL01', '10.70.0.0/16:24') }}
-        params:
-          ip_reserved:
-            gateway: +1
-            l2_network_device: +1
-            default_{{ HOSTNAME_CFG01 }}: +90
-            default_{{ HOSTNAME_CTL01 }}: +101
-            default_{{ HOSTNAME_CTL02 }}: +102
-            default_{{ HOSTNAME_CTL03 }}: +103
-            default_{{ HOSTNAME_CMP01 }}: +105
-            default_{{ HOSTNAME_CMP02 }}: +106
-          ip_ranges:
-            dhcp: [+90, -10]
-
-      private-pool01:
-        net: {{ os_env('PRIVATE_ADDRESS_POOL01', '10.60.0.0/16:24') }}
-        params:
-          ip_reserved:
-            gateway: +1
-            l2_network_device: +1
-            default_{{ HOSTNAME_CFG01 }}: +100
-            default_{{ HOSTNAME_CTL01 }}: +101
-            default_{{ HOSTNAME_CTL02 }}: +102
-            default_{{ HOSTNAME_CTL03 }}: +103
-            default_{{ HOSTNAME_CMP01 }}: +105
-            default_{{ HOSTNAME_CMP02 }}: +106
-          ip_ranges:
-            dhcp: [+90, -10]
-
-    groups:
-      - name: default
-        driver:
-          name: devops.driver.libvirt
-          params:
-            connection_string: !os_env CONNECTION_STRING, qemu:///system
-            storage_pool_name: !os_env STORAGE_POOL_NAME, default
-            stp: False
-            hpet: False
-            enable_acpi: true
-            use_host_cpu: !os_env DRIVER_USE_HOST_CPU, true
-            use_hugepages: !os_env DRIVER_USE_HUGEPAGES, false
-
-        network_pools:
-          admin: admin-pool01
-          private: private-pool01
-
-        l2_network_devices:
-          private:
-            address_pool: private-pool01
-            dhcp: true
-
-          admin:
-            address_pool: admin-pool01
-            dhcp: true
-            forward:
-              mode: nat
-
-        group_volumes:
-         - name: cloudimage1604    # This name is used for 'backing_store' option for node volumes.
-           source_image: !os_env IMAGE_PATH1604  # https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
-           format: qcow2
-         - name: cfg01_day01_image               # Pre-configured day01 image
-           source_image: {{ os_env('IMAGE_PATH_CFG01_DAY01', os_env('IMAGE_PATH1604')) }} # http://images.mirantis.com/cfg01-day01.qcow2 or fallback to IMAGE_PATH1604
-           format: qcow2
-
-        nodes:
-          - name: {{ HOSTNAME_CFG01 }}
-            role: salt_master
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 2
-              memory: !os_env SLAVE_NODE_MEMORY, 4096
-              boot:
-                - hd
-              cloud_init_volume_name: iso
-              cloud_init_iface_up: ens3
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 150
-                  backing_store: cfg01_day01_image
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_cfg01
-
-              interfaces:
-                - label: ens3
-                  l2_network_device: admin
-                  interface_model: *interface_model
-                - label: ens4
-                  l2_network_device: private
-                  interface_model: *interface_model
-              network_config:
-                ens3:
-                  networks:
-                    - admin
-                ens4:
-                  networks:
-                    - private
-
-          - name: {{ HOSTNAME_CTL01 }}
-            role: k8s_controller
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 2
-              memory: !os_env SLAVE_NODE_MEMORY, 4096
-              boot:
-                - hd
-              cloud_init_volume_name: iso
-              cloud_init_iface_up: ens3
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 150
-                  backing_store: cloudimage1604
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_1604
-
-              interfaces: &interfaces
-                - label: ens3
-                  l2_network_device: admin
-                  interface_model: *interface_model
-                - label: ens4
-                  l2_network_device: private
-                  interface_model: *interface_model
-              network_config: &network_config
-                ens3:
-                  networks:
-                    - admin
-                ens4:
-                  networks:
-                    - private
-
-          - name: {{ HOSTNAME_CTL02 }}
-            role: salt_minion
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 2
-              memory: !os_env SLAVE_NODE_MEMORY, 4096
-              boot:
-                - hd
-              cloud_init_volume_name: iso
-              cloud_init_iface_up: ens3
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 150
-                  backing_store: cloudimage1604
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_1604
-
-              interfaces: *interfaces
-              network_config: *network_config
-
-          - name: {{ HOSTNAME_CTL03 }}
-            role: salt_minion
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 2
-              memory: !os_env SLAVE_NODE_MEMORY, 4096
-              boot:
-                - hd
-              cloud_init_volume_name: iso
-              cloud_init_iface_up: ens3
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 150
-                  backing_store: cloudimage1604
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_1604
-
-              interfaces: *interfaces
-              network_config: *network_config
-
-          - name: {{ HOSTNAME_CMP01 }}
-            role: salt_minion
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 3
-              memory: !os_env SLAVE_NODE_MEMORY, 4096
-              boot:
-                - hd
-              cloud_init_volume_name: iso
-              cloud_init_iface_up: ens3
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 150
-                  backing_store: cloudimage1604
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_1604
-
-              interfaces: &all_interfaces
-                - label: ens3
-                  l2_network_device: admin
-                  interface_model: *interface_model
-                - label: ens4
-                  l2_network_device: private
-                  interface_model: *interface_model
-              network_config: &all_network_config
-                ens3:
-                  networks:
-                    - admin
-                ens4:
-                  networks:
-                    - private
-
-          - name: {{ HOSTNAME_CMP02 }}
-            role: salt_minion
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 3
-              memory: !os_env SLAVE_NODE_MEMORY, 4096
-              boot:
-                - hd
-              cloud_init_volume_name: iso
-              cloud_init_iface_up: ens3
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 150
-                  backing_store: cloudimage1604
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_1604
-
-              interfaces: *interfaces
-              network_config: *network_config
diff --git a/tcp_tests/templates/mcp-local-aptly/underlay--meta-data.yaml b/tcp_tests/templates/mcp-local-aptly/underlay--meta-data.yaml
deleted file mode 100644
index 3699401..0000000
--- a/tcp_tests/templates/mcp-local-aptly/underlay--meta-data.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-| # All the data below will be stored as a string object
-  instance-id: iid-local1
-  hostname: {hostname}
-  local-hostname: {hostname}
diff --git a/tcp_tests/templates/mcp-local-aptly/underlay--user-data-apt01.yaml b/tcp_tests/templates/mcp-local-aptly/underlay--user-data-apt01.yaml
deleted file mode 100644
index 79443bd..0000000
--- a/tcp_tests/templates/mcp-local-aptly/underlay--user-data-apt01.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-| # All the data below will be stored as a string object
-  #cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
-  ssh_pwauth: True
-  users:
-   - name: root
-     sudo: ALL=(ALL) NOPASSWD:ALL
-     shell: /bin/bash
-     ssh_authorized_keys:
-     {% for key in config.underlay.ssh_keys %}
-      - ssh-rsa {{ key['public'] }}
-     {% endfor %}
-
-  disable_root: false
-  chpasswd:
-   list: |
-    root:r00tme
-   expire: False
-
-  bootcmd:
-   # Block access to SSH while node is preparing
-   - cloud-init-per once sudo iptables -A INPUT -p tcp --dport 22 -j DROP
-   # Enable root access
-   - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
-   - service sshd restart
-  output:
-    all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
-
-  misc_bucket:
-   - &runcmd_commands |
-     #!/bin/bash
-     set -x
-     # Prepare network connection
-     sudo ifup ens3
-     #- sudo route add default gw {gateway} {interface_name}
-     rm /etc/resolv.conf
-     touch /etc/resolv.conf
-     export LOCAL_DNS_IP=$(ifconfig ens3 | grep "inet addr" | cut -d ':' -f 2 | cut -d ' ' -f 1)
-     echo "nameserver $LOCAL_DNS_IP" >> /etc/resolv.conf;
-     echo "nameserver 172.18.208.44" >> /etc/resolv.conf;
-     echo "supersede domain-name-servers $LOCAL_DNS_IP, 172.18.208.44" >> /etc/dhcp/dhclient.conf
-     export TERM=linux
-     export LANG=C
-
-     # Create swap
-     fallocate -l 4G /swapfile
-     chmod 600 /swapfile
-     mkswap /swapfile
-     swapon /swapfile
-     echo "/swapfile   none    swap    defaults   0   0" >> /etc/fstab
-
-     ########################################################
-     # Node is ready, allow SSH access
-     echo "Allow SSH access ..."
-     sudo iptables -D INPUT -p tcp --dport 22 -j DROP
-     ########################################################
-     # Mirror from https://github.com/Mirantis/mcp-common-scripts/blob/master/config-drive/mirror_config.sh
-     echo "Configuring salt"
-     service salt-minion stop
-     systemctl disable salt-minion.service
-     # envsubst < /root/minion.conf > /etc/salt/minion.d/minion.conf
-
-  runcmd:
-   - [ sh, -c, *runcmd_commands ]
-
-  write_files:
-   - path: /etc/network/interfaces
-     content: |
-          auto ens3
-          iface ens3 inet dhcp
-
-   - path: /root/.ssh/config
-     owner: root:root
-     permissions: '0600'
-     content: |
-          Host *
-            ServerAliveInterval 300
-            ServerAliveCountMax 10
-            StrictHostKeyChecking no
-            UserKnownHostsFile /dev/null
diff --git a/tcp_tests/templates/mcp-local-aptly/underlay.yaml b/tcp_tests/templates/mcp-local-aptly/underlay.yaml
deleted file mode 100644
index 07b38e0..0000000
--- a/tcp_tests/templates/mcp-local-aptly/underlay.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
-{% import 'mcp-local-aptly/underlay--meta-data.yaml' as CLOUDINIT_META_DATA with context %}
-{% import 'mcp-local-aptly/underlay--user-data-apt01.yaml' as CLOUDINIT_USER_DATA_APT01 with context %}
-
----
-aliases:
- - &interface_model {{ os_env('INTERFACE_MODEL', 'virtio') }}
- - &cloudinit_meta_data {{ CLOUDINIT_META_DATA }}
- - &cloudinit_user_data_apt01 {{ CLOUDINIT_USER_DATA_APT01 }}
-
-{% set DOMAIN_NAME = os_env('LAB_CONFIG_NAME', 'mcp-local-aptly') + '.local' %}
-{% set HOSTNAME_APT01 = os_env('HOSTNAME_APT01', 'apt01.' + DOMAIN_NAME) %}
-
-template:
-  devops_settings:
-    env_name: {{ os_env('ENV_NAME', 'mcp-local-aptly_' + os_env('BUILD_NUMBER', '')) }}
-
-    address_pools:
-      admin-pool01:
-        net: {{ os_env('ADMIN_ADDRESS_POOL01', '10.170.0.240/28:28') }}
-        params:
-          ip_reserved:
-            gateway: +2
-            l2_network_device: +1
-            default_{{ HOSTNAME_APT01 }}: +2  #10.170.0.242
-          ip_ranges:
-            dhcp: [+5, +10]
-
-    groups:
-      - name: default
-        driver:
-          name: devops.driver.libvirt
-          params:
-            connection_string: !os_env CONNECTION_STRING, qemu:///system
-            storage_pool_name: !os_env STORAGE_POOL_NAME, default
-            stp: False
-            hpet: False
-            enable_acpi: true
-            use_host_cpu: !os_env DRIVER_USE_HOST_CPU, true
-            use_hugepages: !os_env DRIVER_USE_HUGEPAGES, false
-
-        network_pools:
-          admin: admin-pool01
-
-        l2_network_devices:
-          admin:
-            address_pool: admin-pool01
-            forward:
-              mode: route
-            dhcp: true
-
-        nodes:
-          - name: {{ HOSTNAME_APT01 }}
-            role: salt-minion
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 4
-              memory: !os_env SLAVE_NODE_MEMORY, 4096
-              boot:
-                - hd
-              cloud_init_volume_name: iso
-              cloud_init_iface_up: ens3
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 550
-                  shared_backing_store_name: !os_env APT_VOLUME_NAME
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  cloudinit_meta_data: *cloudinit_meta_data
-                  cloudinit_user_data: *cloudinit_user_data_apt01
-
-              interfaces:
-                - label: ens3
-                  l2_network_device: admin
-                  interface_model: *interface_model
-              network_config:
-                ens3:
-                  networks:
-                    - admin
diff --git a/tcp_tests/templates/physical-mcp-offline-vxlan/Readme.txt b/tcp_tests/templates/physical-mcp-offline-vxlan/Readme.txt
deleted file mode 100644
index a3297a8..0000000
--- a/tcp_tests/templates/physical-mcp-offline-vxlan/Readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-PoC templates. Do not use!
\ No newline at end of file
diff --git a/tcp_tests/templates/physical-mcp-offline-vxlan/context-golden-ovs-offline-pike.yml b/tcp_tests/templates/physical-mcp-offline-vxlan/context-golden-ovs-offline-pike.yml
deleted file mode 100644
index 9ededfe..0000000
--- a/tcp_tests/templates/physical-mcp-offline-vxlan/context-golden-ovs-offline-pike.yml
+++ /dev/null
@@ -1,2041 +0,0 @@
-default_context:
-  # alertmanager_notification_email_enabled: 'True'
-  # alertmanager_notification_email_from: john.doe@example.org
-  # alertmanager_notification_email_hostname: 127.0.0.1
-  # alertmanager_notification_email_password: password
-  # alertmanager_notification_email_port: '587'
-  # alertmanager_notification_email_require_tls: 'True'
-  # alertmanager_notification_email_to: jane.doe@example.org
-  # auditd_enabled: 'False'
-# "=== CLUSTER GLOBALS ==="
-  cluster_domain: mcp-offline-vxlan.local
-  cluster_name: mcp-offline-vxlan
-  openldap_domain: mcp-offline-vxlan.local
-  mcp_version: 2019.2.0
-  cookiecutter_template_branch: master
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.net/mk/cookiecutter-templates.git
-  shared_reclass_branch: ''
-  shared_reclass_url: https://gerrit.mcp.mirantis.net/salt-models/reclass-system.git
-  mcp_common_scripts_branch: ''
-
-# "=== COMPONENT SWITCHES ==="
-  cicd_enabled: 'True'
-  infra_enabled:      'True'
-  kubernetes_enabled: 'False'
-  ceph_enabled: 'True'
-  opencontrail_enabled: 'False'
-  openstack_enabled: 'True'
-  stacklight_enabled: 'True'
-  manila_enabled: 'False'
-
-# === CICD|INFRA COMPONENT SWITCHES ==="
-  maas_enabled: 'True'
-  openldap_enabled: 'True'
-  local_repositories: 'True'
-  offline_deployment: 'True'
-# Other
-  bmk_enabled: 'False'
-  upstream_proxy_enabled: 'False'
-  fluentd_enabled: 'True'
-## END of basic CC config
-  ceph_osd_count: '3'
-  openstack_compute_count: '4'
-  openscap_enabled: 'True'
-  openssh_groups: "qa_scale,oscore_devops,networking,stacklight,k8s_team,mcp_qa,drivetrain"
-  backup_private_key: |-
-    -----BEGIN RSA PRIVATE KEY-----
-    MIIEogIBAAKCAQEArK5R0R/X4kmWID1A+/vIH/L2wT2SJOCZ9hw/byVVUANJUI0U
-    bDPap3fYMsC/w8/sfb0hI7QjXvKKTT1fSTzKwt8idMrSMQfnjPIbwcFfu6E5i7jv
-    RfqY4g9mspP6tkeoiolxw5BMdxnKaNIJ00T4/uIr4naiGK1OEqzFN9k6aFBMkYhh
-    IAahLM60Ja4ANy521LO2O5NDarVze9l3Mk77diKPm+OFkfc9XgxTxj92vhuG0B6X
-    7Z9nMuF4zxXZascu7wqiMkQnaq0pABJEcXbhLxjFvno7g8e5NuwYcTwuazkx8+Di
-    mdC1uTD91EFrvc7hnFHGzXU843xejkMDPaWt6wIDAQABAoIBAFDVvZku1empVuy6
-    n+wVvmYuX5KwVvSKa6hJKuzFxj0RfMWHdXL9hzL0KDICBwMMF4H5AkVrc09kLJfh
-    zfRD0AsPV1rjAyhOsfdJ8vJtqnn0DDM7HE9e8yiH2yRnn2qq+tv3YVkR+KmcWiNd
-    h5nt5L20dKSrsk/o+O5HEH+HYg8oGrmZYLmq5qOMLp2JGfKH7BS5a8z2fIrFdGeN
-    CStkFbv3vIgzu7X+S40s3b0tfgXz0Kdg+yUZb86i4qm3AjiWhb39jJ7wnw6m9dtQ
-    2ynBHRZs7Sir9C7nUJL0JicVg+w/Lpp4fBnR3Q7kuu7o2jYKMdykYsUtpnJ6Y3iF
-    il2pTgkCgYEA3jEwx7v+Ch7LN98cE0EWjQS9kGnQKwbbuz49IyKBLHXQqfwHQUvJ
-    nXRQSRQmHJUElzN3CfGq+FJz5xP7ZKWQdQZsEjMZ3hWvGIuJgLZAdUdq8bF64NVF
-    eaRinuaoKu5pzUr8FzkGsqItwgqgK1HU2peEmjdJHE6ZeF0RrPj8EkUCgYEAxvSS
-    jvn6fD+hnsHjEC+2i4GPn4l2lKMVu02UC22LKQeAJW1B4MbmZEeOaBYuQN+ARYIf
-    RLPP4HPgmod+23o7hYJsFwxDlBzkdY30MhTyW2MEvUx7ND1pelth40FmYtEWoZXq
-    7EC0dZYeC7fXXVHQOPHw3k1r+VQAR854HZ/P2m8CgYAKyN5yQ2iwOxBoFNc7BATB
-    MYK1+LzW6c1OiFXVV75nVwyaw5XikHgnwVaIRYcYCg+f+yqC/AztYqsngyvHldWu
-    KHKka4CM7AaErXkuGyqDxsSlGJU7Rn7JybXTuqRc+Rd/lG0p/2WY1BBeg7+EesNX
-    HNWd2qMc0Z/XXMUX3Tn29QKBgCIuyy99i6flVuNr9JNHX1nAvOhwOct36bfwsEr2
-    Wz6FZ2MGzpbMFbGNCc6gYPoMbIGExdKMAl9SCXkDZqxW5/scWW3sUYAVJrt71ET2
-    jF1fOeU8Sr7C/mhjYwIkrm6z9et1UpOc2mSJkkf5IiuKbvgZuYS4UKDZ6eJsev68
-    An5JAoGAJTQ1wQXo8Gp1oI1hXG70zoU9AjSVin6rs8cAWzoqdr5aLiTD1OtMeEMF
-    AupRxHgOVKb7RZoePcdusTEErWaYvxPS6vAeGgHf/aKIb8BDL4Rn7FS1DAa8R+s9
-    FN15hAhG2BGLujWvwLWL3aLlxmYWukSmx5QBa//TaFwIJvqF7HU=
-    -----END RSA PRIVATE KEY-----
-  backup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsrlHRH9fiSZYgPUD7+8gf8vbBPZIk4Jn2HD9vJVVQA0lQjRRsM9qnd9gywL/Dz+x9vSEjtCNe8opNPV9JPMrC3yJ0ytIxB+eM8hvBwV+7oTmLuO9F+pjiD2ayk/q2R6iKiXHDkEx3Gcpo0gnTRPj+4ividqIYrU4SrMU32TpoUEyRiGEgBqEszrQlrgA3LnbUs7Y7k0NqtXN72XcyTvt2Io+b44WR9z1eDFPGP3a+G4bQHpftn2cy4XjPFdlqxy7vCqIyRCdqrSkAEkRxduEvGMW+ejuDx7k27BhxPC5rOTHz4OKZ0LW5MP3UQWu9zuGcUcbNdTzjfF6OQwM9pa3r
-  ceph_cluster_network: 10.11.0.0/16
-
-
-
-  aptly_server_control_address: 10.11.0.14
-  aptly_server_deploy_address: 10.10.0.14
-  aptly_server_hostname: apt
-
-
-  # backend_network_netmask: 255.255.0.0
-  # backend_network_subnet: 10.11.0.0/16
-  backend_vlan: '1111'
-
-  ceph_hyper_converged: 'False'
-  ceph_mon_node01_deploy_address: 10.10.0.66
-  ceph_mon_node01_address: 10.11.0.66
-  ceph_mon_node01_ceph_public_address: 10.11.0.66
-  ceph_mon_node01_hostname: cmn01
-  ceph_mon_node02_deploy_address: 10.10.0.67
-  ceph_mon_node02_address: 10.11.0.67
-  ceph_mon_node02_ceph_public_address: 10.11.0.67
-  ceph_mon_node02_hostname: cmn02
-  ceph_mon_node03_deploy_address: 10.10.0.68
-  ceph_mon_node03_address: 10.11.0.68
-  ceph_mon_node03_ceph_public_address: 10.11.0.68
-  ceph_mon_node03_hostname: cmn03
-  ceph_osd_backend: bluestore
-  ceph_osd_block_db_size: '20'
-  ceph_osd_bond_mode: active-backup
-  ceph_osd_data_disks: /dev/sdb
-  ceph_osd_journal_or_block_db_disks: /dev/sdb
-  ceph_osd_node_count: '5'
-  ceph_osd_primary_first_nic: ten1
-  ceph_osd_primary_second_nic: ten2
-  ceph_osd_rack01_hostname: osd
-  ceph_osd_single_address_ranges: "10.11.0.201-10.11.0.203"
-  ceph_osd_deploy_address_ranges: "10.10.0.201-10.10.0.203"
-  ceph_osd_ceph_public_address_ranges: "10.11.0.201-10.11.0.203"
-  ceph_osd_backend_address_ranges: "10.13.0.201-10.13.0.203"
-  ceph_public_vlan: '1110'
-
-  ceph_public_network: 10.11.0.0/16
-  ceph_rgw_address: 10.11.0.75
-  ceph_rgw_hostname: rgw
-  ceph_rgw_node01_deploy_address: 10.10.0.76
-  ceph_rgw_node01_address: 10.11.0.76
-  ceph_rgw_node01_hostname: rgw01
-  ceph_rgw_node02_deploy_address: 10.10.0.77
-  ceph_rgw_node02_address: 10.11.0.77
-  ceph_rgw_node02_hostname: rgw02
-  ceph_rgw_node03_deploy_address: 10.10.0.78
-  ceph_rgw_node03_address: 10.11.0.78
-  ceph_rgw_node03_hostname: rgw03
-  ceph_version: luminous
-  cicd_control_node01_deploy_address: 10.10.0.91
-  cicd_control_node01_address: 10.11.0.91
-  cicd_control_node01_hostname: cid01
-  cicd_control_node02_deploy_address: 10.10.0.92
-  cicd_control_node02_address: 10.11.0.92
-  cicd_control_node02_hostname: cid02
-  cicd_control_node03_deploy_address: 10.10.0.93
-  cicd_control_node03_address: 10.11.0.93
-  cicd_control_node03_hostname: cid03
-  cicd_control_vip_address: 10.11.0.90
-  cicd_control_vip_hostname: cid
-  cicd_private_key: |-
-    -----BEGIN RSA PRIVATE KEY-----
-    MIIEpAIBAAKCAQEAp+1TRJaP/LuTBLLgVEJpIFHvw8kE/WL0oCVfKaTbbAZHTrpi
-    4Mf3WDdlDrc9ujp4w8r9LC5HXOWLtIotzi9vlIUmvotDYF7H4vvcVVa3NTzpgZHq
-    1vKzraJv7Ay1c+iV5AlG5ExulyrDb7fHdUsh72BZmgLh4zjw21Hk3wEOx5UZ4804
-    eAZgTsTtBrfFtZ7GyF9Lqp2m72Jg7Zqb0VXCBuMi2giaoV3hdNtnftF5zzgMey9l
-    8PbPNvTuNuRo9Lnz3kFq5pnGf1tBRRqbAx7xxPy8q7pzrj9kw3LfJWAGBJN2z4kn
-    GDKvy5TjEIcKRYiKpFZ8tDsVnhJYUaePvrZ/wwIDAQABAoIBAGQ2Zsi5qTfDoJrf
-    PKxL7XySKSmHnuiv0xh29PFfJmqy3H8JD9TgwKTueepsQ/QMzODbFHb3LzMq8VJO
-    W8N933Kce2Cerxilt1enwfdThoXI0fi24ZRgxgVKuMv/UZHYLQsm1h2L1ztzE6pp
-    3CgNLDU0JISaT79Pzby0hIbolK9ZPccmdhcyXOo9T1Xa1hRxnn9zJX4I3B1HEgPr
-    GiZXSWIWDK1tTxb7M2QvXjp/3MGeI5JabxTzdlW6xJgrpTzx4Mms2GjXe5HO/vDq
-    TTv++oOcC+NlHrF64wrtkxAkV3ofA0m15KfZ4KljqinCdyZ07D9fm1kRZC3isLMz
-    xHx/oHECgYEA1UVGOFepQwPXnvZwDzSiOe0TeUy7yZ43r30rXrVf5+KwJDjaKsYW
-    msHzzxjnUopFelAPc5zIM3GQ0TWMtbxpGT5HzoGpDmhegwl4iCRXcBEA/mkcpV/N
-    VpeKUS8LFGu4XnbgJKuJs20rkoYCZSuEhSj1W2nB0u9tSRSzjMMI1m0CgYEAyZJd
-    LccoIh6SflYsYPUA4JTatPgVCZCPYf6tVIh9ov3v5ZbkSNe3N58odbu23dtY799k
-    RhCP4aGlB+VdbMJDsvK6OO3FZbleKdtgu/Eyhkf6BLidWNxRiH9mi4rNzhB3uRo/
-    DzCsH9Z+3aSGwn+kkXppX3GjUImalSmgm/CdkO8CgYEAtoqKpeLyLzf0sEzCcWFd
-    kTMIPgSdnt5bT0tVecTIh9ORbA91PLM72c40fogURqOvABfSgeQpv05u44JwI4VW
-    d5LFJ033gyt16baLgguJA5SqQxd4u1uah4lBjGc1lo70yXX6N6jTPc4tQ0aMekeb
-    L9Z0239TtNXVtn2PiOXOhKkCgYEAwzO0fKKDIReOMj5tV6+sG9DLQ7mDVfHiiLnD
-    TTuov3E/Io1PoaMVUQ4Wdn1Eh/DlXdZuGtPrIkwRr2XVZX9zZBZfdMX+BZbPs6U5
-    NohLr3KAkpXd+rHRW2hU/Al9aHLWHjFmo+U0qthjn2y2/B/0VNXAuacoytOXGaBo
-    YttPG40CgYA18z21jGveCpNwbov3G8eAeSWK6KudCNfjxJ2wqnjaLJQlbDoB89IQ
-    1yt4cQB15Tl2WhuCHSKUanPSG6ke8H4vNSht3aVXqHNFpOCwsfsAol2OcSHGrbhh
-    L+Ptf/em7cJ19QZEOKUGfBhsy6IdZE2+y/U5fbJwNTUMSUVxUfBIYQ==
-    -----END RSA PRIVATE KEY-----
-  cicd_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCn7VNElo/8u5MEsuBUQmkgUe/DyQT9YvSgJV8ppNtsBkdOumLgx/dYN2UOtz26OnjDyv0sLkdc5Yu0ii3OL2+UhSa+i0NgXsfi+9xVVrc1POmBkerW8rOtom/sDLVz6JXkCUbkTG6XKsNvt8d1SyHvYFmaAuHjOPDbUeTfAQ7HlRnjzTh4BmBOxO0Gt8W1nsbIX0uqnabvYmDtmpvRVcIG4yLaCJqhXeF022d+0XnPOAx7L2Xw9s829O425Gj0ufPeQWrmmcZ/W0FFGpsDHvHE/LyrunOuP2TDct8lYAYEk3bPiScYMq/LlOMQhwpFiIqkVny0OxWeElhRp4++tn/D
-
-  compute_bond_mode: active-backup
-  compute_deploy_nic: one1
-  compute_padding_with_zeros: 'True'
-  compute_primary_first_nic: ten1
-  compute_primary_second_nic: ten2
-  context_seed: hfadwDXYaA63EQY0T1Vug9JKAjh6miJ3gdBNBgkBuag5fJvsp9dxZamK7Q9BbVY5
-  control_network_netmask: 255.255.0.0
-  control_network_subnet: 10.11.0.0/16
-  control_vlan: '1110'
-  # cookiecutter_template_credentials: gerrit
-  deploy_network_gateway: 10.10.0.1
-  deploy_network_netmask: 255.255.0.0
-  deploy_network_subnet: 10.10.0.0/16
-  deployment_type: physical
-  dns_server01: 10.10.0.15
-  dns_server02: 10.11.0.15
-  email_address: product@mirantis.com
-  gainsight_service_enabled: 'False'
-  gateway_deploy_nic: one1
-  gateway_primary_first_nic: ten1
-  gateway_primary_second_nic: ten2
-  infra_bond_mode: active-backup
-  infra_deploy_nic: one1
-  #infra_kvm_vip_address: 10.11.0.239
-  infra_kvm_vip_address: 10.11.0.239
-  infra_kvm01_control_address: 10.11.0.241
-  infra_kvm01_deploy_address: 10.10.0.241
-  infra_kvm01_hostname: kvm01
-  infra_kvm02_control_address: 10.11.0.242
-  infra_kvm02_deploy_address: 10.10.0.242
-  infra_kvm02_hostname: kvm02
-  infra_kvm03_control_address: 10.11.0.243
-  infra_kvm03_deploy_address: 10.10.0.243
-  infra_kvm03_hostname: kvm03
-  infra_kvm04_control_address: 10.11.0.244
-  infra_kvm04_deploy_address: 10.10.0.244
-  infra_kvm04_hostname: kvm04
-  infra_kvm05_control_address: 10.11.0.245
-  infra_kvm05_deploy_address: 10.10.0.245
-  infra_kvm05_hostname: kvm05
-  infra_kvm06_control_address: 10.11.0.246
-  infra_kvm06_deploy_address: 10.10.0.246
-  infra_kvm06_hostname: kvm06
-  infra_primary_first_nic: ten1
-  infra_primary_second_nic: ten2
-  # internal_proxy_enabled: 'False'
-  # keycloak_enabled: 'False'
-  # kubernetes_ctl_on_kvm: 'False'
-  local_docker_images: 'True'
-  local_pipelines: 'True'
-  local_python_repo: 'True'
-  local_repo_url: ${_param:aptly_server_deploy_address}
-  # no_platform: 'False'
-  nova_vnc_tls_enabled: 'True'
-  openldap_organisation: ${_param:cluster_name}
-  # openssh_groups: ''
-  # For tempest tests which require access to instnaces via floating ips
-  openstack_create_public_network: 'True'
-  openstack_public_neutron_subnet_gateway: 10.16.250.1
-  openstack_public_neutron_subnet_cidr: 10.16.0.0/16
-  openstack_public_neutron_subnet_allocation_start: 10.16.250.10
-  openstack_public_neutron_subnet_allocation_end: 10.16.254.254
-
-  openstack_benchmark_node01_deploy_address: 10.10.0.95
-  openstack_benchmark_node01_address: 10.11.0.95
-  openstack_benchmark_node01_hostname: bmk01
-  # openstack_cluster_size: small
-  # openstack_cluster_size: small
-  openstack_cluster_size: golden
-  openstack_compute_rack01_hostname: cmp
-  openstack_compute_single_address_ranges: "10.11.0.101-10.11.0.104"
-  openstack_compute_deploy_address_ranges: "10.10.0.101-10.10.0.104"
-  openstack_compute_tenant_address_ranges: "10.12.0.101-10.12.0.104"
-  openstack_compute_backend_address_ranges: "10.11.0.101-10.11.0.104"
-  openstack_control_address: 10.11.0.10
-  openstack_control_hostname: ctl
-  openstack_control_node01_address: 10.11.0.11
-  openstack_control_node01_deploy_address: 10.10.0.11
-  openstack_control_node01_hostname: ctl01
-  openstack_control_node02_address: 10.11.0.12
-  openstack_control_node02_deploy_address: 10.10.0.12
-  openstack_control_node02_hostname: ctl02
-  openstack_control_node03_address: 10.11.0.13
-  openstack_control_node03_deploy_address: 10.10.0.13
-  openstack_control_node03_hostname: ctl03
-  openstack_database_address: 10.11.0.50
-  openstack_database_hostname: dbs
-  openstack_database_node01_address: 10.11.0.51
-  openstack_database_node01_deploy_address: 10.10.0.51
-  openstack_database_node01_hostname: dbs01
-  openstack_database_node02_address: 10.11.0.52
-  openstack_database_node02_deploy_address: 10.10.0.52
-  openstack_database_node02_hostname: dbs02
-  openstack_database_node03_address: 10.11.0.53
-  openstack_database_node03_deploy_address: 10.10.0.53
-  openstack_database_node03_hostname: dbs03
-  openstack_gateway_node01_address: 10.11.0.224
-  openstack_gateway_node01_deploy_address: 10.10.0.224
-  openstack_gateway_node01_tenant_address: 10.12.0.6
-  openstack_gateway_node01_hostname: gtw01
-  openstack_gateway_node02_address: 10.11.0.225
-  openstack_gateway_node02_deploy_address: 10.10.0.225
-  openstack_gateway_node02_tenant_address: 10.12.0.7
-  openstack_gateway_node02_hostname: gtw02
-  openstack_gateway_node03_address: 10.11.0.226
-  openstack_gateway_node03_deploy_address: 10.10.0.226
-  openstack_gateway_node03_tenant_address: 10.12.0.8
-  openstack_gateway_node03_hostname: gtw03
-  openstack_message_queue_address: 10.11.0.40
-  openstack_message_queue_hostname: msg
-  openstack_message_queue_node01_address: 10.11.0.41
-  openstack_message_queue_node01_deploy_address: 10.10.0.41
-  openstack_message_queue_node01_hostname: msg01
-  openstack_message_queue_node02_address: 10.11.0.42
-  openstack_message_queue_node02_deploy_address: 10.10.0.42
-  openstack_message_queue_node02_hostname: msg02
-  openstack_message_queue_node03_address: 10.11.0.43
-  openstack_message_queue_node03_deploy_address: 10.10.0.43
-  openstack_message_queue_node03_hostname: msg03
-  openstack_barbican_address: 10.11.0.44
-  openstack_barbican_hostname: kmn
-  openstack_barbican_node01_address: 10.11.0.45
-  openstack_barbican_node01_deploy_address: 10.10.0.45
-  openstack_barbican_node01_hostname: kmn01
-  openstack_barbican_node02_address: 10.11.0.46
-  openstack_barbican_node02_deploy_address: 10.10.0.46
-  openstack_barbican_node02_hostname: kmn02
-  openstack_barbican_node03_address: 10.11.0.47
-  openstack_barbican_node03_deploy_address: 10.10.0.47
-  openstack_barbican_node03_hostname: kmn03
-  openstack_network_engine: ovs
-  # openstack_neutron_bgp_vpn_driver: bagpipe
-  openstack_neutron_l2gw: 'False'
-  openstack_neutron_bgp_vpn: 'False'
-  openstack_neutron_qos: 'True'
-  openstack_neutron_vlan_aware_vms: 'True'
-  openstack_nfv_dpdk_enabled: 'False'
-  openstack_nfv_sriov_enabled: 'False'
-  openstack_nova_compute_nfv_req_enabled: 'False'
-  # openstack_nova_compute_reserved_host_memory_mb: '900'
-  openstack_ovs_dvr_enabled: 'True'
-  openstack_ovs_encapsulation_type: vxlan
-  openstack_proxy_address: 10.11.0.80
-  # openstack_proxy_address: 10.16.250.9
-  openstack_proxy_vip_interface: ens6
-  openstack_proxy_hostname: prx
-  openstack_proxy_node01_address: 10.11.0.81
-  openstack_proxy_node01_deploy_address: 10.10.0.81
-  openstack_proxy_node01_hostname: prx01
-  openstack_proxy_node02_address: 10.11.0.82
-  openstack_proxy_node02_deploy_address: 10.10.0.82
-  openstack_proxy_node02_hostname: prx02
-  openstack_nginx_proxy_glance_image_size: 30000m
-  openstack_upgrade_node01_address: 10.11.0.19
-  openstack_upgrade_node01_deploy_address: 10.10.0.19
-  openstack_version: pike
-  ovsdb_server: 'ovsdbx:127.0.0.1:6632'
-  ironic_enabled: 'False'
-  openstack_baremetal_address: 10.11.0.5
-  openstack_baremetal_deploy_address: 10.10.0.5
-  openstack_baremetal_hostname: bmt
-  openstack_baremetal_node01_address: 10.11.0.6
-  openstack_baremetal_node02_address: 10.11.0.7
-  openstack_baremetal_node03_address: 10.11.0.8
-  openstack_baremetal_node01_deploy_address: 10.10.0.6
-  openstack_baremetal_node02_deploy_address: 10.10.0.7
-  openstack_baremetal_node03_deploy_address: 10.10.0.8
-  openstack_baremetal_node01_hostname: bmt01
-  openstack_baremetal_node02_hostname: bmt02
-  openstack_baremetal_node03_hostname: bmt03
-  openstack_baremetal_address_baremetal: 10.15.0.10
-  openstack_baremetal_node01_baremetal_address: 10.15.0.11
-  openstack_baremetal_node02_baremetal_address: 10.15.0.12
-  openstack_baremetal_node03_baremetal_address: 10.15.0.13
-  openstack_baremetal_neutron_subnet_cidr: 10.15.0.0/16
-  openstack_baremetal_neutron_subnet_allocation_start: 10.15.90.1
-  openstack_baremetal_neutron_subnet_allocation_end: 10.15.199.255
-  openstack_dns_hostname: dns
-  openstack_dns_node01_address: 10.11.0.54
-  openstack_dns_node01_deploy_address: 10.10.0.54
-  openstack_dns_node01_hostname: dns01
-  openstack_dns_node02_address: 10.11.0.55
-  openstack_dns_node02_deploy_address: 10.10.0.55
-  openstack_dns_node02_hostname: dns02
-
-  openstack_telemetry_address: 10.11.0.35
-  openstack_telemetry_hostname: mdb
-  openstack_telemetry_node01_address: 10.11.0.36
-  openstack_telemetry_node01_deploy_address: 10.10.0.36
-  # openstack_telemetry_node01_storage_address: 10.11.0.36
-  openstack_telemetry_node01_hostname: mdb01
-  openstack_telemetry_node02_address: 10.11.0.37
-  openstack_telemetry_node02_deploy_address: 10.10.0.37
-  # openstack_telemetry_node02_storage_address: 10.11.0.37
-  openstack_telemetry_node02_hostname: mdb02
-  openstack_telemetry_node03_address: 10.11.0.38
-  openstack_telemetry_node03_deploy_address: 10.10.0.38
-  # openstack_telemetry_node03_storage_address: 10.11.0.38
-  openstack_telemetry_node03_hostname: mdb03
-
-  # oss_enabled: 'False'
-  # oss_node03_address: ${_param:stacklight_monitor_node03_address}
-  # oss_webhook_app_id: '24'
-  # oss_webhook_login_id: '13'
-  # platform: openstack_enabled
-  public_host: ${_param:openstack_proxy_address}
-  publication_method: email
-  # physical_lab_setup: 'False'
-  reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
-  salt_api_password: nlRtYRLbBuvqk3b2XJGrSp7HCcDW0Mgr
-  salt_api_password_hash: $6$IXWjGjZz$6YfimiwAzBxmb6hs1IZ2vzdslJiiwQXAN/PdlrxdxLWBlPLb57wkkFRd5wUwXoWAPfAkkZFhP8rUKE14ucQ3e1
-  salt_master_address: 10.11.0.15
-  salt_master_hostname: cfg01
-  salt_master_management_address: 10.10.0.15
-
-  # sriov_network_subnet: 10.55.0.0/16
-  stacklight_log_address: 10.11.0.60
-  stacklight_log_hostname: log
-  stacklight_log_node01_address: 10.11.0.61
-  stacklight_log_node01_deploy_address: 10.10.0.61
-  stacklight_log_node01_hostname: log01
-  stacklight_log_node02_address: 10.11.0.62
-  stacklight_log_node02_deploy_address: 10.10.0.62
-  stacklight_log_node02_hostname: log02
-  stacklight_log_node03_address: 10.11.0.63
-  stacklight_log_node03_deploy_address: 10.10.0.63
-  stacklight_log_node03_hostname: log03
-  stacklight_long_term_storage_type: prometheus
-  stacklight_monitor_address: 10.11.0.70
-  stacklight_monitor_hostname: mon
-  stacklight_monitor_node01_address: 10.11.0.71
-  stacklight_monitor_node01_deploy_address: 10.10.0.71
-  stacklight_monitor_node01_hostname: mon01
-  stacklight_monitor_node02_address: 10.11.0.72
-  stacklight_monitor_node02_deploy_address: 10.10.0.72
-  stacklight_monitor_node02_hostname: mon02
-  stacklight_monitor_node03_address: 10.11.0.73
-  stacklight_monitor_node03_deploy_address: 10.10.0.73
-  stacklight_monitor_node03_hostname: mon03
-  stacklight_telemetry_address: 10.11.0.85
-  stacklight_telemetry_hostname: mtr
-  stacklight_telemetry_node01_address: 10.11.0.86
-  stacklight_telemetry_node01_deploy_address: 10.10.0.86
-  stacklight_telemetry_node01_hostname: mtr01
-  stacklight_telemetry_node02_address: 10.11.0.87
-  stacklight_telemetry_node02_deploy_address: 10.10.0.87
-  stacklight_telemetry_node02_hostname: mtr02
-  stacklight_telemetry_node03_address: 10.11.0.88
-  stacklight_telemetry_node03_deploy_address: 10.10.0.88
-  stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
-  static_ips_on_deploy_network_enabled: 'True'
-  tenant_network_gateway: 10.12.0.1
-  tenant_network_netmask: 255.255.255.0
-  tenant_network_subnet: 10.12.0.0/16
-  tenant_vlan: '1111'
-  use_default_network_scheme: 'False'
-  vnf_onboarding_enabled: 'False'
-  designate_enabled: 'True'
-  galera_ssl_enabled: 'True'
-  openstack_mysql_x509_enabled: 'True'
-  rabbitmq_ssl_enabled: 'True'
-  openstack_rabbitmq_x509_enabled: 'True'
-  openstack_internal_protocol: 'https'
-  tenant_telemetry_enabled: 'True'
-  gnocchi_aggregation_storage: 'ceph'
-  barbican_enabled: 'True'
-  barbican_integration_enabled: 'False'
-  barbican_backend: 'dogtag'
-  openstack_octavia_enabled: 'True'
-  octavia_manager_cluster: 'False'
-  octavia_private_key: |-
-    -----BEGIN RSA PRIVATE KEY-----
-    MIIEpAIBAAKCAQEAtjnPDJsQToHBtoqIo15mdSYpfi8z6DFMi8Gbo0KCN33OUn5u
-    OctbdtjUfeuhvI6px1SCnvyWi09Ft8eWwq+KwLCGKbUxLvqKltuJ7K3LIrGXkt+m
-    qZN4O9XKeVKfZH+mQWkkxRWgX2r8RKNV3GkdNtd74VjhP+R6XSKJQ1Z8b7eHM10v
-    6IjTY/jPczjK+eyCeEj4qbSnV8eKlqLhhquuSQRmUO2DRSjLVdpdf2BB4/BdWFsD
-    YOmX7mb8kpEr9vQ+c1JKMXDwD6ehzyU8kE+1kVm5zOeEy4HdYIMpvUfN49P1anRV
-    2ISQ1ZE+r22IAMKl0tekrGH0e/1NP1DF5rINMwIDAQABAoIBAQCkP/cgpaRNHyg8
-    ISKIHs67SWqdEm73G3ijgB+JSKmW2w7dzJgN//6xYUAnP/zIuM7PnJ0gMQyBBTMS
-    NBTv5spqZLKJZYivj6Tb1Ya8jupKm0jEWlMfBo2ZYVrfgFmrfGOfEebSvmuPlh9M
-    vuzlftmWVSSUOkjODmM9D6QpzgrbpktBuA/WpX+6esMTwJpOcQ5xZWEnHXnVzuTc
-    SncodVweE4gz6F1qorbqIJz8UAUQ5T0OZTdHzIS1IbamACHWaxQfixAO2s4+BoUK
-    ANGGZWkfneCxx7lthvY8DiKn7M5cSRnqFyDToGqaLezdkMNlGC7v3U11FF5blSEW
-    fL1o/HwBAoGBAOavhTr8eqezTchqZvarorFIq7HFWk/l0vguIotu6/wlh1V/KdF+
-    aLLHgPgJ5j+RrCMvTBoKqMeeHfVGrS2udEy8L1mK6b3meG+tMxU05OA55abmhYn7
-    7vF0q8XJmYIHIXmuCgF90R8Piscb0eaMlmHW9unKTKo8EOs5j+D8+AMJAoGBAMo4
-    8WW+D3XiD7fsymsfXalf7VpAt/H834QTbNZJweUWhg11eLutyahyyfjjHV200nNZ
-    cnU09DWKpBbLg7d1pyT69CNLXpNnxuWCt8oiUjhWCUpNqVm2nDJbUdlRFTzYb2fS
-    ZC4r0oQaPD5kMLSipjcwzMWe0PniySxNvKXKInFbAoGBAKxW2qD7uKKKuQSOQUft
-    aAksMmEIAHWKTDdvOA2VG6XvX5DHBLXmy08s7rPfqW06ZjCPCDq4Velzvgvc9koX
-    d/lP6cvqlL9za+x6p5wjPQ4rEt/CfmdcmOE4eY+1EgLrUt314LHGjjG3ScWAiirE
-    QyDrGOIGaYoQf89L3KqIMr0JAoGARYAklw8nSSCUvmXHe+Gf0yKA9M/haG28dCwo
-    780RsqZ3FBEXmYk1EYvCFqQX56jJ25MWX2n/tJcdpifz8Q2ikHcfiTHSI187YI34
-    lKQPFgWb08m1NnwoWrY//yx63BqWz1vjymqNQ5GwutC8XJi5/6Xp+tGGiRuEgJGH
-    EIPUKpkCgYAjBIVMkpNiLCREZ6b+qjrPV96ed3iTUt7TqP7yGlFI/OkORFS38xqC
-    hBP6Fk8iNWuOWQD+ohM/vMMnvIhk5jwlcwn+kF0ra04gi5KBFWSh/ddWMJxUtPC1
-    2htvlEc6zQAR6QfqXHmwhg1hP81JcpqpicQzCMhkzLoR1DC6stXdLg==
-    -----END RSA PRIVATE KEY-----
-  octavia_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2Oc8MmxBOgcG2ioijXmZ1Jil+LzPoMUyLwZujQoI3fc5Sfm45y1t22NR966G8jqnHVIKe/JaLT0W3x5bCr4rAsIYptTEu+oqW24nsrcsisZeS36apk3g71cp5Up9kf6ZBaSTFFaBfavxEo1XcaR0213vhWOE/5HpdIolDVnxvt4czXS/oiNNj+M9zOMr57IJ4SPiptKdXx4qWouGGq65JBGZQ7YNFKMtV2l1/YEHj8F1YWwNg6ZfuZvySkSv29D5zUkoxcPAPp6HPJTyQT7WRWbnM54TLgd1ggym9R83j0/VqdFXYhJDVkT6vbYgAwqXS16SsYfR7/U0/UMXmsg0z
-
-
-## MAAS BEGIN
-  maas_deploy_address: 10.10.0.15
-  maas_deploy_network_name: deploy_network
-  maas_deploy_range_end: 10.10.254.255
-  maas_deploy_range_start: 10.10.254.1
-  maas_deploy_vlan: '0'
-  maas_fabric_name: deploy_fabric
-  maas_hostname: cfg01
-  maas_machines: |
-    kvm04:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      # pxe_interface_mac:
-      pxe_interface_mac: "0c:c4:7a:33:1f:e4"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:33:1f:e4"
-          mode: "static"
-          ip: ${_param:infra_kvm_node04_deploy_address}
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:33:1f:e5"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1e:3e:ea"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1e:3e:eb"
-          name: ten2
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_kvm04_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 1T
-                type: ext4
-
-    kvm05:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:33:20:fc"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:33:20:fc"
-          mode: "static"
-          ip: ${_param:infra_kvm_node05_deploy_address}
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:33:20:fd"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1e:3e:e6"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1e:3e:e7"
-          name: ten2
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_kvm05_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 1T
-                type: ext4
-
-    kvm06:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:31:fb:b6"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:31:fb:b6"
-          mode: "static"
-          ip: ${_param:infra_kvm_node06_deploy_address}
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:31:fb:b7"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1e:3e:fa"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1e:3e:fb"
-          name: ten2
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_kvm06_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 1T
-                type: ext4
-
-    kvm01:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:31:f0:12"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:31:f0:12"
-          mode: "static"
-          ip: ${_param:infra_kvm_node01_deploy_address}
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:31:f0:13"
-          name: one2
-        fourty1:
-          mode: UNCONFIGURED
-          mac: "00:02:c9:44:82:70"
-          name: ten1
-        fourty2:
-          mode: UNCONFIGURED
-          mac: "00:02:c9:44:82:71"
-          name: ten2
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_kvm01_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 120G
-                type: ext4
-
-    kvm02:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:31:ef:bc"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:31:ef:bc"
-          mode: "static"
-          ip: ${_param:infra_kvm_node02_deploy_address}
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:31:ef:bd"
-          name: one2
-        fourty1:
-          mode: UNCONFIGURED
-          mac: "00:02:c9:44:81:40"
-          name: ten1
-        fourty2:
-          mode: UNCONFIGURED
-          mac: "00:02:c9:44:81:41"
-          name: ten2
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_kvm02_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 120G
-                type: ext4
-
-    kvm03:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:31:ef:aa"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:31:ef:aa"
-          mode: "static"
-          ip: ${_param:infra_kvm_node03_deploy_address}
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:31:ef:ab"
-          name: one2
-        fourty1:
-          mode: UNCONFIGURED
-          mac: "e4:1d:2d:72:23:b1"
-          name: ten1
-        fourty2:
-          mode: UNCONFIGURED
-          mac: "e4:1d:2d:72:23:b2"
-          name: ten2
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_kvm03_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 120G
-                type: ext4
-
-    cmp001:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:6d:33:12"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:6d:33:12"
-          mode: "static"
-          ip: 10.10.0.101
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:6d:33:13"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:92:8b:bc"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:92:8b:bd"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:89:65:bc"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:89:65:bd"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_cmp001_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sdc
-        disk:
-          vgroot:
-            devices:
-              - sdc
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 240G
-                type: ext4
-
-    cmp002:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:cb:6a"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:cb:6a"
-          mode: "static"
-          ip: 10.10.0.102
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:cb:6b"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:58:41:d0"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:58:41:d1"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1f:00:18"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1f:00:19"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_cmp002_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 240G
-                type: ext4
-
-    cmp003:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:91:5a"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:91:5a"
-          mode: "static"
-          ip: 10.10.0.103
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:91:5b"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:97:e5:9c"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:97:e5:9d"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:a4:70:7c"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:a4:70:7d"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_cmp003_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sdc
-        disk:
-          vgroot:
-            devices:
-              - sdc
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 240G
-                type: ext4
-
-    cmp004:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:cb:5a"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:cb:5a"
-          mode: "static"
-          ip: 10.10.0.104
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:cb:5b"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:87:17:90"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:87:17:91"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:89:45:74"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:89:45:75"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_cmp004_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sdc
-        disk:
-          vgroot:
-            devices:
-              - sdc
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 240G
-                type: ext4
-
-    # OSD Nodes
-    osd001:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:cb:7a"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:cb:7a"
-          mode: "static"
-          ip: 10.10.0.201
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:cb:7b"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "90:e2:ba:1a:6c:98"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "90:e2:ba:1a:6c:99"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:97:df:84"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:97:df:85"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_osd001_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 240G
-                type: ext4
-
-    osd002:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:6d:2e:1e"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:6d:2e:1e"
-          mode: "static"
-          ip: 10.10.0.202
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:6d:2e:1f"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:6d:20"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:6d:21"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:70:e8"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:70:e9"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_osd002_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sdc
-        disk:
-          vgroot:
-            devices:
-              - sdc
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 240G
-                type: ext4
-
-    osd003:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:d1:10"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:d1:10"
-          mode: "static"
-          ip: 10.10.0.203
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:d1:11"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8a:c1:90"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8a:c1:91"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:92:a3:10"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:92:a3:11"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_osd003_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sdc
-        disk:
-          vgroot:
-            devices:
-              - sdc
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 240G
-                type: ext4
-
-    # GTW Nodes
-    gtw01:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:d6:76"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:d6:76"
-          mode: "static"
-          ip: 10.10.0.224
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:d6:77"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:7c:5d:90"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:7c:5d:91"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:3e:e8"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:3e:e9"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_gtw01_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 1T
-                type: ext4
-
-    gtw02:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:c9:64"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:c9:64"
-          mode: "static"
-          ip: 10.10.0.225
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:c9:65"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:7c:a8:4c"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:7c:a8:4d"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:13:b8"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:13:b9"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_gtw02_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sdc
-        disk:
-          vgroot:
-            devices:
-              - sdc
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 1T
-                type: ext4
-
-    gtw03:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:cb:78"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:cb:78"
-          mode: "static"
-          ip: 10.10.0.226
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:cb:79"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8a:80:48"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8a:80:49"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:89:6e:40"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:89:6e:41"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_gtw03_ip}
-        power_type: ipmi
-      disk_layout:
-        bootable_device: sdc
-        type: custom
-        disk:
-          vgroot:
-            devices:
-              - sdc
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 1T
-                type: ext4
-#$ MAAS END
-
-
-
-
-nodes:
-  # cfg01.mcp-offline-vxlan.local:
-  #   reclass_storage_name: infra_config_node01
-  #   classes:
-  #   - cluster.${_param:cluster_name}.infra.config
-  #   - cluster.${_param:cluster_name}.infra.networking.ens5_config
-  #   roles:
-  #   - infra_config
-  #   - linux_system_codename_xenial
-  #   interfaces:
-  #     ens3:
-  #       role: single_mgm
-  #       deploy_address: 10.10.0.15
-  #       deploy_network_netmask: 255.255.0.0
-  #       deploy_network_gateway: 10.10.0.1
-  #     ens4:
-  #       role: single_ctl
-  #       single_address: 10.11.0.15
-
-  apt.mcp-offline-vxlan.local:
-    reclass_storage_name: aptly_server_node01
-    roles:
-    - linux_system_codename_xenial
-    classes:
-    - cluster.${_param:cluster_name}.infra
-    interfaces:
-      ens3:
-        role: single_mgm
-        deploy_address: 10.10.0.14
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-
-  kvm01.mcp-offline-vxlan.local:
-    reclass_storage_name: infra_kvm_node01
-    roles:
-    - infra_kvm
-    - linux_system_codename_xenial
-    # - features_vcp_gateway
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.241
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.241
-        tenant_address: 10.12.0.241
-      ten2:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.241
-        tenant_address: 10.12.0.241
-
-  kvm02.mcp-offline-vxlan.local:
-    reclass_storage_name: infra_kvm_node02
-    roles:
-    - infra_kvm
-    - linux_system_codename_xenial
-    # - features_vcp_gateway
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.242
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.242
-        tenant_address: 10.12.0.242
-      ten2:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.242
-        tenant_address: 10.12.0.242
-
-  kvm03.mcp-offline-vxlan.local:
-    reclass_storage_name: infra_kvm_node03
-    roles:
-    - infra_kvm
-    - linux_system_codename_xenial
-    # - features_vcp_gateway
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.243
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.243
-        tenant_address: 10.12.0.243
-      ten2:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.243
-        tenant_address: 10.12.0.243
-
-  kvm04.mcp-offline-vxlan.local:
-    reclass_storage_name: infra_kvm_node04
-    roles:
-    - infra_kvm_wo_gluster
-    - linux_system_codename_xenial
-    - salt_master_host
-    # - features_vcp_gateway
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.244
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.244
-        tenant_address: 10.12.0.244
-      ten2:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.244
-        tenant_address: 10.12.0.244
-
-  kvm05.mcp-offline-vxlan.local:
-    reclass_storage_name: infra_kvm_node05
-    roles:
-    - infra_kvm_wo_gluster
-    - linux_system_codename_xenial
-    - salt_master_host
-    # - features_vcp_gateway
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.245
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.245
-        tenant_address: 10.12.0.245
-      ten2:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.245
-        tenant_address: 10.12.0.245
-
-  kvm06.mcp-offline-vxlan.local:
-    reclass_storage_name: infra_kvm_node06
-    roles:
-    - infra_kvm_wo_gluster
-    - linux_system_codename_xenial
-    - salt_master_host
-    # - features_vcp_gateway
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.246
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.246
-        tenant_address: 10.12.0.246
-      ten2:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.246
-        tenant_address: 10.12.0.246
-
-  cmp<<count>>.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_compute_rack01
-    roles:
-    - openstack_compute
-    - linux_system_codename_xenial
-    interfaces:
-      one1:
-        role: single_mgm
-      ten1:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # external_vlan: 1112
-        # external_address: 10.16.0.224
-        # external_network_netmask: 255.255.0.0
-      ten2:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # external_vlan: 1112
-
-  osd<<count>>.mcp-offline-vxlan.local:
-    reclass_storage_name: ceph_osd_rack01
-    roles:
-    - ceph_osd
-    - linux_system_codename_xenial
-    interfaces:
-      one1:
-        role: single_mgm
-      ten1:
-        role: bond0_ab_vlan_ceph_public_backend
-      ten2:
-        role: bond0_ab_vlan_ceph_public_backend
-
-  gtw01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_gateway_node01
-    roles:
-    - openstack_gateway_octavia
-    - linux_system_codename_xenial
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.224
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        single_address: 10.11.0.224
-        tenant_address: 10.12.0.224
-        external_address: 10.16.0.224
-        external_network_netmask: 255.255.0.0
-        external_vlan: 1112
-      ten2:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        single_address: 10.11.0.224
-        tenant_address: 10.12.0.224
-        external_address: 10.16.0.224
-        external_network_netmask: 255.255.0.0
-        external_vlan: 1112
-
-  gtw02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_gateway_node02
-    roles:
-    - openstack_gateway
-    - linux_system_codename_xenial
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.225
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external
-        single_address: 10.11.0.225
-        tenant_address: 10.12.0.225
-        external_address: 10.16.0.225
-        external_network_netmask: 255.255.0.0
-        external_vlan: 1112
-      ten2:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external
-        single_address: 10.11.0.225
-        tenant_address: 10.12.0.225
-        external_address: 10.16.0.225
-        external_network_netmask: 255.255.0.0
-        external_vlan: 1112
-
-  gtw03.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_gateway_node03
-    roles:
-    - openstack_gateway
-    - linux_system_codename_xenial
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.226
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external
-        single_address: 10.11.0.226
-        tenant_address: 10.12.0.226
-        external_address: 10.16.0.226
-        external_network_netmask: 255.255.0.0
-        external_vlan: 1112
-      ten2:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external
-        single_address: 10.11.0.226
-        tenant_address: 10.12.0.226
-        external_address: 10.16.0.226
-        external_network_netmask: 255.255.0.0
-        external_vlan: 1112
-
-
-  ######
-  ######
-  #
-  # VCP Nodes
-  #
-  ######
-  ######
-
-  ctl01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_control_node01
-    roles:
-    - openstack_control_leader
-    - linux_system_codename_xenial
-    - features_control_external_vlan
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.11
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-        # keepalived_vip_priority: 103
-
-  ctl02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_control_node02
-    roles:
-    - openstack_control
-    - linux_system_codename_xenial
-    - features_control_external_vlan
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.12
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-        # keepalived_vip_priority: 102
-
-  ctl03.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_control_node03
-    roles:
-    - openstack_control
-    - linux_system_codename_xenial
-    - features_control_external_vlan
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.13
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-        # keepalived_vip_priority: 101
-
-  # gtw01.mcp-offline-vxlan.local:
-  #   reclass_storage_name: openstack_gateway_node01
-  #   roles:
-  #   - openstack_gateway
-  #   - linux_system_codename_xenial
-  #   interfaces:
-  #     ens2:
-  #       role: single_mgm
-  #     ens3:
-  #       role: single_ctl
-  #     ens4:
-  #       role: bond0_ab_ovs_vxlan_mesh
-  #     ens5:
-  #       role: bond0_ab_ovs_vxlan_mesh
-
-  # gtw02.mcp-offline-vxlan.local:
-  #   reclass_storage_name: openstack_gateway_node02
-  #   roles:
-  #   - openstack_gateway
-  #   - linux_system_codename_xenial
-  #   interfaces:
-  #     ens2:
-  #       role: single_mgm
-  #     ens3:
-  #       role: single_ctl
-  #     ens4:
-  #       role: bond0_ab_ovs_vxlan_mesh
-  #     ens5:
-  #       role: bond0_ab_ovs_vxlan_mesh
-
-  # gtw03.mcp-offline-vxlan.local:
-  #   reclass_storage_name: openstack_gateway_node03
-  #   roles:
-  #   - openstack_gateway
-  #   - linux_system_codename_xenial
-  #   interfaces:
-  #     ens2:
-  #       role: single_mgm
-  #     ens3:
-  #       role: single_ctl
-  #     ens4:
-  #       role: bond0_ab_ovs_vxlan_mesh
-  #     ens5:
-  #       role: bond0_ab_ovs_vxlan_mesh
-
-  cid01.mcp-offline-vxlan.local:
-    reclass_storage_name: cicd_control_node01
-    roles:
-    - cicd_control_leader
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.91
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-
-  cid02.mcp-offline-vxlan.local:
-    reclass_storage_name: cicd_control_node02
-    roles:
-    - cicd_control_manager
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.92
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-
-  cid03.mcp-offline-vxlan.local:
-    reclass_storage_name: cicd_control_node03
-    roles:
-    - cicd_control_manager
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.93
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-
-  dbs01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_database_node01
-    roles:
-    - openstack_database_leader
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.51
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-
-  dbs02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_database_node02
-    roles:
-    - openstack_database
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.52
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-
-  dbs03.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_database_node03
-    roles:
-    - openstack_database
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.53
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-
-  msg01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_message_queue_node01
-    roles:
-    - openstack_message_queue
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  msg02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_message_queue_node02
-    roles:
-    - openstack_message_queue
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  msg03.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_message_queue_node03
-    roles:
-    - openstack_message_queue
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  prx01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_proxy_node01
-    roles:
-    - openstack_proxy
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  prx02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_proxy_node02
-    roles:
-    - openstack_proxy
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  dns01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_dns_node01
-    roles:
-    - openstack_dns
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  dns02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_dns_node02
-    roles:
-    - openstack_dns
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mon01.mcp-offline-vxlans.local:
-    reclass_storage_name: stacklight_server_node01
-    roles:
-    - stacklightv2_server_leader
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mon02.mcp-offline-vxlans.local:
-    reclass_storage_name: stacklight_server_node02
-    roles:
-    - stacklightv2_server
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mon03.mcp-offline-vxlans.local:
-    reclass_storage_name: stacklight_server_node03
-    roles:
-    - stacklightv2_server
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  log01.mcp-offline-vxlan.local:
-    reclass_storage_name: stacklight_log_node01
-    roles:
-    - stacklight_log_leader_v2
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  log02.mcp-offline-vxlan.local:
-    reclass_storage_name: stacklight_log_node02
-    roles:
-    - stacklight_log
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  log03.mcp-offline-vxlan.local:
-    reclass_storage_name: stacklight_log_node03
-    roles:
-    - stacklight_log
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mtr01.mcp-offline-vxlan.local:
-    reclass_storage_name: stacklight_telemetry_node01
-    roles:
-    - stacklight_telemetry_leader
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mtr02.mcp-offline-vxlan.local:
-    reclass_storage_name: stacklight_telemetry_node02
-    roles:
-    - stacklight_telemetry
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mtr03.mcp-offline-vxlan.local:
-    reclass_storage_name: stacklight_telemetry_node03
-    roles:
-    - stacklight_telemetry
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-
-  cmn01.mcp-offline-vxlan.local:
-    reclass_storage_name: ceph_mon_node01
-    roles:
-    - ceph_mon
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  cmn02.mcp-offline-vxlan.local:
-    reclass_storage_name: ceph_mon_node02
-    roles:
-    - ceph_mon
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  cmn03.mcp-offline-vxlan.local:
-    reclass_storage_name: ceph_mon_node03
-    roles:
-    - ceph_mon
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  rgw01.mcp-offline-vxlan.local:
-    reclass_storage_name: ceph_rgw_node01
-    roles:
-    - ceph_rgw
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  rgw02.mcp-offline-vxlan.local:
-    reclass_storage_name: ceph_rgw_node02
-    roles:
-    - ceph_rgw
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  rgw03.mcp-offline-vxlan.local:
-    reclass_storage_name: ceph_rgw_node03
-    roles:
-    - ceph_rgw
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mdb01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_telemetry_node01
-    roles:
-    - openstack_telemetry
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mdb02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_telemetry_node02
-    roles:
-    - openstack_telemetry
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mdb03.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_telemetry_node03
-    roles:
-    - openstack_telemetry
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  kmn01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_barbican_node01
-    roles:
-    - openstack_barbican
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  kmn02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_barbican_node02
-    roles:
-    - openstack_barbican
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  kmn03.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_barbican_node03
-    roles:
-    - openstack_barbican
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
diff --git a/tcp_tests/templates/physical-mcp-offline-vxlan/context-golden-ovs-offline-queens.yml b/tcp_tests/templates/physical-mcp-offline-vxlan/context-golden-ovs-offline-queens.yml
deleted file mode 100644
index 9ededfe..0000000
--- a/tcp_tests/templates/physical-mcp-offline-vxlan/context-golden-ovs-offline-queens.yml
+++ /dev/null
@@ -1,2041 +0,0 @@
-default_context:
-  # alertmanager_notification_email_enabled: 'True'
-  # alertmanager_notification_email_from: john.doe@example.org
-  # alertmanager_notification_email_hostname: 127.0.0.1
-  # alertmanager_notification_email_password: password
-  # alertmanager_notification_email_port: '587'
-  # alertmanager_notification_email_require_tls: 'True'
-  # alertmanager_notification_email_to: jane.doe@example.org
-  # auditd_enabled: 'False'
-# "=== CLUSTER GLOBALS ==="
-  cluster_domain: mcp-offline-vxlan.local
-  cluster_name: mcp-offline-vxlan
-  openldap_domain: mcp-offline-vxlan.local
-  mcp_version: 2019.2.0
-  cookiecutter_template_branch: master
-  cookiecutter_template_url: https://gerrit.mcp.mirantis.net/mk/cookiecutter-templates.git
-  shared_reclass_branch: ''
-  shared_reclass_url: https://gerrit.mcp.mirantis.net/salt-models/reclass-system.git
-  mcp_common_scripts_branch: ''
-
-# "=== COMPONENT SWITCHES ==="
-  cicd_enabled: 'True'
-  infra_enabled:      'True'
-  kubernetes_enabled: 'False'
-  ceph_enabled: 'True'
-  opencontrail_enabled: 'False'
-  openstack_enabled: 'True'
-  stacklight_enabled: 'True'
-  manila_enabled: 'False'
-
-# === CICD|INFRA COMPONENT SWITCHES ==="
-  maas_enabled: 'True'
-  openldap_enabled: 'True'
-  local_repositories: 'True'
-  offline_deployment: 'True'
-# Other
-  bmk_enabled: 'False'
-  upstream_proxy_enabled: 'False'
-  fluentd_enabled: 'True'
-## END of basic CC config
-  ceph_osd_count: '3'
-  openstack_compute_count: '4'
-  openscap_enabled: 'True'
-  openssh_groups: "qa_scale,oscore_devops,networking,stacklight,k8s_team,mcp_qa,drivetrain"
-  backup_private_key: |-
-    -----BEGIN RSA PRIVATE KEY-----
-    MIIEogIBAAKCAQEArK5R0R/X4kmWID1A+/vIH/L2wT2SJOCZ9hw/byVVUANJUI0U
-    bDPap3fYMsC/w8/sfb0hI7QjXvKKTT1fSTzKwt8idMrSMQfnjPIbwcFfu6E5i7jv
-    RfqY4g9mspP6tkeoiolxw5BMdxnKaNIJ00T4/uIr4naiGK1OEqzFN9k6aFBMkYhh
-    IAahLM60Ja4ANy521LO2O5NDarVze9l3Mk77diKPm+OFkfc9XgxTxj92vhuG0B6X
-    7Z9nMuF4zxXZascu7wqiMkQnaq0pABJEcXbhLxjFvno7g8e5NuwYcTwuazkx8+Di
-    mdC1uTD91EFrvc7hnFHGzXU843xejkMDPaWt6wIDAQABAoIBAFDVvZku1empVuy6
-    n+wVvmYuX5KwVvSKa6hJKuzFxj0RfMWHdXL9hzL0KDICBwMMF4H5AkVrc09kLJfh
-    zfRD0AsPV1rjAyhOsfdJ8vJtqnn0DDM7HE9e8yiH2yRnn2qq+tv3YVkR+KmcWiNd
-    h5nt5L20dKSrsk/o+O5HEH+HYg8oGrmZYLmq5qOMLp2JGfKH7BS5a8z2fIrFdGeN
-    CStkFbv3vIgzu7X+S40s3b0tfgXz0Kdg+yUZb86i4qm3AjiWhb39jJ7wnw6m9dtQ
-    2ynBHRZs7Sir9C7nUJL0JicVg+w/Lpp4fBnR3Q7kuu7o2jYKMdykYsUtpnJ6Y3iF
-    il2pTgkCgYEA3jEwx7v+Ch7LN98cE0EWjQS9kGnQKwbbuz49IyKBLHXQqfwHQUvJ
-    nXRQSRQmHJUElzN3CfGq+FJz5xP7ZKWQdQZsEjMZ3hWvGIuJgLZAdUdq8bF64NVF
-    eaRinuaoKu5pzUr8FzkGsqItwgqgK1HU2peEmjdJHE6ZeF0RrPj8EkUCgYEAxvSS
-    jvn6fD+hnsHjEC+2i4GPn4l2lKMVu02UC22LKQeAJW1B4MbmZEeOaBYuQN+ARYIf
-    RLPP4HPgmod+23o7hYJsFwxDlBzkdY30MhTyW2MEvUx7ND1pelth40FmYtEWoZXq
-    7EC0dZYeC7fXXVHQOPHw3k1r+VQAR854HZ/P2m8CgYAKyN5yQ2iwOxBoFNc7BATB
-    MYK1+LzW6c1OiFXVV75nVwyaw5XikHgnwVaIRYcYCg+f+yqC/AztYqsngyvHldWu
-    KHKka4CM7AaErXkuGyqDxsSlGJU7Rn7JybXTuqRc+Rd/lG0p/2WY1BBeg7+EesNX
-    HNWd2qMc0Z/XXMUX3Tn29QKBgCIuyy99i6flVuNr9JNHX1nAvOhwOct36bfwsEr2
-    Wz6FZ2MGzpbMFbGNCc6gYPoMbIGExdKMAl9SCXkDZqxW5/scWW3sUYAVJrt71ET2
-    jF1fOeU8Sr7C/mhjYwIkrm6z9et1UpOc2mSJkkf5IiuKbvgZuYS4UKDZ6eJsev68
-    An5JAoGAJTQ1wQXo8Gp1oI1hXG70zoU9AjSVin6rs8cAWzoqdr5aLiTD1OtMeEMF
-    AupRxHgOVKb7RZoePcdusTEErWaYvxPS6vAeGgHf/aKIb8BDL4Rn7FS1DAa8R+s9
-    FN15hAhG2BGLujWvwLWL3aLlxmYWukSmx5QBa//TaFwIJvqF7HU=
-    -----END RSA PRIVATE KEY-----
-  backup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsrlHRH9fiSZYgPUD7+8gf8vbBPZIk4Jn2HD9vJVVQA0lQjRRsM9qnd9gywL/Dz+x9vSEjtCNe8opNPV9JPMrC3yJ0ytIxB+eM8hvBwV+7oTmLuO9F+pjiD2ayk/q2R6iKiXHDkEx3Gcpo0gnTRPj+4ividqIYrU4SrMU32TpoUEyRiGEgBqEszrQlrgA3LnbUs7Y7k0NqtXN72XcyTvt2Io+b44WR9z1eDFPGP3a+G4bQHpftn2cy4XjPFdlqxy7vCqIyRCdqrSkAEkRxduEvGMW+ejuDx7k27BhxPC5rOTHz4OKZ0LW5MP3UQWu9zuGcUcbNdTzjfF6OQwM9pa3r
-  ceph_cluster_network: 10.11.0.0/16
-
-
-
-  aptly_server_control_address: 10.11.0.14
-  aptly_server_deploy_address: 10.10.0.14
-  aptly_server_hostname: apt
-
-
-  # backend_network_netmask: 255.255.0.0
-  # backend_network_subnet: 10.11.0.0/16
-  backend_vlan: '1111'
-
-  ceph_hyper_converged: 'False'
-  ceph_mon_node01_deploy_address: 10.10.0.66
-  ceph_mon_node01_address: 10.11.0.66
-  ceph_mon_node01_ceph_public_address: 10.11.0.66
-  ceph_mon_node01_hostname: cmn01
-  ceph_mon_node02_deploy_address: 10.10.0.67
-  ceph_mon_node02_address: 10.11.0.67
-  ceph_mon_node02_ceph_public_address: 10.11.0.67
-  ceph_mon_node02_hostname: cmn02
-  ceph_mon_node03_deploy_address: 10.10.0.68
-  ceph_mon_node03_address: 10.11.0.68
-  ceph_mon_node03_ceph_public_address: 10.11.0.68
-  ceph_mon_node03_hostname: cmn03
-  ceph_osd_backend: bluestore
-  ceph_osd_block_db_size: '20'
-  ceph_osd_bond_mode: active-backup
-  ceph_osd_data_disks: /dev/sdb
-  ceph_osd_journal_or_block_db_disks: /dev/sdb
-  ceph_osd_node_count: '5'
-  ceph_osd_primary_first_nic: ten1
-  ceph_osd_primary_second_nic: ten2
-  ceph_osd_rack01_hostname: osd
-  ceph_osd_single_address_ranges: "10.11.0.201-10.11.0.203"
-  ceph_osd_deploy_address_ranges: "10.10.0.201-10.10.0.203"
-  ceph_osd_ceph_public_address_ranges: "10.11.0.201-10.11.0.203"
-  ceph_osd_backend_address_ranges: "10.13.0.201-10.13.0.203"
-  ceph_public_vlan: '1110'
-
-  ceph_public_network: 10.11.0.0/16
-  ceph_rgw_address: 10.11.0.75
-  ceph_rgw_hostname: rgw
-  ceph_rgw_node01_deploy_address: 10.10.0.76
-  ceph_rgw_node01_address: 10.11.0.76
-  ceph_rgw_node01_hostname: rgw01
-  ceph_rgw_node02_deploy_address: 10.10.0.77
-  ceph_rgw_node02_address: 10.11.0.77
-  ceph_rgw_node02_hostname: rgw02
-  ceph_rgw_node03_deploy_address: 10.10.0.78
-  ceph_rgw_node03_address: 10.11.0.78
-  ceph_rgw_node03_hostname: rgw03
-  ceph_version: luminous
-  cicd_control_node01_deploy_address: 10.10.0.91
-  cicd_control_node01_address: 10.11.0.91
-  cicd_control_node01_hostname: cid01
-  cicd_control_node02_deploy_address: 10.10.0.92
-  cicd_control_node02_address: 10.11.0.92
-  cicd_control_node02_hostname: cid02
-  cicd_control_node03_deploy_address: 10.10.0.93
-  cicd_control_node03_address: 10.11.0.93
-  cicd_control_node03_hostname: cid03
-  cicd_control_vip_address: 10.11.0.90
-  cicd_control_vip_hostname: cid
-  cicd_private_key: |-
-    -----BEGIN RSA PRIVATE KEY-----
-    MIIEpAIBAAKCAQEAp+1TRJaP/LuTBLLgVEJpIFHvw8kE/WL0oCVfKaTbbAZHTrpi
-    4Mf3WDdlDrc9ujp4w8r9LC5HXOWLtIotzi9vlIUmvotDYF7H4vvcVVa3NTzpgZHq
-    1vKzraJv7Ay1c+iV5AlG5ExulyrDb7fHdUsh72BZmgLh4zjw21Hk3wEOx5UZ4804
-    eAZgTsTtBrfFtZ7GyF9Lqp2m72Jg7Zqb0VXCBuMi2giaoV3hdNtnftF5zzgMey9l
-    8PbPNvTuNuRo9Lnz3kFq5pnGf1tBRRqbAx7xxPy8q7pzrj9kw3LfJWAGBJN2z4kn
-    GDKvy5TjEIcKRYiKpFZ8tDsVnhJYUaePvrZ/wwIDAQABAoIBAGQ2Zsi5qTfDoJrf
-    PKxL7XySKSmHnuiv0xh29PFfJmqy3H8JD9TgwKTueepsQ/QMzODbFHb3LzMq8VJO
-    W8N933Kce2Cerxilt1enwfdThoXI0fi24ZRgxgVKuMv/UZHYLQsm1h2L1ztzE6pp
-    3CgNLDU0JISaT79Pzby0hIbolK9ZPccmdhcyXOo9T1Xa1hRxnn9zJX4I3B1HEgPr
-    GiZXSWIWDK1tTxb7M2QvXjp/3MGeI5JabxTzdlW6xJgrpTzx4Mms2GjXe5HO/vDq
-    TTv++oOcC+NlHrF64wrtkxAkV3ofA0m15KfZ4KljqinCdyZ07D9fm1kRZC3isLMz
-    xHx/oHECgYEA1UVGOFepQwPXnvZwDzSiOe0TeUy7yZ43r30rXrVf5+KwJDjaKsYW
-    msHzzxjnUopFelAPc5zIM3GQ0TWMtbxpGT5HzoGpDmhegwl4iCRXcBEA/mkcpV/N
-    VpeKUS8LFGu4XnbgJKuJs20rkoYCZSuEhSj1W2nB0u9tSRSzjMMI1m0CgYEAyZJd
-    LccoIh6SflYsYPUA4JTatPgVCZCPYf6tVIh9ov3v5ZbkSNe3N58odbu23dtY799k
-    RhCP4aGlB+VdbMJDsvK6OO3FZbleKdtgu/Eyhkf6BLidWNxRiH9mi4rNzhB3uRo/
-    DzCsH9Z+3aSGwn+kkXppX3GjUImalSmgm/CdkO8CgYEAtoqKpeLyLzf0sEzCcWFd
-    kTMIPgSdnt5bT0tVecTIh9ORbA91PLM72c40fogURqOvABfSgeQpv05u44JwI4VW
-    d5LFJ033gyt16baLgguJA5SqQxd4u1uah4lBjGc1lo70yXX6N6jTPc4tQ0aMekeb
-    L9Z0239TtNXVtn2PiOXOhKkCgYEAwzO0fKKDIReOMj5tV6+sG9DLQ7mDVfHiiLnD
-    TTuov3E/Io1PoaMVUQ4Wdn1Eh/DlXdZuGtPrIkwRr2XVZX9zZBZfdMX+BZbPs6U5
-    NohLr3KAkpXd+rHRW2hU/Al9aHLWHjFmo+U0qthjn2y2/B/0VNXAuacoytOXGaBo
-    YttPG40CgYA18z21jGveCpNwbov3G8eAeSWK6KudCNfjxJ2wqnjaLJQlbDoB89IQ
-    1yt4cQB15Tl2WhuCHSKUanPSG6ke8H4vNSht3aVXqHNFpOCwsfsAol2OcSHGrbhh
-    L+Ptf/em7cJ19QZEOKUGfBhsy6IdZE2+y/U5fbJwNTUMSUVxUfBIYQ==
-    -----END RSA PRIVATE KEY-----
-  cicd_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCn7VNElo/8u5MEsuBUQmkgUe/DyQT9YvSgJV8ppNtsBkdOumLgx/dYN2UOtz26OnjDyv0sLkdc5Yu0ii3OL2+UhSa+i0NgXsfi+9xVVrc1POmBkerW8rOtom/sDLVz6JXkCUbkTG6XKsNvt8d1SyHvYFmaAuHjOPDbUeTfAQ7HlRnjzTh4BmBOxO0Gt8W1nsbIX0uqnabvYmDtmpvRVcIG4yLaCJqhXeF022d+0XnPOAx7L2Xw9s829O425Gj0ufPeQWrmmcZ/W0FFGpsDHvHE/LyrunOuP2TDct8lYAYEk3bPiScYMq/LlOMQhwpFiIqkVny0OxWeElhRp4++tn/D
-
-  compute_bond_mode: active-backup
-  compute_deploy_nic: one1
-  compute_padding_with_zeros: 'True'
-  compute_primary_first_nic: ten1
-  compute_primary_second_nic: ten2
-  context_seed: hfadwDXYaA63EQY0T1Vug9JKAjh6miJ3gdBNBgkBuag5fJvsp9dxZamK7Q9BbVY5
-  control_network_netmask: 255.255.0.0
-  control_network_subnet: 10.11.0.0/16
-  control_vlan: '1110'
-  # cookiecutter_template_credentials: gerrit
-  deploy_network_gateway: 10.10.0.1
-  deploy_network_netmask: 255.255.0.0
-  deploy_network_subnet: 10.10.0.0/16
-  deployment_type: physical
-  dns_server01: 10.10.0.15
-  dns_server02: 10.11.0.15
-  email_address: product@mirantis.com
-  gainsight_service_enabled: 'False'
-  gateway_deploy_nic: one1
-  gateway_primary_first_nic: ten1
-  gateway_primary_second_nic: ten2
-  infra_bond_mode: active-backup
-  infra_deploy_nic: one1
-  #infra_kvm_vip_address: 10.11.0.239
-  infra_kvm_vip_address: 10.11.0.239
-  infra_kvm01_control_address: 10.11.0.241
-  infra_kvm01_deploy_address: 10.10.0.241
-  infra_kvm01_hostname: kvm01
-  infra_kvm02_control_address: 10.11.0.242
-  infra_kvm02_deploy_address: 10.10.0.242
-  infra_kvm02_hostname: kvm02
-  infra_kvm03_control_address: 10.11.0.243
-  infra_kvm03_deploy_address: 10.10.0.243
-  infra_kvm03_hostname: kvm03
-  infra_kvm04_control_address: 10.11.0.244
-  infra_kvm04_deploy_address: 10.10.0.244
-  infra_kvm04_hostname: kvm04
-  infra_kvm05_control_address: 10.11.0.245
-  infra_kvm05_deploy_address: 10.10.0.245
-  infra_kvm05_hostname: kvm05
-  infra_kvm06_control_address: 10.11.0.246
-  infra_kvm06_deploy_address: 10.10.0.246
-  infra_kvm06_hostname: kvm06
-  infra_primary_first_nic: ten1
-  infra_primary_second_nic: ten2
-  # internal_proxy_enabled: 'False'
-  # keycloak_enabled: 'False'
-  # kubernetes_ctl_on_kvm: 'False'
-  local_docker_images: 'True'
-  local_pipelines: 'True'
-  local_python_repo: 'True'
-  local_repo_url: ${_param:aptly_server_deploy_address}
-  # no_platform: 'False'
-  nova_vnc_tls_enabled: 'True'
-  openldap_organisation: ${_param:cluster_name}
-  # openssh_groups: ''
-  # For tempest tests which require access to instnaces via floating ips
-  openstack_create_public_network: 'True'
-  openstack_public_neutron_subnet_gateway: 10.16.250.1
-  openstack_public_neutron_subnet_cidr: 10.16.0.0/16
-  openstack_public_neutron_subnet_allocation_start: 10.16.250.10
-  openstack_public_neutron_subnet_allocation_end: 10.16.254.254
-
-  openstack_benchmark_node01_deploy_address: 10.10.0.95
-  openstack_benchmark_node01_address: 10.11.0.95
-  openstack_benchmark_node01_hostname: bmk01
-  # openstack_cluster_size: small
-  # openstack_cluster_size: small
-  openstack_cluster_size: golden
-  openstack_compute_rack01_hostname: cmp
-  openstack_compute_single_address_ranges: "10.11.0.101-10.11.0.104"
-  openstack_compute_deploy_address_ranges: "10.10.0.101-10.10.0.104"
-  openstack_compute_tenant_address_ranges: "10.12.0.101-10.12.0.104"
-  openstack_compute_backend_address_ranges: "10.11.0.101-10.11.0.104"
-  openstack_control_address: 10.11.0.10
-  openstack_control_hostname: ctl
-  openstack_control_node01_address: 10.11.0.11
-  openstack_control_node01_deploy_address: 10.10.0.11
-  openstack_control_node01_hostname: ctl01
-  openstack_control_node02_address: 10.11.0.12
-  openstack_control_node02_deploy_address: 10.10.0.12
-  openstack_control_node02_hostname: ctl02
-  openstack_control_node03_address: 10.11.0.13
-  openstack_control_node03_deploy_address: 10.10.0.13
-  openstack_control_node03_hostname: ctl03
-  openstack_database_address: 10.11.0.50
-  openstack_database_hostname: dbs
-  openstack_database_node01_address: 10.11.0.51
-  openstack_database_node01_deploy_address: 10.10.0.51
-  openstack_database_node01_hostname: dbs01
-  openstack_database_node02_address: 10.11.0.52
-  openstack_database_node02_deploy_address: 10.10.0.52
-  openstack_database_node02_hostname: dbs02
-  openstack_database_node03_address: 10.11.0.53
-  openstack_database_node03_deploy_address: 10.10.0.53
-  openstack_database_node03_hostname: dbs03
-  openstack_gateway_node01_address: 10.11.0.224
-  openstack_gateway_node01_deploy_address: 10.10.0.224
-  openstack_gateway_node01_tenant_address: 10.12.0.6
-  openstack_gateway_node01_hostname: gtw01
-  openstack_gateway_node02_address: 10.11.0.225
-  openstack_gateway_node02_deploy_address: 10.10.0.225
-  openstack_gateway_node02_tenant_address: 10.12.0.7
-  openstack_gateway_node02_hostname: gtw02
-  openstack_gateway_node03_address: 10.11.0.226
-  openstack_gateway_node03_deploy_address: 10.10.0.226
-  openstack_gateway_node03_tenant_address: 10.12.0.8
-  openstack_gateway_node03_hostname: gtw03
-  openstack_message_queue_address: 10.11.0.40
-  openstack_message_queue_hostname: msg
-  openstack_message_queue_node01_address: 10.11.0.41
-  openstack_message_queue_node01_deploy_address: 10.10.0.41
-  openstack_message_queue_node01_hostname: msg01
-  openstack_message_queue_node02_address: 10.11.0.42
-  openstack_message_queue_node02_deploy_address: 10.10.0.42
-  openstack_message_queue_node02_hostname: msg02
-  openstack_message_queue_node03_address: 10.11.0.43
-  openstack_message_queue_node03_deploy_address: 10.10.0.43
-  openstack_message_queue_node03_hostname: msg03
-  openstack_barbican_address: 10.11.0.44
-  openstack_barbican_hostname: kmn
-  openstack_barbican_node01_address: 10.11.0.45
-  openstack_barbican_node01_deploy_address: 10.10.0.45
-  openstack_barbican_node01_hostname: kmn01
-  openstack_barbican_node02_address: 10.11.0.46
-  openstack_barbican_node02_deploy_address: 10.10.0.46
-  openstack_barbican_node02_hostname: kmn02
-  openstack_barbican_node03_address: 10.11.0.47
-  openstack_barbican_node03_deploy_address: 10.10.0.47
-  openstack_barbican_node03_hostname: kmn03
-  openstack_network_engine: ovs
-  # openstack_neutron_bgp_vpn_driver: bagpipe
-  openstack_neutron_l2gw: 'False'
-  openstack_neutron_bgp_vpn: 'False'
-  openstack_neutron_qos: 'True'
-  openstack_neutron_vlan_aware_vms: 'True'
-  openstack_nfv_dpdk_enabled: 'False'
-  openstack_nfv_sriov_enabled: 'False'
-  openstack_nova_compute_nfv_req_enabled: 'False'
-  # openstack_nova_compute_reserved_host_memory_mb: '900'
-  openstack_ovs_dvr_enabled: 'True'
-  openstack_ovs_encapsulation_type: vxlan
-  openstack_proxy_address: 10.11.0.80
-  # openstack_proxy_address: 10.16.250.9
-  openstack_proxy_vip_interface: ens6
-  openstack_proxy_hostname: prx
-  openstack_proxy_node01_address: 10.11.0.81
-  openstack_proxy_node01_deploy_address: 10.10.0.81
-  openstack_proxy_node01_hostname: prx01
-  openstack_proxy_node02_address: 10.11.0.82
-  openstack_proxy_node02_deploy_address: 10.10.0.82
-  openstack_proxy_node02_hostname: prx02
-  openstack_nginx_proxy_glance_image_size: 30000m
-  openstack_upgrade_node01_address: 10.11.0.19
-  openstack_upgrade_node01_deploy_address: 10.10.0.19
-  openstack_version: pike
-  ovsdb_server: 'ovsdbx:127.0.0.1:6632'
-  ironic_enabled: 'False'
-  openstack_baremetal_address: 10.11.0.5
-  openstack_baremetal_deploy_address: 10.10.0.5
-  openstack_baremetal_hostname: bmt
-  openstack_baremetal_node01_address: 10.11.0.6
-  openstack_baremetal_node02_address: 10.11.0.7
-  openstack_baremetal_node03_address: 10.11.0.8
-  openstack_baremetal_node01_deploy_address: 10.10.0.6
-  openstack_baremetal_node02_deploy_address: 10.10.0.7
-  openstack_baremetal_node03_deploy_address: 10.10.0.8
-  openstack_baremetal_node01_hostname: bmt01
-  openstack_baremetal_node02_hostname: bmt02
-  openstack_baremetal_node03_hostname: bmt03
-  openstack_baremetal_address_baremetal: 10.15.0.10
-  openstack_baremetal_node01_baremetal_address: 10.15.0.11
-  openstack_baremetal_node02_baremetal_address: 10.15.0.12
-  openstack_baremetal_node03_baremetal_address: 10.15.0.13
-  openstack_baremetal_neutron_subnet_cidr: 10.15.0.0/16
-  openstack_baremetal_neutron_subnet_allocation_start: 10.15.90.1
-  openstack_baremetal_neutron_subnet_allocation_end: 10.15.199.255
-  openstack_dns_hostname: dns
-  openstack_dns_node01_address: 10.11.0.54
-  openstack_dns_node01_deploy_address: 10.10.0.54
-  openstack_dns_node01_hostname: dns01
-  openstack_dns_node02_address: 10.11.0.55
-  openstack_dns_node02_deploy_address: 10.10.0.55
-  openstack_dns_node02_hostname: dns02
-
-  openstack_telemetry_address: 10.11.0.35
-  openstack_telemetry_hostname: mdb
-  openstack_telemetry_node01_address: 10.11.0.36
-  openstack_telemetry_node01_deploy_address: 10.10.0.36
-  # openstack_telemetry_node01_storage_address: 10.11.0.36
-  openstack_telemetry_node01_hostname: mdb01
-  openstack_telemetry_node02_address: 10.11.0.37
-  openstack_telemetry_node02_deploy_address: 10.10.0.37
-  # openstack_telemetry_node02_storage_address: 10.11.0.37
-  openstack_telemetry_node02_hostname: mdb02
-  openstack_telemetry_node03_address: 10.11.0.38
-  openstack_telemetry_node03_deploy_address: 10.10.0.38
-  # openstack_telemetry_node03_storage_address: 10.11.0.38
-  openstack_telemetry_node03_hostname: mdb03
-
-  # oss_enabled: 'False'
-  # oss_node03_address: ${_param:stacklight_monitor_node03_address}
-  # oss_webhook_app_id: '24'
-  # oss_webhook_login_id: '13'
-  # platform: openstack_enabled
-  public_host: ${_param:openstack_proxy_address}
-  publication_method: email
-  # physical_lab_setup: 'False'
-  reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
-  salt_api_password: nlRtYRLbBuvqk3b2XJGrSp7HCcDW0Mgr
-  salt_api_password_hash: $6$IXWjGjZz$6YfimiwAzBxmb6hs1IZ2vzdslJiiwQXAN/PdlrxdxLWBlPLb57wkkFRd5wUwXoWAPfAkkZFhP8rUKE14ucQ3e1
-  salt_master_address: 10.11.0.15
-  salt_master_hostname: cfg01
-  salt_master_management_address: 10.10.0.15
-
-  # sriov_network_subnet: 10.55.0.0/16
-  stacklight_log_address: 10.11.0.60
-  stacklight_log_hostname: log
-  stacklight_log_node01_address: 10.11.0.61
-  stacklight_log_node01_deploy_address: 10.10.0.61
-  stacklight_log_node01_hostname: log01
-  stacklight_log_node02_address: 10.11.0.62
-  stacklight_log_node02_deploy_address: 10.10.0.62
-  stacklight_log_node02_hostname: log02
-  stacklight_log_node03_address: 10.11.0.63
-  stacklight_log_node03_deploy_address: 10.10.0.63
-  stacklight_log_node03_hostname: log03
-  stacklight_long_term_storage_type: prometheus
-  stacklight_monitor_address: 10.11.0.70
-  stacklight_monitor_hostname: mon
-  stacklight_monitor_node01_address: 10.11.0.71
-  stacklight_monitor_node01_deploy_address: 10.10.0.71
-  stacklight_monitor_node01_hostname: mon01
-  stacklight_monitor_node02_address: 10.11.0.72
-  stacklight_monitor_node02_deploy_address: 10.10.0.72
-  stacklight_monitor_node02_hostname: mon02
-  stacklight_monitor_node03_address: 10.11.0.73
-  stacklight_monitor_node03_deploy_address: 10.10.0.73
-  stacklight_monitor_node03_hostname: mon03
-  stacklight_telemetry_address: 10.11.0.85
-  stacklight_telemetry_hostname: mtr
-  stacklight_telemetry_node01_address: 10.11.0.86
-  stacklight_telemetry_node01_deploy_address: 10.10.0.86
-  stacklight_telemetry_node01_hostname: mtr01
-  stacklight_telemetry_node02_address: 10.11.0.87
-  stacklight_telemetry_node02_deploy_address: 10.10.0.87
-  stacklight_telemetry_node02_hostname: mtr02
-  stacklight_telemetry_node03_address: 10.11.0.88
-  stacklight_telemetry_node03_deploy_address: 10.10.0.88
-  stacklight_telemetry_node03_hostname: mtr03
-  stacklight_version: '2'
-  static_ips_on_deploy_network_enabled: 'True'
-  tenant_network_gateway: 10.12.0.1
-  tenant_network_netmask: 255.255.255.0
-  tenant_network_subnet: 10.12.0.0/16
-  tenant_vlan: '1111'
-  use_default_network_scheme: 'False'
-  vnf_onboarding_enabled: 'False'
-  designate_enabled: 'True'
-  galera_ssl_enabled: 'True'
-  openstack_mysql_x509_enabled: 'True'
-  rabbitmq_ssl_enabled: 'True'
-  openstack_rabbitmq_x509_enabled: 'True'
-  openstack_internal_protocol: 'https'
-  tenant_telemetry_enabled: 'True'
-  gnocchi_aggregation_storage: 'ceph'
-  barbican_enabled: 'True'
-  barbican_integration_enabled: 'False'
-  barbican_backend: 'dogtag'
-  openstack_octavia_enabled: 'True'
-  octavia_manager_cluster: 'False'
-  octavia_private_key: |-
-    -----BEGIN RSA PRIVATE KEY-----
-    MIIEpAIBAAKCAQEAtjnPDJsQToHBtoqIo15mdSYpfi8z6DFMi8Gbo0KCN33OUn5u
-    OctbdtjUfeuhvI6px1SCnvyWi09Ft8eWwq+KwLCGKbUxLvqKltuJ7K3LIrGXkt+m
-    qZN4O9XKeVKfZH+mQWkkxRWgX2r8RKNV3GkdNtd74VjhP+R6XSKJQ1Z8b7eHM10v
-    6IjTY/jPczjK+eyCeEj4qbSnV8eKlqLhhquuSQRmUO2DRSjLVdpdf2BB4/BdWFsD
-    YOmX7mb8kpEr9vQ+c1JKMXDwD6ehzyU8kE+1kVm5zOeEy4HdYIMpvUfN49P1anRV
-    2ISQ1ZE+r22IAMKl0tekrGH0e/1NP1DF5rINMwIDAQABAoIBAQCkP/cgpaRNHyg8
-    ISKIHs67SWqdEm73G3ijgB+JSKmW2w7dzJgN//6xYUAnP/zIuM7PnJ0gMQyBBTMS
-    NBTv5spqZLKJZYivj6Tb1Ya8jupKm0jEWlMfBo2ZYVrfgFmrfGOfEebSvmuPlh9M
-    vuzlftmWVSSUOkjODmM9D6QpzgrbpktBuA/WpX+6esMTwJpOcQ5xZWEnHXnVzuTc
-    SncodVweE4gz6F1qorbqIJz8UAUQ5T0OZTdHzIS1IbamACHWaxQfixAO2s4+BoUK
-    ANGGZWkfneCxx7lthvY8DiKn7M5cSRnqFyDToGqaLezdkMNlGC7v3U11FF5blSEW
-    fL1o/HwBAoGBAOavhTr8eqezTchqZvarorFIq7HFWk/l0vguIotu6/wlh1V/KdF+
-    aLLHgPgJ5j+RrCMvTBoKqMeeHfVGrS2udEy8L1mK6b3meG+tMxU05OA55abmhYn7
-    7vF0q8XJmYIHIXmuCgF90R8Piscb0eaMlmHW9unKTKo8EOs5j+D8+AMJAoGBAMo4
-    8WW+D3XiD7fsymsfXalf7VpAt/H834QTbNZJweUWhg11eLutyahyyfjjHV200nNZ
-    cnU09DWKpBbLg7d1pyT69CNLXpNnxuWCt8oiUjhWCUpNqVm2nDJbUdlRFTzYb2fS
-    ZC4r0oQaPD5kMLSipjcwzMWe0PniySxNvKXKInFbAoGBAKxW2qD7uKKKuQSOQUft
-    aAksMmEIAHWKTDdvOA2VG6XvX5DHBLXmy08s7rPfqW06ZjCPCDq4Velzvgvc9koX
-    d/lP6cvqlL9za+x6p5wjPQ4rEt/CfmdcmOE4eY+1EgLrUt314LHGjjG3ScWAiirE
-    QyDrGOIGaYoQf89L3KqIMr0JAoGARYAklw8nSSCUvmXHe+Gf0yKA9M/haG28dCwo
-    780RsqZ3FBEXmYk1EYvCFqQX56jJ25MWX2n/tJcdpifz8Q2ikHcfiTHSI187YI34
-    lKQPFgWb08m1NnwoWrY//yx63BqWz1vjymqNQ5GwutC8XJi5/6Xp+tGGiRuEgJGH
-    EIPUKpkCgYAjBIVMkpNiLCREZ6b+qjrPV96ed3iTUt7TqP7yGlFI/OkORFS38xqC
-    hBP6Fk8iNWuOWQD+ohM/vMMnvIhk5jwlcwn+kF0ra04gi5KBFWSh/ddWMJxUtPC1
-    2htvlEc6zQAR6QfqXHmwhg1hP81JcpqpicQzCMhkzLoR1DC6stXdLg==
-    -----END RSA PRIVATE KEY-----
-  octavia_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2Oc8MmxBOgcG2ioijXmZ1Jil+LzPoMUyLwZujQoI3fc5Sfm45y1t22NR966G8jqnHVIKe/JaLT0W3x5bCr4rAsIYptTEu+oqW24nsrcsisZeS36apk3g71cp5Up9kf6ZBaSTFFaBfavxEo1XcaR0213vhWOE/5HpdIolDVnxvt4czXS/oiNNj+M9zOMr57IJ4SPiptKdXx4qWouGGq65JBGZQ7YNFKMtV2l1/YEHj8F1YWwNg6ZfuZvySkSv29D5zUkoxcPAPp6HPJTyQT7WRWbnM54TLgd1ggym9R83j0/VqdFXYhJDVkT6vbYgAwqXS16SsYfR7/U0/UMXmsg0z
-
-
-## MAAS BEGIN
-  maas_deploy_address: 10.10.0.15
-  maas_deploy_network_name: deploy_network
-  maas_deploy_range_end: 10.10.254.255
-  maas_deploy_range_start: 10.10.254.1
-  maas_deploy_vlan: '0'
-  maas_fabric_name: deploy_fabric
-  maas_hostname: cfg01
-  maas_machines: |
-    kvm04:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      # pxe_interface_mac:
-      pxe_interface_mac: "0c:c4:7a:33:1f:e4"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:33:1f:e4"
-          mode: "static"
-          ip: ${_param:infra_kvm_node04_deploy_address}
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:33:1f:e5"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1e:3e:ea"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1e:3e:eb"
-          name: ten2
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_kvm04_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 1T
-                type: ext4
-
-    kvm05:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:33:20:fc"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:33:20:fc"
-          mode: "static"
-          ip: ${_param:infra_kvm_node05_deploy_address}
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:33:20:fd"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1e:3e:e6"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1e:3e:e7"
-          name: ten2
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_kvm05_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 1T
-                type: ext4
-
-    kvm06:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:31:fb:b6"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:31:fb:b6"
-          mode: "static"
-          ip: ${_param:infra_kvm_node06_deploy_address}
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:31:fb:b7"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1e:3e:fa"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1e:3e:fb"
-          name: ten2
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_kvm06_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 1T
-                type: ext4
-
-    kvm01:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:31:f0:12"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:31:f0:12"
-          mode: "static"
-          ip: ${_param:infra_kvm_node01_deploy_address}
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:31:f0:13"
-          name: one2
-        fourty1:
-          mode: UNCONFIGURED
-          mac: "00:02:c9:44:82:70"
-          name: ten1
-        fourty2:
-          mode: UNCONFIGURED
-          mac: "00:02:c9:44:82:71"
-          name: ten2
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_kvm01_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 120G
-                type: ext4
-
-    kvm02:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:31:ef:bc"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:31:ef:bc"
-          mode: "static"
-          ip: ${_param:infra_kvm_node02_deploy_address}
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:31:ef:bd"
-          name: one2
-        fourty1:
-          mode: UNCONFIGURED
-          mac: "00:02:c9:44:81:40"
-          name: ten1
-        fourty2:
-          mode: UNCONFIGURED
-          mac: "00:02:c9:44:81:41"
-          name: ten2
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_kvm02_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 120G
-                type: ext4
-
-    kvm03:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:31:ef:aa"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:31:ef:aa"
-          mode: "static"
-          ip: ${_param:infra_kvm_node03_deploy_address}
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:31:ef:ab"
-          name: one2
-        fourty1:
-          mode: UNCONFIGURED
-          mac: "e4:1d:2d:72:23:b1"
-          name: ten1
-        fourty2:
-          mode: UNCONFIGURED
-          mac: "e4:1d:2d:72:23:b2"
-          name: ten2
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_kvm03_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 120G
-                type: ext4
-
-    cmp001:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:6d:33:12"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:6d:33:12"
-          mode: "static"
-          ip: 10.10.0.101
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:6d:33:13"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:92:8b:bc"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:92:8b:bd"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:89:65:bc"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:89:65:bd"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_cmp001_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sdc
-        disk:
-          vgroot:
-            devices:
-              - sdc
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 240G
-                type: ext4
-
-    cmp002:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:cb:6a"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:cb:6a"
-          mode: "static"
-          ip: 10.10.0.102
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:cb:6b"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:58:41:d0"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:58:41:d1"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1f:00:18"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:1f:00:19"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_cmp002_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 240G
-                type: ext4
-
-    cmp003:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:91:5a"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:91:5a"
-          mode: "static"
-          ip: 10.10.0.103
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:91:5b"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:97:e5:9c"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:97:e5:9d"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:a4:70:7c"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:a4:70:7d"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_cmp003_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sdc
-        disk:
-          vgroot:
-            devices:
-              - sdc
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 240G
-                type: ext4
-
-    cmp004:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:cb:5a"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:cb:5a"
-          mode: "static"
-          ip: 10.10.0.104
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:cb:5b"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:87:17:90"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:87:17:91"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:89:45:74"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:89:45:75"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_cmp004_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sdc
-        disk:
-          vgroot:
-            devices:
-              - sdc
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 240G
-                type: ext4
-
-    # OSD Nodes
-    osd001:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:cb:7a"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:cb:7a"
-          mode: "static"
-          ip: 10.10.0.201
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:cb:7b"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "90:e2:ba:1a:6c:98"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "90:e2:ba:1a:6c:99"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:97:df:84"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:97:df:85"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_osd001_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 240G
-                type: ext4
-
-    osd002:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:6d:2e:1e"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:6d:2e:1e"
-          mode: "static"
-          ip: 10.10.0.202
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:6d:2e:1f"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:6d:20"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:6d:21"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:70:e8"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:70:e9"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_osd002_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sdc
-        disk:
-          vgroot:
-            devices:
-              - sdc
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 240G
-                type: ext4
-
-    osd003:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:d1:10"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:d1:10"
-          mode: "static"
-          ip: 10.10.0.203
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:d1:11"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8a:c1:90"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8a:c1:91"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:92:a3:10"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:92:a3:11"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_osd003_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sdc
-        disk:
-          vgroot:
-            devices:
-              - sdc
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 240G
-                type: ext4
-
-    # GTW Nodes
-    gtw01:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:d6:76"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:d6:76"
-          mode: "static"
-          ip: 10.10.0.224
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:d6:77"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:7c:5d:90"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:7c:5d:91"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:3e:e8"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:3e:e9"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_gtw01_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sda
-        disk:
-          vgroot:
-            devices:
-              - sda
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 1T
-                type: ext4
-
-    gtw02:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:c9:64"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:c9:64"
-          mode: "static"
-          ip: 10.10.0.225
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:c9:65"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:7c:a8:4c"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:7c:a8:4d"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:13:b8"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8d:13:b9"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_gtw02_ip}
-        power_type: ipmi
-      disk_layout:
-        type: custom
-        bootable_device: sdc
-        disk:
-          vgroot:
-            devices:
-              - sdc
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 1T
-                type: ext4
-
-    gtw03:
-      distro_series: "xenial"
-      # hwe_kernel: "hwe-16.04"
-      pxe_interface_mac: "0c:c4:7a:aa:cb:78"
-      interfaces:
-        one1:
-          mac: "0c:c4:7a:aa:cb:78"
-          mode: "static"
-          ip: 10.10.0.226
-          subnet: "10.10.0.0/16"
-          gateway: ${_param:deploy_network_gateway}
-          name: one1
-        one2:
-          mode: UNCONFIGURED
-          mac: "0c:c4:7a:aa:cb:79"
-          name: one2
-        ten1:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8a:80:48"
-          name: ten1
-        ten2:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:8a:80:49"
-          name: ten2
-        ten3:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:89:6e:40"
-          name: ten3
-        ten4:
-          mode: UNCONFIGURED
-          mac: "00:1b:21:89:6e:41"
-          name: ten4
-      power_parameters:
-        power_user: ${_param:ipmi_user}
-        power_pass: ${_param:ipmi_password}
-        power_address: ${_param:ipmi_gtw03_ip}
-        power_type: ipmi
-      disk_layout:
-        bootable_device: sdc
-        type: custom
-        disk:
-          vgroot:
-            devices:
-              - sdc
-            type: lvm
-            volume:
-              root:
-                mount: /
-                size: 1T
-                type: ext4
-#$ MAAS END
-
-
-
-
-nodes:
-  # cfg01.mcp-offline-vxlan.local:
-  #   reclass_storage_name: infra_config_node01
-  #   classes:
-  #   - cluster.${_param:cluster_name}.infra.config
-  #   - cluster.${_param:cluster_name}.infra.networking.ens5_config
-  #   roles:
-  #   - infra_config
-  #   - linux_system_codename_xenial
-  #   interfaces:
-  #     ens3:
-  #       role: single_mgm
-  #       deploy_address: 10.10.0.15
-  #       deploy_network_netmask: 255.255.0.0
-  #       deploy_network_gateway: 10.10.0.1
-  #     ens4:
-  #       role: single_ctl
-  #       single_address: 10.11.0.15
-
-  apt.mcp-offline-vxlan.local:
-    reclass_storage_name: aptly_server_node01
-    roles:
-    - linux_system_codename_xenial
-    classes:
-    - cluster.${_param:cluster_name}.infra
-    interfaces:
-      ens3:
-        role: single_mgm
-        deploy_address: 10.10.0.14
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-
-  kvm01.mcp-offline-vxlan.local:
-    reclass_storage_name: infra_kvm_node01
-    roles:
-    - infra_kvm
-    - linux_system_codename_xenial
-    # - features_vcp_gateway
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.241
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.241
-        tenant_address: 10.12.0.241
-      ten2:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.241
-        tenant_address: 10.12.0.241
-
-  kvm02.mcp-offline-vxlan.local:
-    reclass_storage_name: infra_kvm_node02
-    roles:
-    - infra_kvm
-    - linux_system_codename_xenial
-    # - features_vcp_gateway
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.242
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.242
-        tenant_address: 10.12.0.242
-      ten2:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.242
-        tenant_address: 10.12.0.242
-
-  kvm03.mcp-offline-vxlan.local:
-    reclass_storage_name: infra_kvm_node03
-    roles:
-    - infra_kvm
-    - linux_system_codename_xenial
-    # - features_vcp_gateway
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.243
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.243
-        tenant_address: 10.12.0.243
-      ten2:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.243
-        tenant_address: 10.12.0.243
-
-  kvm04.mcp-offline-vxlan.local:
-    reclass_storage_name: infra_kvm_node04
-    roles:
-    - infra_kvm_wo_gluster
-    - linux_system_codename_xenial
-    - salt_master_host
-    # - features_vcp_gateway
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.244
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.244
-        tenant_address: 10.12.0.244
-      ten2:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.244
-        tenant_address: 10.12.0.244
-
-  kvm05.mcp-offline-vxlan.local:
-    reclass_storage_name: infra_kvm_node05
-    roles:
-    - infra_kvm_wo_gluster
-    - linux_system_codename_xenial
-    - salt_master_host
-    # - features_vcp_gateway
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.245
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.245
-        tenant_address: 10.12.0.245
-      ten2:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.245
-        tenant_address: 10.12.0.245
-
-  kvm06.mcp-offline-vxlan.local:
-    reclass_storage_name: infra_kvm_node06
-    roles:
-    - infra_kvm_wo_gluster
-    - linux_system_codename_xenial
-    - salt_master_host
-    # - features_vcp_gateway
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.246
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.246
-        tenant_address: 10.12.0.246
-      ten2:
-        role: bond0_ab_nondvr_vxlan_ctl_mesh_raw
-        single_address: 10.11.0.246
-        tenant_address: 10.12.0.246
-
-  cmp<<count>>.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_compute_rack01
-    roles:
-    - openstack_compute
-    - linux_system_codename_xenial
-    interfaces:
-      one1:
-        role: single_mgm
-      ten1:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # external_vlan: 1112
-        # external_address: 10.16.0.224
-        # external_network_netmask: 255.255.0.0
-      ten2:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # external_vlan: 1112
-
-  osd<<count>>.mcp-offline-vxlan.local:
-    reclass_storage_name: ceph_osd_rack01
-    roles:
-    - ceph_osd
-    - linux_system_codename_xenial
-    interfaces:
-      one1:
-        role: single_mgm
-      ten1:
-        role: bond0_ab_vlan_ceph_public_backend
-      ten2:
-        role: bond0_ab_vlan_ceph_public_backend
-
-  gtw01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_gateway_node01
-    roles:
-    - openstack_gateway_octavia
-    - linux_system_codename_xenial
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.224
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        single_address: 10.11.0.224
-        tenant_address: 10.12.0.224
-        external_address: 10.16.0.224
-        external_network_netmask: 255.255.0.0
-        external_vlan: 1112
-      ten2:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        single_address: 10.11.0.224
-        tenant_address: 10.12.0.224
-        external_address: 10.16.0.224
-        external_network_netmask: 255.255.0.0
-        external_vlan: 1112
-
-  gtw02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_gateway_node02
-    roles:
-    - openstack_gateway
-    - linux_system_codename_xenial
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.225
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external
-        single_address: 10.11.0.225
-        tenant_address: 10.12.0.225
-        external_address: 10.16.0.225
-        external_network_netmask: 255.255.0.0
-        external_vlan: 1112
-      ten2:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external
-        single_address: 10.11.0.225
-        tenant_address: 10.12.0.225
-        external_address: 10.16.0.225
-        external_network_netmask: 255.255.0.0
-        external_vlan: 1112
-
-  gtw03.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_gateway_node03
-    roles:
-    - openstack_gateway
-    - linux_system_codename_xenial
-    interfaces:
-      one1:
-        role: single_mgm
-        deploy_address: 10.10.0.226
-        deploy_network_netmask: 255.255.0.0
-        deploy_network_gateway: 10.10.0.1
-      ten1:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external
-        single_address: 10.11.0.226
-        tenant_address: 10.12.0.226
-        external_address: 10.16.0.226
-        external_network_netmask: 255.255.0.0
-        external_vlan: 1112
-      ten2:
-        role: bond0_ab_dvr_vxlan_ctl_mesh_external_vlan
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-        # role: bond0_ab_dvr_vxlan_ctl_mesh_external
-        single_address: 10.11.0.226
-        tenant_address: 10.12.0.226
-        external_address: 10.16.0.226
-        external_network_netmask: 255.255.0.0
-        external_vlan: 1112
-
-
-  ######
-  ######
-  #
-  # VCP Nodes
-  #
-  ######
-  ######
-
-  ctl01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_control_node01
-    roles:
-    - openstack_control_leader
-    - linux_system_codename_xenial
-    - features_control_external_vlan
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.11
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-        # keepalived_vip_priority: 103
-
-  ctl02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_control_node02
-    roles:
-    - openstack_control
-    - linux_system_codename_xenial
-    - features_control_external_vlan
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.12
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-        # keepalived_vip_priority: 102
-
-  ctl03.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_control_node03
-    roles:
-    - openstack_control
-    - linux_system_codename_xenial
-    - features_control_external_vlan
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.13
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-        # keepalived_vip_priority: 101
-
-  # gtw01.mcp-offline-vxlan.local:
-  #   reclass_storage_name: openstack_gateway_node01
-  #   roles:
-  #   - openstack_gateway
-  #   - linux_system_codename_xenial
-  #   interfaces:
-  #     ens2:
-  #       role: single_mgm
-  #     ens3:
-  #       role: single_ctl
-  #     ens4:
-  #       role: bond0_ab_ovs_vxlan_mesh
-  #     ens5:
-  #       role: bond0_ab_ovs_vxlan_mesh
-
-  # gtw02.mcp-offline-vxlan.local:
-  #   reclass_storage_name: openstack_gateway_node02
-  #   roles:
-  #   - openstack_gateway
-  #   - linux_system_codename_xenial
-  #   interfaces:
-  #     ens2:
-  #       role: single_mgm
-  #     ens3:
-  #       role: single_ctl
-  #     ens4:
-  #       role: bond0_ab_ovs_vxlan_mesh
-  #     ens5:
-  #       role: bond0_ab_ovs_vxlan_mesh
-
-  # gtw03.mcp-offline-vxlan.local:
-  #   reclass_storage_name: openstack_gateway_node03
-  #   roles:
-  #   - openstack_gateway
-  #   - linux_system_codename_xenial
-  #   interfaces:
-  #     ens2:
-  #       role: single_mgm
-  #     ens3:
-  #       role: single_ctl
-  #     ens4:
-  #       role: bond0_ab_ovs_vxlan_mesh
-  #     ens5:
-  #       role: bond0_ab_ovs_vxlan_mesh
-
-  cid01.mcp-offline-vxlan.local:
-    reclass_storage_name: cicd_control_node01
-    roles:
-    - cicd_control_leader
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.91
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-
-  cid02.mcp-offline-vxlan.local:
-    reclass_storage_name: cicd_control_node02
-    roles:
-    - cicd_control_manager
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.92
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-
-  cid03.mcp-offline-vxlan.local:
-    reclass_storage_name: cicd_control_node03
-    roles:
-    - cicd_control_manager
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.93
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-
-  dbs01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_database_node01
-    roles:
-    - openstack_database_leader
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.51
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-
-  dbs02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_database_node02
-    roles:
-    - openstack_database
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.52
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-
-  dbs03.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_database_node03
-    roles:
-    - openstack_database
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-      # ens2:
-        # deploy_address: 10.10.0.53
-        # deploy_network_netmask: 255.255.0.0
-        # deploy_network_gateway: 10.10.0.1
-
-  msg01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_message_queue_node01
-    roles:
-    - openstack_message_queue
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  msg02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_message_queue_node02
-    roles:
-    - openstack_message_queue
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  msg03.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_message_queue_node03
-    roles:
-    - openstack_message_queue
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  prx01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_proxy_node01
-    roles:
-    - openstack_proxy
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  prx02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_proxy_node02
-    roles:
-    - openstack_proxy
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  dns01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_dns_node01
-    roles:
-    - openstack_dns
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  dns02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_dns_node02
-    roles:
-    - openstack_dns
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mon01.mcp-offline-vxlans.local:
-    reclass_storage_name: stacklight_server_node01
-    roles:
-    - stacklightv2_server_leader
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mon02.mcp-offline-vxlans.local:
-    reclass_storage_name: stacklight_server_node02
-    roles:
-    - stacklightv2_server
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mon03.mcp-offline-vxlans.local:
-    reclass_storage_name: stacklight_server_node03
-    roles:
-    - stacklightv2_server
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  log01.mcp-offline-vxlan.local:
-    reclass_storage_name: stacklight_log_node01
-    roles:
-    - stacklight_log_leader_v2
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  log02.mcp-offline-vxlan.local:
-    reclass_storage_name: stacklight_log_node02
-    roles:
-    - stacklight_log
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  log03.mcp-offline-vxlan.local:
-    reclass_storage_name: stacklight_log_node03
-    roles:
-    - stacklight_log
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mtr01.mcp-offline-vxlan.local:
-    reclass_storage_name: stacklight_telemetry_node01
-    roles:
-    - stacklight_telemetry_leader
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mtr02.mcp-offline-vxlan.local:
-    reclass_storage_name: stacklight_telemetry_node02
-    roles:
-    - stacklight_telemetry
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mtr03.mcp-offline-vxlan.local:
-    reclass_storage_name: stacklight_telemetry_node03
-    roles:
-    - stacklight_telemetry
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-
-  cmn01.mcp-offline-vxlan.local:
-    reclass_storage_name: ceph_mon_node01
-    roles:
-    - ceph_mon
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  cmn02.mcp-offline-vxlan.local:
-    reclass_storage_name: ceph_mon_node02
-    roles:
-    - ceph_mon
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  cmn03.mcp-offline-vxlan.local:
-    reclass_storage_name: ceph_mon_node03
-    roles:
-    - ceph_mon
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  rgw01.mcp-offline-vxlan.local:
-    reclass_storage_name: ceph_rgw_node01
-    roles:
-    - ceph_rgw
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  rgw02.mcp-offline-vxlan.local:
-    reclass_storage_name: ceph_rgw_node02
-    roles:
-    - ceph_rgw
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  rgw03.mcp-offline-vxlan.local:
-    reclass_storage_name: ceph_rgw_node03
-    roles:
-    - ceph_rgw
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mdb01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_telemetry_node01
-    roles:
-    - openstack_telemetry
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mdb02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_telemetry_node02
-    roles:
-    - openstack_telemetry
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  mdb03.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_telemetry_node03
-    roles:
-    - openstack_telemetry
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  kmn01.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_barbican_node01
-    roles:
-    - openstack_barbican
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  kmn02.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_barbican_node02
-    roles:
-    - openstack_barbican
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
-  kmn03.mcp-offline-vxlan.local:
-    reclass_storage_name: openstack_barbican_node03
-    roles:
-    - openstack_barbican
-    - linux_system_codename_xenial
-    interfaces:
-      ens2:
-        role: single_mgm
-      ens3:
-        role: single_ctl
-
diff --git a/tcp_tests/templates/physical-mcp-offline-vxlan/core.yaml b/tcp_tests/templates/physical-mcp-offline-vxlan/core.yaml
deleted file mode 100644
index c5e528a..0000000
--- a/tcp_tests/templates/physical-mcp-offline-vxlan/core.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-{% from 'physical-mcp-offline-vxlan/underlay.yaml' import HOSTNAME_CFG01 with context %}
-
-- description: Install jq for parse json output
-  cmd: apt install -y jq
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 15}
-  skip_fail: false
-
diff --git a/tcp_tests/templates/physical-mcp-offline-vxlan/salt.yaml b/tcp_tests/templates/physical-mcp-offline-vxlan/salt.yaml
deleted file mode 100644
index 98307e3..0000000
--- a/tcp_tests/templates/physical-mcp-offline-vxlan/salt.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-{%- set test_public_key = config.underlay.ssh_keys[0]["public"] %}
-
-{% from 'physical-mcp-offline-vxlan/underlay.yaml' import HOSTNAME_CFG01 with context %}
-{% from 'physical-mcp-offline-vxlan/underlay.yaml' import ETH0_IP_ADDRESS_CFG01 with context %}
-
-{% import 'shared-maas.yaml' as SHARED_MAAS with context %}
-
-- description: Wait while a salt-minion is started
-  cmd: systemctl is-active salt-minion
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 10, delay: 10}
-  skip_fail: false
-
-- description: Refresh pillars on master node
-  cmd: sleep 90; salt-call --hard-crash --state-output=mixed --state-verbose=False saltutil.refresh_pillar
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
-
-- description: Sync all salt resources on master node
-  cmd: sleep 60; salt-call --hard-crash --state-output=mixed --state-verbose=False saltutil.sync_all && sleep 5
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
-
-- description: Setup NTP
-  cmd: salt-call --hard-crash --state-output=mixed --state-verbose=False state.sls ntp.server
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
-
-- description: Wait until salt is up
-  cmd: sleep 60
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 5}
-  skip_fail: false
-
-{{ SHARED_MAAS.AUTH_IN_MAAS() }}
-{{ SHARED_MAAS.SET_LOCAL_DNS() }}
-{{ SHARED_MAAS.ADD_ROOT_SSH_KEY_TO_NODES() }}
-{{ SHARED_MAAS.ADD_TEST_SSH_KEY_TO_NODES(test_public_key) }}
-{{ SHARED_MAAS.ADD_ROOT_PUB_SSH_TO_MASS() }}
-{{ SHARED_MAAS.COMMISSION_VMS() }}
-{{ SHARED_MAAS.DEPLOY_VMS() }}
-{{ SHARED_MAAS.CONFIG_MACHINES(target='I@salt:control or I@nova:compute or I@ceph:osd or I@neutron:gateway') }}
-{{ SHARED_MAAS.ADD_ROOT_SSH_KEY_TO_NODES() }}
-{{ SHARED_MAAS.ADD_TEST_SSH_KEY_TO_NODES(test_public_key) }}
diff --git a/tcp_tests/templates/physical-mcp-offline-vxlan/underlay--meta-data.yaml b/tcp_tests/templates/physical-mcp-offline-vxlan/underlay--meta-data.yaml
deleted file mode 100644
index 3699401..0000000
--- a/tcp_tests/templates/physical-mcp-offline-vxlan/underlay--meta-data.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-| # All the data below will be stored as a string object
-  instance-id: iid-local1
-  hostname: {hostname}
-  local-hostname: {hostname}
diff --git a/tcp_tests/templates/physical-mcp-offline-vxlan/underlay--user-data-apt01.yaml b/tcp_tests/templates/physical-mcp-offline-vxlan/underlay--user-data-apt01.yaml
deleted file mode 100644
index 838435c..0000000
--- a/tcp_tests/templates/physical-mcp-offline-vxlan/underlay--user-data-apt01.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-| # All the data below will be stored as a string object
-  #cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
-  ssh_pwauth: True
-  users:
-   - name: root
-     sudo: ALL=(ALL) NOPASSWD:ALL
-     shell: /bin/bash
-     ssh_authorized_keys:
-     {% for key in config.underlay.ssh_keys %}
-      - ssh-rsa {{ key['public'] }}
-     {% endfor %}
-
-  disable_root: false
-  chpasswd:
-   list: |
-    root:r00tme
-   expire: False
-
-  bootcmd:
-   # Block access to SSH while node is preparing
-   - cloud-init-per once sudo iptables -A INPUT -p tcp --dport 22 -j DROP
-   # Enable root access
-   - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
-   - service sshd restart
-  output:
-    all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
-
-  runcmd:
-   # Mount config drive
-   - mkdir /root/config-drive
-   - mount /dev/sr0 /root/config-drive
-
-   # Create swap
-   - fallocate -l 4G /swapfile
-   - chmod 600 /swapfile
-   - mkswap /swapfile
-   - swapon /swapfile
-   - echo "/swapfile   none    swap    defaults    0   0" >> /etc/fstab
-
-   # Run user data script from config drive
-   - cd /root/config-drive && /bin/bash -xe ./user-data
-
-   # Enable root access
-   - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
-
-   ########################################################
-   # Node is ready, allow SSH access
-   - echo "Allow SSH access ..."
-   - sudo iptables -D INPUT -p tcp --dport 22 -j DROP
-   - touch /is_cloud_init_finish
-   ########################################################
-
-  write_files:
-   - path: /root/.ssh/config
-     owner: root:root
-     permissions: '0600'
-     content: |
-          Host *
-            ServerAliveInterval 300
-            ServerAliveCountMax 10
-            StrictHostKeyChecking no
-            UserKnownHostsFile /dev/null
diff --git a/tcp_tests/templates/physical-mcp-offline-vxlan/underlay--user-data-cfg01.yaml b/tcp_tests/templates/physical-mcp-offline-vxlan/underlay--user-data-cfg01.yaml
deleted file mode 100644
index 39297d4..0000000
--- a/tcp_tests/templates/physical-mcp-offline-vxlan/underlay--user-data-cfg01.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-| # All the data below will be stored as a string object
-  #cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
-  ssh_pwauth: True
-  users:
-   - name: root
-     sudo: ALL=(ALL) NOPASSWD:ALL
-     shell: /bin/bash
-     ssh_authorized_keys:
-     {% for key in config.underlay.ssh_keys %}
-      - ssh-rsa {{ key['public'] }}
-     {% endfor %}
-
-  disable_root: false
-  chpasswd:
-   list: |
-    root:r00tme
-   expire: False
-
-  bootcmd:
-   # Block access to SSH while node is preparing
-   - cloud-init-per once sudo echo 'sshd:ALL' >> /etc/hosts.deny
-   # Enable root access
-   - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
-  output:
-    all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
-
-  runcmd:
-   # Mount config drive
-   - mkdir /root/config-drive
-   - mount /dev/sr0 /root/config-drive
-
-   # Create swap
-   - fallocate -l 4G /swapfile
-   - chmod 600 /swapfile
-   - mkswap /swapfile
-   - swapon /swapfile
-   - echo "/swapfile   none    swap    defaults    0   0" >> /etc/fstab
-
-   # Run user data script from config drive
-   - iptables -I OUTPUT -p tcp --dport 53 -j DROP
-   - iptables -I OUTPUT -p udp --dport 53 -j DROP
-   - ifdown --force ens3; ifconfig ens3 down; ip a flush dev ens3; rm -f /var/run/network/ifstate.ens3
-   - ifdown --force ens4; ifconfig ens4 down; ip a flush dev ens4; rm -f /var/run/network/ifstate.ens4
-   - ifdown --force ens5; ifconfig ens5 down; ip a flush dev ens5; rm -f /var/run/network/ifstate.ens5
-   - ifdown --force ens6; ifconfig ens6 down; ip a flush dev ens6; rm -f /var/run/network/ifstate.ens6
-   - cd /root/config-drive && cloud-init --file /root/config-drive/vendor-data --debug modules
-   # - [bash, -cex, *master_config]
-   # - cp /root/config-drive/user-data /root/config.sh && chmod 664 /root/config.sh
-   # - sed -i '/^reboot$/d' /root/config.sh
-   # - cd /root && /bin/bash -xe ./config.sh
-
-
-   # Enable root access
-   - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
-   - systemctl reload sshd
-
-   ########################################################
-   # Node is ready, allow SSH access and reboot
-   - echo "Allow SSH access ..."
-   - "sed -i -e '/sshd:ALL/d' /etc/hosts.deny"
-   - touch /is_cloud_init_finish
-   - reboot
-   ########################################################
-
-  write_files:
-   - path: /root/.ssh/config
-     owner: root:root
-     permissions: '0600'
-     content: |
-          Host *
-            ServerAliveInterval 300
-            ServerAliveCountMax 10
-            StrictHostKeyChecking no
-            UserKnownHostsFile /dev/null
-
-  ssh_pwauth: True
-  disable_root: false
-  users:
-   - name: root
-     sudo: ALL=(ALL) NOPASSWD:ALL
-     shell: /bin/bash
-     ssh_authorized_keys:
-     {% for key in config.underlay.ssh_keys %}
-      - ssh-rsa {{ key['public'] }}
-     {% endfor %}
-
-  chpasswd:
-     list: |
-      root:r00tme
-     expire: False
diff --git a/tcp_tests/templates/physical-mcp-offline-vxlan/underlay--user-data.yaml b/tcp_tests/templates/physical-mcp-offline-vxlan/underlay--user-data.yaml
deleted file mode 100644
index e12ff0a..0000000
--- a/tcp_tests/templates/physical-mcp-offline-vxlan/underlay--user-data.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-| # All the data below will be stored as a string object
-  #cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
-  ssh_pwauth: True
-  users:
-   - name: root
-     sudo: ALL=(ALL) NOPASSWD:ALL
-     shell: /bin/bash
-     ssh_authorized_keys:
-     {% for key in config.underlay.ssh_keys %}
-      - ssh-rsa {{ key['public'] }}
-     {% endfor %}
-
-  disable_root: false
-  chpasswd:
-   list: |
-    root:r00tme
-   expire: False
-
-  bootcmd:
-   # Block access to SSH while node is preparing
-   - cloud-init-per once sudo iptables -A INPUT -p tcp --dport 22 -j DROP
-   # Enable root access
-   - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
-   - service sshd restart
-  output:
-    all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
-
-  runcmd:
-   - export TERM=linux
-   - export LANG=C
-   # Configure dhclient
-   - sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
-   - sudo resolvconf -u
-
-   # Prepare network connection
-   #- sudo ifup eth0
-
-   # Create swap
-   - fallocate -l 4G /swapfile
-   - chmod 600 /swapfile
-   - mkswap /swapfile
-   - swapon /swapfile
-   - echo "/swapfile   none    swap    defaults   0   0" >> /etc/fstab
-
-
-   ############## TCP Cloud cfg01 node ##################
-   #- sleep 120
-   - echo "Preparing base OS"
-   - which wget >/dev/null || (apt-get update; apt-get install -y wget)
-
-   - echo "deb [arch=amd64] http://apt.mirantis.com/xenial {{ REPOSITORY_SUITE }} salt extra" > /etc/apt/sources.list.d/mcp_salt.list;
-   - wget -O - http://apt.mirantis.com/public.gpg | apt-key add -;
-   - echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/{{ SALT_VERSION }} xenial main" > /etc/apt/sources.list.d/saltstack.list
-   - wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/{{ SALT_VERSION }}/SALTSTACK-GPG-KEY.pub | apt-key add -
-
-   - apt-get clean
-   - eatmydata apt-get update && apt-get -y upgrade
-
-   # Install common packages
-   - eatmydata apt-get install -y python-pip git curl tmux byobu iputils-ping traceroute htop tree mc
-
-   ########################################################
-   # Node is ready, allow SSH access
-   #- echo "Allow SSH access ..."
-   #- sudo iptables -D INPUT -p tcp --dport 22 -j DROP
-   - apt-get install linux-generic-hwe-16.04 -y
-   - reboot
-   - touch /is_cloud_init_finish
-   ########################################################
-
-  write_files:
-   - path: /etc/network/interfaces
-     content: |
-          # The loopback network interface
-          auto lo
-          iface lo inet loopback
-
-          auto {interface_name}
-          iface {interface_name} inet dhcp
diff --git a/tcp_tests/templates/physical-mcp-offline-vxlan/underlay.yaml b/tcp_tests/templates/physical-mcp-offline-vxlan/underlay.yaml
deleted file mode 100644
index 343a1bd..0000000
--- a/tcp_tests/templates/physical-mcp-offline-vxlan/underlay.yaml
+++ /dev/null
@@ -1,452 +0,0 @@
-# Set the repository suite, one of the: 'nightly', 'testing', 'stable', or any other required
-{% set REPOSITORY_SUITE = os_env('REPOSITORY_SUITE', 'testing') %}
-
-{% import 'physical-mcp-offline-vxlan/underlay--meta-data.yaml' as CLOUDINIT_META_DATA with context %}
-{% import 'physical-mcp-offline-vxlan/underlay--user-data-cfg01.yaml' as CLOUDINIT_USER_DATA_CFG01 with context %}
-
-
-{% set LAB_CONFIG_NAME = os_env('LAB_CONFIG_NAME', 'mcp-offline-vxlan') %}
-{# set DOMAIN_NAME = os_env('DOMAIN_NAME', LAB_CONFIG_NAME) + '.local' #}
-{% set DOMAIN_NAME = os_env('DOMAIN_NAME', 'mcp-offline-vxlan.local') %}
-{% set HOSTNAME_APT = os_env('HOSTNAME_APT', 'apt.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CFG01 = os_env('HOSTNAME_CFG01', 'cfg01.' + DOMAIN_NAME) %}
-
-{% set HOSTNAME_KVM01 = os_env('HOSTNAME_KVM01', 'kvm01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_KVM02 = os_env('HOSTNAME_KVM02', 'kvm02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_KVM03 = os_env('HOSTNAME_KVM03', 'kvm03.' + DOMAIN_NAME) %}
-{% set HOSTNAME_KVM04 = os_env('HOSTNAME_KVM04', 'kvm04.' + DOMAIN_NAME) %}
-{% set HOSTNAME_KVM05 = os_env('HOSTNAME_KVM05', 'kvm05.' + DOMAIN_NAME) %}
-{% set HOSTNAME_KVM06 = os_env('HOSTNAME_KVM06', 'kvm06.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CMP001 = os_env('HOSTNAME_CMP001', 'cmp001.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CMP002 = os_env('HOSTNAME_CMP002', 'cmp002.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CMP003 = os_env('HOSTNAME_CMP003', 'cmp003.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CMP004 = os_env('HOSTNAME_CMP004', 'cmp004.' + DOMAIN_NAME) %}
-{% set HOSTNAME_GTW01 = os_env('HOSTNAME_GTW01', 'gtw01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_GTW02 = os_env('HOSTNAME_GTW02', 'gtw02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_GTW03 = os_env('HOSTNAME_GTW03', 'gtw03.' + DOMAIN_NAME) %}
-
-{% set HOSTNAME_CTL = os_env('HOSTNAME_CTL', 'ctl.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CTL01 = os_env('HOSTNAME_CTL01', 'ctl01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CTL02 = os_env('HOSTNAME_CTL02', 'ctl02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CTL03 = os_env('HOSTNAME_CTL03', 'ctl03.' + DOMAIN_NAME) %}
-{% set HOSTNAME_DBS = os_env('HOSTNAME_DBS', 'dbs.' + DOMAIN_NAME) %}
-{% set HOSTNAME_DBS01 = os_env('HOSTNAME_DBS01', 'dbs01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_DBS02 = os_env('HOSTNAME_DBS02', 'dbs02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_DBS03 = os_env('HOSTNAME_DBS03', 'dbs03.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MSG = os_env('HOSTNAME_MSG', 'msg.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MSG01 = os_env('HOSTNAME_MSG01', 'msg01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MSG02 = os_env('HOSTNAME_MSG02', 'msg02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MSG03 = os_env('HOSTNAME_MSG03', 'msg03.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MON = os_env('HOSTNAME_MON', 'mon.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MON01 = os_env('HOSTNAME_MON01', 'mon01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MON02 = os_env('HOSTNAME_MON02', 'mon02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MON03 = os_env('HOSTNAME_MON03', 'mon03.' + DOMAIN_NAME) %}
-{% set HOSTNAME_LOG = os_env('HOSTNAME_LOG', 'log.' + DOMAIN_NAME) %}
-{% set HOSTNAME_LOG01 = os_env('HOSTNAME_LOG01', 'log01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_LOG02 = os_env('HOSTNAME_LOG02', 'log02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_LOG03 = os_env('HOSTNAME_LOG03', 'log03.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MTR = os_env('HOSTNAME_MTR', 'mtr.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MTR01 = os_env('HOSTNAME_MTR01', 'mtr01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MTR02 = os_env('HOSTNAME_MTR02', 'mtr02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_MTR03 = os_env('HOSTNAME_MTR03', 'mtr03.' + DOMAIN_NAME) %}
-{% set HOSTNAME_PRX01 = os_env('HOSTNAME_PRX01', 'prx01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_PRX02 = os_env('HOSTNAME_PRX02', 'prx02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_PRX03 = os_env('HOSTNAME_PRX03', 'prx03.' + DOMAIN_NAME) %}
-{% set HOSTNAME_RGW = os_env('HOSTNAME_RGW', 'rgw.' + DOMAIN_NAME) %}
-{% set HOSTNAME_RGW01 = os_env('HOSTNAME_RGW01', 'rgw01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_RGW02 = os_env('HOSTNAME_RGW02', 'rgw02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_RGW03 = os_env('HOSTNAME_RGW03', 'rgw03.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CMN01 = os_env('HOSTNAME_CMN01', 'cmn01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CMN02 = os_env('HOSTNAME_CMN02', 'cmn02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_CMN03 = os_env('HOSTNAME_CMN03', 'cmn03.' + DOMAIN_NAME) %}
-{% set HOSTNAME_OSD001 = os_env('HOSTNAME_OSD001', 'osd001.' + DOMAIN_NAME) %}
-{% set HOSTNAME_OSD002 = os_env('HOSTNAME_OSD002', 'osd002.' + DOMAIN_NAME) %}
-{% set HOSTNAME_OSD003 = os_env('HOSTNAME_OSD003', 'osd003.' + DOMAIN_NAME) %}
-
-{% set ETH0_IP_ADDRESS_APT = os_env('ETH0_IP_ADDRESS_ATP', '10.10.0.14') %}
-{% set ETH0_IP_ADDRESS_CFG01 = os_env('ETH0_IP_ADDRESS_CFG01', '10.10.0.15') %}
-{% set ETH0_IP_ADDRESS_PRX01 = os_env('ETH0_IP_ADDRESS_PRX01', '10.10.0.11') %}
-{% set ETH0_IP_ADDRESS_PRX02 = os_env('ETH0_IP_ADDRESS_PRX02', '10.10.0.12') %}
-{% set ETH0_IP_ADDRESS_PRX03 = os_env('ETH0_IP_ADDRESS_PRX03', '10.10.0.13') %}
-{% set ETH0_IP_ADDRESS_CTL = os_env('ETH0_IP_ADDRESS_CTL', '10.10.0.10') %}
-{% set ETH0_IP_ADDRESS_CTL01 = os_env('ETH0_IP_ADDRESS_CTL01', '10.10.0.11') %}
-{% set ETH0_IP_ADDRESS_CTL02 = os_env('ETH0_IP_ADDRESS_CTL02', '10.10.0.12') %}
-{% set ETH0_IP_ADDRESS_CTL03 = os_env('ETH0_IP_ADDRESS_CTL03', '10.10.0.13') %}
-{% set ETH0_IP_ADDRESS_MSG = os_env('ETH0_IP_ADDRESS_MSG', '10.10.0.40') %}
-{% set ETH0_IP_ADDRESS_MSG01 = os_env('ETH0_IP_ADDRESS_MSG01', '10.10.0.41') %}
-{% set ETH0_IP_ADDRESS_MSG02 = os_env('ETH0_IP_ADDRESS_MSG02', '10.10.0.42') %}
-{% set ETH0_IP_ADDRESS_MSG03 = os_env('ETH0_IP_ADDRESS_MSG03', '10.10.0.43') %}
-{% set ETH0_IP_ADDRESS_DBS = os_env('ETH0_IP_ADDRESS_DBS', '10.10.0.50') %}
-{% set ETH0_IP_ADDRESS_DBS01 = os_env('ETH0_IP_ADDRESS_DBS01', '10.10.0.51') %}
-{% set ETH0_IP_ADDRESS_DBS02 = os_env('ETH0_IP_ADDRESS_DBS02', '10.10.0.52') %}
-{% set ETH0_IP_ADDRESS_DBS03 = os_env('ETH0_IP_ADDRESS_DBS03', '10.10.0.53') %}
-{% set ETH0_IP_ADDRESS_KVM01 = os_env('ETH0_IP_ADDRESS_KVM01', '10.10.0.241') %}
-{% set ETH0_IP_ADDRESS_KVM02 = os_env('ETH0_IP_ADDRESS_KVM02', '10.10.0.242') %}
-{% set ETH0_IP_ADDRESS_KVM03 = os_env('ETH0_IP_ADDRESS_KVM03', '10.10.0.243') %}
-{% set ETH0_IP_ADDRESS_KVM04 = os_env('ETH0_IP_ADDRESS_KVM04', '10.10.0.244') %}
-{% set ETH0_IP_ADDRESS_KVM05 = os_env('ETH0_IP_ADDRESS_KVM05', '10.10.0.245') %}
-{% set ETH0_IP_ADDRESS_KVM06 = os_env('ETH0_IP_ADDRESS_KVM06', '10.10.0.246') %}
-{% set ETH0_IP_ADDRESS_CMP001 = os_env('ETH0_IP_ADDRESS_CMP001', '10.10.0.101') %}
-{% set ETH0_IP_ADDRESS_CMP002 = os_env('ETH0_IP_ADDRESS_CMP002', '10.10.0.102') %}
-{% set ETH0_IP_ADDRESS_CMP003 = os_env('ETH0_IP_ADDRESS_CMP003', '10.10.0.103') %}
-{% set ETH0_IP_ADDRESS_CMP004 = os_env('ETH0_IP_ADDRESS_CMP004', '10.10.0.104') %}
-{% set ETH0_IP_ADDRESS_GTW01 = os_env('ETH0_IP_ADDRESS_GTW01', '10.10.0.224') %}
-{% set ETH0_IP_ADDRESS_GTW02 = os_env('ETH0_IP_ADDRESS_GTW02', '10.10.0.225') %}
-{% set ETH0_IP_ADDRESS_GTW02 = os_env('ETH0_IP_ADDRESS_GTW02', '10.10.0.226') %}
-{% set ETH0_IP_ADDRESS_RGW = os_env('ETH0_IP_ADDRESS_RGW', '10.10.0.75') %}
-{% set ETH0_IP_ADDRESS_RGW01 = os_env('ETH0_IP_ADDRESS_RGW01', '10.10.0.76') %}
-{% set ETH0_IP_ADDRESS_RGW02 = os_env('ETH0_IP_ADDRESS_RGW02', '10.10.0.77') %}
-{% set ETH0_IP_ADDRESS_RGW03 = os_env('ETH0_IP_ADDRESS_RGW03', '10.10.0.78') %}
-{% set ETH0_IP_ADDRESS_CMN01 = os_env('ETH0_IP_ADDRESS_CMN01', '10.10.0.66') %}
-{% set ETH0_IP_ADDRESS_CMN02 = os_env('ETH0_IP_ADDRESS_CMN02', '10.10.0.67') %}
-{% set ETH0_IP_ADDRESS_CMN03 = os_env('ETH0_IP_ADDRESS_CMN03', '10.10.0.68') %}
-{% set ETH0_IP_ADDRESS_OSD001 = os_env('ETH0_IP_ADDRESS_OSD001', '10.10.0.201') %}
-{% set ETH0_IP_ADDRESS_OSD002 = os_env('ETH0_IP_ADDRESS_OSD002', '10.10.0.202') %}
-{% set ETH0_IP_ADDRESS_OSD003 = os_env('ETH0_IP_ADDRESS_OSD003', '10.10.0.203') %}
-
-
-{% set ETH1_IP_ADDRESS_CFG01 = os_env('ETH1_IP_ADDRESS_CFG01', '10.11.0.15') %}
-{% set ETH1_IP_ADDRESS_PRX01 = os_env('ETH1_IP_ADDRESS_PRX01', '10.11.0.11') %}
-{% set ETH1_IP_ADDRESS_PRX02 = os_env('ETH1_IP_ADDRESS_PRX02', '10.11.0.12') %}
-{% set ETH1_IP_ADDRESS_PRX03 = os_env('ETH1_IP_ADDRESS_PRX03', '10.11.0.13') %}
-{% set ETH1_IP_ADDRESS_CTL = os_env('ETH1_IP_ADDRESS_CTL', '10.11.0.10') %}
-{% set ETH1_IP_ADDRESS_CTL01 = os_env('ETH1_IP_ADDRESS_CTL01', '10.11.0.11') %}
-{% set ETH1_IP_ADDRESS_CTL02 = os_env('ETH1_IP_ADDRESS_CTL02', '10.11.0.12') %}
-{% set ETH1_IP_ADDRESS_CTL03 = os_env('ETH1_IP_ADDRESS_CTL03', '10.11.0.13') %}
-{% set ETH1_IP_ADDRESS_MSG = os_env('ETH1_IP_ADDRESS_MSG', '10.11.0.40') %}
-{% set ETH1_IP_ADDRESS_MSG01 = os_env('ETH1_IP_ADDRESS_MSG01', '10.11.0.41') %}
-{% set ETH1_IP_ADDRESS_MSG02 = os_env('ETH1_IP_ADDRESS_MSG02', '10.11.0.42') %}
-{% set ETH1_IP_ADDRESS_MSG03 = os_env('ETH1_IP_ADDRESS_MSG03', '10.11.0.43') %}
-{% set ETH1_IP_ADDRESS_DBS = os_env('ETH1_IP_ADDRESS_DBS', '10.11.0.50') %}
-{% set ETH1_IP_ADDRESS_DBS01 = os_env('ETH1_IP_ADDRESS_DBS01', '10.11.0.51') %}
-{% set ETH1_IP_ADDRESS_DBS02 = os_env('ETH1_IP_ADDRESS_DBS02', '10.11.0.52') %}
-{% set ETH1_IP_ADDRESS_DBS03 = os_env('ETH1_IP_ADDRESS_DBS03', '10.11.0.53') %}
-{% set ETH1_IP_ADDRESS_KVM01 = os_env('ETH1_IP_ADDRESS_KVM01', '10.11.0.241') %}
-{% set ETH1_IP_ADDRESS_KVM02 = os_env('ETH1_IP_ADDRESS_KVM02', '10.11.0.242') %}
-{% set ETH1_IP_ADDRESS_KVM03 = os_env('ETH1_IP_ADDRESS_KVM03', '10.11.0.243') %}
-{% set ETH1_IP_ADDRESS_KVM04 = os_env('ETH1_IP_ADDRESS_KVM04', '10.11.0.244') %}
-{% set ETH1_IP_ADDRESS_KVM05 = os_env('ETH1_IP_ADDRESS_KVM05', '10.11.0.245') %}
-{% set ETH1_IP_ADDRESS_KVM06 = os_env('ETH1_IP_ADDRESS_KVM06', '10.11.0.246') %}
-{% set ETH1_IP_ADDRESS_CMP001 = os_env('ETH1_IP_ADDRESS_CMP001', '10.11.0.101') %}
-{% set ETH1_IP_ADDRESS_CMP002 = os_env('ETH1_IP_ADDRESS_CMP002', '10.11.0.102') %}
-{% set ETH1_IP_ADDRESS_GTW01 = os_env('ETH1_IP_ADDRESS_GTW01', '10.11.0.224') %}
-{% set ETH1_IP_ADDRESS_GTW02 = os_env('ETH1_IP_ADDRESS_GTW02', '10.11.0.225') %}
-{% set ETH1_IP_ADDRESS_GTW02 = os_env('ETH1_IP_ADDRESS_GTW02', '10.11.0.226') %}
-{% set ETH1_IP_ADDRESS_RGW = os_env('ETH1_IP_ADDRESS_RGW', '10.11.0.75') %}
-{% set ETH1_IP_ADDRESS_RGW01 = os_env('ETH1_IP_ADDRESS_RGW01', '10.11.0.76') %}
-{% set ETH1_IP_ADDRESS_RGW02 = os_env('ETH1_IP_ADDRESS_RGW02', '10.11.0.77') %}
-{% set ETH1_IP_ADDRESS_RGW03 = os_env('ETH1_IP_ADDRESS_RGW03', '10.11.0.78') %}
-{% set ETH1_IP_ADDRESS_CMN01 = os_env('ETH1_IP_ADDRESS_CMN01', '10.11.0.66') %}
-{% set ETH1_IP_ADDRESS_CMN02 = os_env('ETH1_IP_ADDRESS_CMN02', '10.11.0.67') %}
-{% set ETH1_IP_ADDRESS_CMN03 = os_env('ETH1_IP_ADDRESS_CMN03', '10.11.0.68') %}
-{% set ETH1_IP_ADDRESS_OSD001 = os_env('ETH1_IP_ADDRESS_OSD001', '10.11.0.201') %}
-{% set ETH1_IP_ADDRESS_OSD002 = os_env('ETH1_IP_ADDRESS_OSD002', '10.11.0.202') %}
-{% set ETH1_IP_ADDRESS_OSD002 = os_env('ETH1_IP_ADDRESS_OSD002', '10.11.0.203') %}
-
-{% set ETH2_IP_ADDRESS_CFG01 = os_env('ETH1_IP_ADDRESS_CFG01', '172.16.44.33') %}
-
-{% set ETH0_IP_ADDRESS_CFG01_PREFIX = '.'.join(ETH0_IP_ADDRESS_CFG01.split('.')[0:3]) %}
-{% set ETH1_IP_ADDRESS_CFG01_PREFIX = '.'.join(ETH1_IP_ADDRESS_CFG01.split('.')[0:3]) %}
-{% set ETH2_IP_ADDRESS_CFG01_PREFIX = '.'.join(ETH2_IP_ADDRESS_CFG01.split('.')[0:3]) %}
-
-
----
-aliases:
- - &interface_model {{ os_env('INTERFACE_MODEL', 'virtio') }}
- - &cloudinit_meta_data {{ CLOUDINIT_META_DATA }}
- - &cloudinit_user_data_cfg01 {{ CLOUDINIT_USER_DATA_CFG01 }}
-
-
-template:
-  devops_settings:
-    env_name: {{ os_env('ENV_NAME', 'phy-mcp-offline-vxlan_' + REPOSITORY_SUITE + "_" + os_env('BUILD_NUMBER', '')) }}
-
-    address_pools:
-      managment-pool01:
-        net: {{ os_env('MGMT_ADDRESS_POOL01', '10.11.0.0/16:16') }}
-        params:
-          ip_reserved:
-            gateway: +1
-            l2_network_device: +1
-            default_{{ HOSTNAME_CFG01 }}: {{ ETH1_IP_ADDRESS_CFG01 }}
-            default_{{ HOSTNAME_KVM01 }}: {{ ETH1_IP_ADDRESS_KVM01 }}
-            default_{{ HOSTNAME_KVM02 }}: {{ ETH1_IP_ADDRESS_KVM02 }}
-            default_{{ HOSTNAME_KVM03 }}: {{ ETH1_IP_ADDRESS_KVM03 }}
-            default_{{ HOSTNAME_KVM04 }}: {{ ETH1_IP_ADDRESS_KVM04 }}
-            default_{{ HOSTNAME_KVM05 }}: {{ ETH1_IP_ADDRESS_KVM05 }}
-            default_{{ HOSTNAME_KVM06 }}: {{ ETH1_IP_ADDRESS_KVM06 }}
-            default_{{ HOSTNAME_CMP001 }}: {{ ETH1_IP_ADDRESS_CMP001 }}
-            default_{{ HOSTNAME_CMP002 }}: {{ ETH1_IP_ADDRESS_CMP002 }}
-            default_{{ HOSTNAME_CMP003 }}: {{ ETH1_IP_ADDRESS_CMP003 }}
-            default_{{ HOSTNAME_CMP004 }}: {{ ETH1_IP_ADDRESS_CMP004 }}
-            default_{{ HOSTNAME_GTW01 }}: {{ ETH1_IP_ADDRESS_GTW01 }}
-            default_{{ HOSTNAME_GTW02 }}: {{ ETH1_IP_ADDRESS_GTW02 }}
-            default_{{ HOSTNAME_GTW03 }}: {{ ETH1_IP_ADDRESS_GTW03 }}
-            default_{{ HOSTNAME_CTL }}: {{ ETH1_IP_ADDRESS_CTL }}
-            default_{{ HOSTNAME_CTL01 }}: {{ ETH1_IP_ADDRESS_CTL01 }}
-            default_{{ HOSTNAME_CTL02 }}: {{ ETH1_IP_ADDRESS_CTL02 }}
-            default_{{ HOSTNAME_CTL03 }}: {{ ETH1_IP_ADDRESS_CTL03 }}
-            default_{{ HOSTNAME_MSG }}: {{ ETH1_IP_ADDRESS_MSG }}
-            default_{{ HOSTNAME_MSG01 }}: {{ ETH1_IP_ADDRESS_MSG02 }}
-            default_{{ HOSTNAME_MSG02 }}: {{ ETH1_IP_ADDRESS_MSG03 }}
-            default_{{ HOSTNAME_MSG03 }}: {{ ETH1_IP_ADDRESS_MSG04 }}
-            default_{{ HOSTNAME_MON }}: {{ ETH1_IP_ADDRESS_MON }}
-            default_{{ HOSTNAME_MON01 }}: {{ ETH1_IP_ADDRESS_MON01 }}
-            default_{{ HOSTNAME_MON02 }}: {{ ETH1_IP_ADDRESS_MON02 }}
-            default_{{ HOSTNAME_MON03 }}: {{ ETH1_IP_ADDRESS_MON03 }}
-            default_{{ HOSTNAME_DBS }}: {{ ETH1_IP_ADDRESS_DBS }}
-            default_{{ HOSTNAME_DBS01 }}: {{ ETH1_IP_ADDRESS_DBS01 }}
-            default_{{ HOSTNAME_DBS02 }}: {{ ETH1_IP_ADDRESS_DBS02 }}
-            default_{{ HOSTNAME_DBS03 }}: {{ ETH1_IP_ADDRESS_DBS03 }}
-            default_{{ HOSTNAME_LOG }}: {{ ETH1_IP_ADDRESS_LOG }}
-            default_{{ HOSTNAME_LOG01 }}: {{ ETH1_IP_ADDRESS_LOG01 }}
-            default_{{ HOSTNAME_LOG02 }}: {{ ETH1_IP_ADDRESS_LOG02 }}
-            default_{{ HOSTNAME_LOG03 }}: {{ ETH1_IP_ADDRESS_LOG03 }}
-            default_{{ HOSTNAME_MTR }}: {{ ETH1_IP_ADDRESS_MTR }}
-            default_{{ HOSTNAME_MTR01 }}: {{ ETH1_IP_ADDRESS_MTR01 }}
-            default_{{ HOSTNAME_MTR02 }}: {{ ETH1_IP_ADDRESS_MTR02 }}
-            default_{{ HOSTNAME_MTR03 }}: {{ ETH1_IP_ADDRESS_MTR03 }}
-            default_{{ HOSTNAME_RGW }}: {{ ETH1_IP_ADDRESS_RGW }}
-            default_{{ HOSTNAME_RGW01 }}: {{ ETH1_IP_ADDRESS_RGW01 }}
-            default_{{ HOSTNAME_RGW02 }}: {{ ETH1_IP_ADDRESS_RGW02 }}
-            default_{{ HOSTNAME_RGW03 }}: {{ ETH1_IP_ADDRESS_RGW03 }}
-            default_{{ HOSTNAME_CMN01 }}: {{ ETH1_IP_ADDRESS_CMN01 }}
-            default_{{ HOSTNAME_CMN02 }}: {{ ETH1_IP_ADDRESS_CMN02 }}
-            default_{{ HOSTNAME_CMN03 }}: {{ ETH1_IP_ADDRESS_CMN03 }}
-            default_{{ HOSTNAME_OSD001 }}: {{ ETH1_IP_ADDRESS_OSD001 }}
-            default_{{ HOSTNAME_OSD002 }}: {{ ETH1_IP_ADDRESS_OSD002 }}
-            default_{{ HOSTNAME_OSD003 }}: {{ ETH1_IP_ADDRESS_OSD003 }}
-
-      admin-pool01:
-        net: {{ os_env('DEPLOY_ADDRESS_POOL01', '10.10.0.0/16:16') }}
-        params:
-          ip_reserved:
-            gateway: +1
-            l2_network_device: +1
-            default_{{ HOSTNAME_APT }}: {{ ETH0_IP_ADDRESS_APT }}
-            default_{{ HOSTNAME_CFG01 }}: {{ ETH0_IP_ADDRESS_CFG01 }}
-            default_{{ HOSTNAME_KVM01 }}: {{ ETH0_IP_ADDRESS_KVM01 }}
-            default_{{ HOSTNAME_KVM02 }}: {{ ETH0_IP_ADDRESS_KVM02 }}
-            default_{{ HOSTNAME_KVM03 }}: {{ ETH0_IP_ADDRESS_KVM03 }}
-            default_{{ HOSTNAME_KVM04 }}: {{ ETH0_IP_ADDRESS_KVM04 }}
-            default_{{ HOSTNAME_KVM05 }}: {{ ETH0_IP_ADDRESS_KVM05 }}
-            default_{{ HOSTNAME_KVM06 }}: {{ ETH0_IP_ADDRESS_KVM06 }}
-            default_{{ HOSTNAME_CMP001 }}: {{ ETH0_IP_ADDRESS_CMP001 }}
-            default_{{ HOSTNAME_CMP002 }}: {{ ETH0_IP_ADDRESS_CMP002 }}
-            default_{{ HOSTNAME_GTW01 }}: {{ ETH0_IP_ADDRESS_GTW01 }}
-            default_{{ HOSTNAME_GTW02 }}: {{ ETH0_IP_ADDRESS_GTW02 }}
-            default_{{ HOSTNAME_CTL }}: {{ ETH0_IP_ADDRESS_CTL }}
-            default_{{ HOSTNAME_CTL01 }}: {{ ETH0_IP_ADDRESS_CTL02 }}
-            default_{{ HOSTNAME_CTL02 }}: {{ ETH0_IP_ADDRESS_CTL03 }}
-            default_{{ HOSTNAME_CTL03 }}: {{ ETH0_IP_ADDRESS_CTL04 }}
-            default_{{ HOSTNAME_MSG }}: {{ ETH0_IP_ADDRESS_MSG }}
-            default_{{ HOSTNAME_MSG01 }}: {{ ETH0_IP_ADDRESS_MSG02 }}
-            default_{{ HOSTNAME_MSG02 }}: {{ ETH0_IP_ADDRESS_MSG03 }}
-            default_{{ HOSTNAME_MSG03 }}: {{ ETH0_IP_ADDRESS_MSG04 }}
-            default_{{ HOSTNAME_MON }}: {{ ETH0_IP_ADDRESS_MON }}
-            default_{{ HOSTNAME_MON01 }}: {{ ETH0_IP_ADDRESS_MON01 }}
-            default_{{ HOSTNAME_MON02 }}: {{ ETH0_IP_ADDRESS_MON02 }}
-            default_{{ HOSTNAME_MON03 }}: {{ ETH0_IP_ADDRESS_MON03 }}
-            default_{{ HOSTNAME_DBS }}: {{ ETH0_IP_ADDRESS_DBS }}
-            default_{{ HOSTNAME_DBS01 }}: {{ ETH0_IP_ADDRESS_DBS02 }}
-            default_{{ HOSTNAME_DBS02 }}: {{ ETH0_IP_ADDRESS_DBS03 }}
-            default_{{ HOSTNAME_DBS03 }}: {{ ETH0_IP_ADDRESS_DBS04 }}
-            default_{{ HOSTNAME_LOG }}: {{ ETH0_IP_ADDRESS_LOG }}
-            default_{{ HOSTNAME_LOG01 }}: {{ ETH0_IP_ADDRESS_LOG02 }}
-            default_{{ HOSTNAME_LOG02 }}: {{ ETH0_IP_ADDRESS_LOG03 }}
-            default_{{ HOSTNAME_LOG03 }}: {{ ETH0_IP_ADDRESS_LOG04 }}
-            default_{{ HOSTNAME_MTR }}: {{ ETH0_IP_ADDRESS_MTR }}
-            default_{{ HOSTNAME_MTR01 }}: {{ ETH0_IP_ADDRESS_MTR02 }}
-            default_{{ HOSTNAME_MTR02 }}: {{ ETH0_IP_ADDRESS_MTR03 }}
-            default_{{ HOSTNAME_MTR03 }}: {{ ETH0_IP_ADDRESS_MTR04 }}
-            default_{{ HOSTNAME_RGW }}: {{ ETH0_IP_ADDRESS_RGW }}
-            default_{{ HOSTNAME_RGW01 }}: {{ ETH0_IP_ADDRESS_RGW01 }}
-            default_{{ HOSTNAME_RGW02 }}: {{ ETH0_IP_ADDRESS_RGW02 }}
-            default_{{ HOSTNAME_RGW03 }}: {{ ETH0_IP_ADDRESS_RGW03 }}
-            default_{{ HOSTNAME_CMN01 }}: {{ ETH0_IP_ADDRESS_CMN01 }}
-            default_{{ HOSTNAME_CMN02 }}: {{ ETH0_IP_ADDRESS_CMN02 }}
-            default_{{ HOSTNAME_CMN03 }}: {{ ETH0_IP_ADDRESS_CMN03 }}
-            default_{{ HOSTNAME_OSD001 }}: {{ ETH0_IP_ADDRESS_OSD001 }}
-            default_{{ HOSTNAME_OSD002 }}: {{ ETH0_IP_ADDRESS_OSD002 }}
-            default_{{ HOSTNAME_OSD003 }}: {{ ETH0_IP_ADDRESS_OSD003 }}
-
-      public-pool01:
-        net: {{ os_env('PUBLIC_ADDRESS_POOL01', '172.16.44.0/22:22') }}
-        params:
-          ip_reserved:
-            gateway: +1
-            l2_network_device: +1
-            default_{{ HOSTNAME_CFG01 }}: {{ ETH2_IP_ADDRESS_CFG01 }}
-
-      external-pool01:
-        net: {{ os_env('EXTERNAL_ADDRESS_POOL01', '10.13.0.0/16:16') }}
-        params:
-          ip_reserved:
-            gateway: +1
-            l2_network_device: +1
-            default_{{ HOSTNAME_CFG01 }}: +15
-          ip_ranges:
-              dhcp: [+130, +230]
-
-
-    groups:
-
-      - name: default
-        driver:
-          name: devops.driver.libvirt
-          params:
-            connection_string: !os_env CONNECTION_STRING, qemu:///system
-            storage_pool_name: !os_env STORAGE_POOL_NAME, default
-            stp: False
-            hpet: False
-            enable_acpi: true
-            use_host_cpu: !os_env DRIVER_USE_HOST_CPU, true
-
-        network_pools:
-          admin: admin-pool01
-          managment: managment-pool01
-          public: public-pool01
-          external: external-pool01
-
-        l2_network_devices:
-          # Ironic management interface
-          managment:
-            address_pool: managment-pool01
-            dhcp: false
-            forward:
-              mode: bridge
-            parent_iface:
-              phys_dev: !os_env ADMIN_BRIDGE
-
-          admin: # deploy
-            address_pool: admin-pool01
-            dhcp: false
-            forward:
-              mode: bridge
-            parent_iface:
-              phys_dev: !os_env DEPLOY_BRIDGE
-
-          public:
-            address_pool: public-pool01
-            dhcp: false
-            forward:
-              mode: bridge
-            parent_iface:
-              phys_dev: !os_env PUBLIC_BRIDGE
-
-          external:
-            address_pool: external-pool01
-            dhcp: false
-            forward:
-              mode: bridge
-            parent_iface:
-              phys_dev: !os_env EXTERNAL_BRIDGE
-
-
-          #admin:
-          #  address_pool: admin-pool01
-          #  dhcp: true
-
-        #group_volumes:
-        #
-        #
-        #
-
-        nodes:
-          - name: {{ HOSTNAME_CFG01 }}
-            role: salt_master
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 8
-              memory: !os_env SLAVE_NODE_MEMORY, 16384
-              boot:
-                - hd
-              # cloud_init_volume_name: iso
-              # cloud_init_iface_up: ens3
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 150
-                  shared_backing_store_name: !os_env CFG01_VOLUME_NAME
-                  format: qcow2
-                # - name: iso  # Volume with name 'iso' will be used
-                #              # for store image with cloud-init metadata.
-                #   capacity: 1
-                #   format: raw
-                #   device: cdrom
-                #   bus: ide
-                #   cloudinit_meta_data: *cloudinit_meta_data
-                #   cloudinit_user_data: *cloudinit_user_data_cfg01
-                - name: iso
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  source_image: !os_env CFG01_CONFIG_PATH
-
-
-              interfaces:
-                - label: ens3
-                  l2_network_device: admin # deploy
-                  interface_model: *interface_model
-
-                - label: ens4
-                  l2_network_device: managment
-                  interface_model: *interface_model
-
-                - label: ens5
-                  l2_network_device: public
-                  interface_model: *interface_model
-
-                - label: ens6
-                  l2_network_device: external
-                  interface_model: *interface_model
-
-
-              network_config:
-                ens3:
-                  networks:
-                    - admin # deploy
-                ens4:
-                  networks:
-                    - managment
-                ens5:
-                  networks:
-                    - public
-                ens6:
-                 networks:
-                   - external
-
-          - name: {{ HOSTNAME_APT }}
-            role: salt_minion
-            params:
-              vcpu: !os_env SLAVE_NODE_CPU, 4
-              memory: !os_env SLAVE_NODE_MEMORY, 4096
-              boot:
-                - hd
-              volumes:
-                - name: system
-                  capacity: !os_env NODE_VOLUME_SIZE, 550
-                  shared_backing_store_name: !os_env APT_VOLUME_NAME
-                  format: qcow2
-                - name: iso  # Volume with name 'iso' will be used
-                             # for store image with cloud-init metadata.
-                  # capacity: 1
-                  format: raw
-                  device: cdrom
-                  bus: ide
-                  source_image: !os_env APT_CONFIG_PATH
-
-              interfaces:
-                - label: ens3
-                  l2_network_device: admin # deploy
-                  interface_model: *interface_model
-                #- label: ens4
-                #  l2_network_device: admin
-                #  interface_model: *interface_model
-
-              network_config:
-                ens3:
-                  networks:
-                    - admin
-                #ens4:
-                #  networks:
-                #    - admin
-
diff --git a/tcp_tests/templates/physical-mcp-offline-vxlan/user-data-cfg01.yaml b/tcp_tests/templates/physical-mcp-offline-vxlan/user-data-cfg01.yaml
deleted file mode 100644
index f3d0eeb..0000000
--- a/tcp_tests/templates/physical-mcp-offline-vxlan/user-data-cfg01.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-#cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
-
-vendor_data:
-    enabled: True
-
-ssh_pwauth: True
-users:
-  - name: root
-    sudo: ALL=(ALL) NOPASSWD:ALL
-    shell: /bin/bash
-    ssh_pwauth: True
-
-
-disable_root: false
-chpasswd:
-  list: |
-    root:r00tme
-  expire: False
-
-bootcmd:
- # Block access to SSH while node is preparing
- # - cloud-init-per once sudo echo 'sshd:ALL' >> /etc/hosts.deny
- # Enable root access
- - touch /is_cloud_init_started
- - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
- - service sshd restart
-
-merge_how: "dict(recurse_array)+list(append)"