diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
deleted file mode 100644
index 3518df9..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
+++ /dev/null
@@ -1,298 +0,0 @@
-
-classes:
-  - system.linux.system.repo.docker
-  - system.linux.system.haveged
-  - system.glusterfs.client.cluster
-  - system.glusterfs.client.volume.aptly
-  - system.glusterfs.client.volume.devops_portal
-  - system.glusterfs.client.volume.elasticsearch
-  - system.glusterfs.client.volume.gerrit
-  - system.glusterfs.client.volume.jenkins
-  - system.glusterfs.client.volume.mysql
-  - system.glusterfs.client.volume.openldap
-  - system.glusterfs.client.volume.postgresql
-  - system.glusterfs.client.volume.pushkin
-  - system.glusterfs.client.volume.registry
-  - system.glusterfs.client.volume.rundeck
-  - system.glusterfs.client.volume.salt_pki
-  - system.glusterfs.client.volume.security_monkey
-  - cluster.virtual-mcp-ocata-cicd.cicd.gluster
- #- system.glusterfs.client.volume.salt
-  # Docker
-  - system.docker.host
-
-  # Generate aptly-publisher config to use for jenkins slaves
-  - system.aptly.client.publisher
-
-  # Docker services
-  - system.docker.swarm.stack.aptly
-  - system.docker.swarm.stack.devops_portal
-  - system.docker.swarm.stack.docker
-  - system.docker.swarm.stack.elasticsearch
-  - system.docker.swarm.stack.gerrit
-  - system.docker.swarm.stack.jenkins
-  - system.docker.swarm.stack.ldap
-  - system.docker.swarm.stack.postgresql
-  - system.docker.swarm.stack.pushkin
-  - system.docker.swarm.stack.rundeck
-  - system.docker.swarm.stack.security_monkey
-  # Docker networks
-  - system.docker.swarm.network.oss_backend
-
-  # Keepalived
-  - system.keepalived.cluster.instance.cicd_control_vip
-
-  # HAProxy
-  - system.salt.minion.cert.proxy.cicd
-  - system.haproxy.proxy.single
-  - system.haproxy.proxy.listen.cicd.aptly
-  - system.haproxy.proxy.listen.cicd.gerrit
-  - system.haproxy.proxy.listen.cicd.jenkins
-  - system.haproxy.proxy.listen.docker.registry
-  - system.haproxy.proxy.listen.docker.visualizer
-  - system.haproxy.proxy.listen.openldap
-  - system.haproxy.proxy.listen.oss.devops_portal
-  - system.haproxy.proxy.listen.oss.elasticsearch
-  - system.haproxy.proxy.listen.oss.postgresql
-  - system.haproxy.proxy.listen.oss.pushkin
-  - system.haproxy.proxy.listen.oss.rundeck
-  - system.haproxy.proxy.listen.oss.security_monkey
-  - system.haproxy.proxy.listen.phpldapadmin
-  - system.haproxy.proxy.listen.mysql
-  - system.haproxy.proxy.listen.stats
-
-  # PostgreSQL
-  - system.postgresql.client.pushkin
-  - system.postgresql.client.rundeck
-  - system.postgresql.client.security_monkey
-
-  # DevOps Portal
-  - system.devops_portal.service.elasticsearch
-  - system.devops_portal.service.gerrit
-  - system.devops_portal.service.jenkins
-  - system.devops_portal.service.pushkin
-  - system.devops_portal.service.rundeck
-  - system.devops_portal.service.security_monkey
-
-  # Rundeck
-  - system.rundeck.client.runbook
-
-  - cluster.virtual-mcp-ocata-cicd.infra
-
-parameters:
-  _param:
-    cluster_node01_name: ${_param:cicd_control_node01_hostname}
-    cluster_node01_address: ${_param:cicd_control_node01_address}
-    cluster_node02_name: ${_param:cicd_control_node02_hostname}
-    cluster_node02_address: ${_param:cicd_control_node02_address}
-    cluster_node03_name: ${_param:cicd_control_node03_hostname}
-    cluster_node03_address: ${_param:cicd_control_node03_address}
-    keepalived_vip_virtual_router_id: 180
-    keepalived_vip_password: TLrAYaAbAEZwXsp1
-    keepalived_vip_interface: ens3
-    control_vip_address: ${_param:cicd_control_address}
-    cluster_vip_address: ${_param:control_vip_address}
-    glusterfs_service_host: ${_param:control_vip_address}
-    cluster_public_host: ${_param:control_vip_address}
-    salt_api_password: Dnx3fapzHIcGuURdDck3DPv78V3ehwue
-    # Docker images and versions
-    docker_registry_http_secret: jvJRsYDEPts2HdNk
-    # CI/CD service databases
-    mysql_admin_password: TSi6AgDGv2nZjblQ
-    mysql_gerrit_password: f6XRcwSNHTh8zCuS
-
-    # Proxy
-    cluster_ssl_certificate:
-      enabled: true
-      pem_file: /etc/haproxy/ssl/${_param:cluster_public_host}-all.pem
-    haproxy_bind_address: ${_param:cluster_vip_address}
-    haproxy_mysql_source_port: 13306
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
-
-    # Aptly
-    aptly_gpg_keypair_id: none
-    aptly_gpg_passphrase: none
-    aptly_server_secure: false
-    aptly_gpg_public_key: none
-    aptly_gpg_private_key: none
-
-    # OpenLDAP
-    openldap_organisation: "${_param:cluster_name}"
-    openldap_dn: "dc=virtual-mcp-ocata-cicd,dc=local"
-    openldap_domain: "virtual-mcp-ocata-cicd.local"
-    openldap_admin_password: UdTuP7GPPTaCoPSV
-    openldap_config_password: RQK8h0F3aNdvv26U
-    openldap_readonly_password: myMSnD6mn8ziUP2S
-
-    # PostgreSQL
-    docker_image_postgresql: "library/postgres:9.6"
-    postgresql_admin_user_password: faeRpEA4uye2Sj2s
-    postgresql_client_user: ${_param:postgresql_admin_user}
-    postgresql_client_password: ${_param:postgresql_admin_user_password}
-    postgresql_client_host: ${_param:haproxy_postgresql_bind_host}
-    postgresql_client_port: ${_param:haproxy_postgresql_bind_port}
-
-    # Jenkins
-    jenkins_slave_user: admin
-    jenkins_client_user: admin
-    jenkins_admin_password: ${_param:openldap_admin_password}
-    jenkins_security_ldap_server: ${_param:cluster_vip_address}
-    jenkins_security_ldap_root_dn: ${_param:openldap_dn}
-    jenkins_security_ldap_manager_dn: "cn=admin,${_param:openldap_dn}"
-    jenkins_security_ldap_manager_password: ${_param:openldap_admin_password}
-    jenkins_slave_password: ${_param:jenkins_admin_password}
-    jenkins_client_password: ${_param:jenkins_admin_password}
-    jenkins_admin_email: ${_param:admin_email}
-    jenkins_admin_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3PNQbFye7OC13h7esNT+LXtIKOZbmSmQdj2wrVW1nwFQBodgG2XFJUyKwVZ3gCqS68sN0kOzqix/R4oOL2lm1vZX69Mx3mON6fkvMdgpaEE78VH/SAiuUhCLP83Ic1QRp55uriZ0a1Pa91kqqXnqWLQX7NK4oTtps1sukxg+WVyT55jnwJ8F4a2HIgf+heZNunfw1NlQI6tGXwdiTON7agVybodtRQZctB3/6rQrxKFT9No5BYrEtt2sEg4xBl/XvhbBIyKmi2URgSOplpezGGJcVHTCddRRP0st4etsh39I8H0qzwWnufgYr1dGCr7AOt0grQOUaAKivjK/PV7IL
-    jenkins_admin_private_key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      MIIEpQIBAAKCAQEAtzzUGxcnuzgtd4e3rDU/i17SCjmW5kpkHY9sK1VtZ8BUAaHY
-      BtlxSVMisFWd4AqkuvLDdJDs6osf0eKDi9pZtb2V+vTMd5jjen5LzHYKWhBO/FR/
-      0gIrlIQiz/NyHNUEaeebq4mdGtT2vdZKql56li0F+zSuKE7abNbLpMYPllck+eY5
-      8CfBeGthyIH/oXmTbp38NTZUCOrRl8HYkzje2oFcm6HbUUGXLQd/+q0K8ShU/TaO
-      QWKxLbdrBIOMQZf174WwSMipotlEYEjqZaXsxhiXFR0wnXUUT9LLeHrbId/SPB9K
-      s8Fp7n4GK9XRgq+wDrdIK0DlGgCor4yvz1eyCwIDAQABAoIBAB3a5Vw8m5afgpj1
-      HfILAv18R5Cu7W08Na+zTJaK5rZ+2bEiY4ZKK3EdAIvmh0CXu1tSbpIxgsh8PoT9
-      +RzySKeZ6jPnauEZoga1SThZCzq9aYEna2QWQm+CUAG90pvsAToYKH78fwJ+LG2l
-      2qiDmEmbsFvLq4yZvHD7VlbUhnmiFm1kzPPa2SdeimYl0TlOKOMS/l0UkG0isMEQ
-      3dGR3GOCA9az7UAuBvB0rAhOjWUfDEFGeKYlZ9kHgK6r7eYMA0Ij7eIbZYvE0tAE
-      slhhevDbrnEpzD3XClSmco62RhRIhvS639Q09IksA+yLBFLnjVOtEsWroD4iFDPI
-      4kLTewECgYEA6x6i5YlY5Mxsq7S22d4XcSafd7FJm7FNZeM+8/aPeQjSunXby5rD
-      pYQBYGZG9pNuJ6R6hxunlWiTmzkogZLoWqDfTrjjJ7qnYpA/6NS97jdDBq8o5lIb
-      LWFLn86QyuLUFLUzPbeBsAfiRAoKm6qdmwCMNHEuleLOGVUdTx84PksCgYEAx4Kr
-      8jvyRazRQtbYWTvMViHs7w5tYRUI7NZ35DfI2nJA/VRWfCvK7F/QpgFfeEB3vBVM
-      +s9HBiJ23cqS44Iw/WhGMdoXSXFqiz6Ry8oQ0LXl1ed1eq8Bq/Y6qbGpgUv6QdYX
-      DDE2vezsq4jcmFVRCKexCTVKgf/bSN8VhSLfA0ECgYEAsP1w9oU7y5AvRdpVww+y
-      adT/OiTVGkSP1OEJ5LB4NE52AzLxcAVivdfvCVg0ly1IQMNKESa6Mnh0lOakHVYv
-      Xvm24BXBuYiCtGmOEoEDMK2c4Q0+JpMsLi8NtJDU4kV6DNSSbCUVlSN6Kmm8ro3y
-      8lmpMVj6Do6bQuqVk5gWyJ0CgYEApTU6p1smkrW5jyyTeMkAuu5a4dZDktm1S1GJ
-      dA0RoHpuAJjfCPHGlpf9EgofAVf5DmFhHmuX96eAYMbHfeeoI58+STe8gs+NF4MX
-      ffZ0mC+YA9onuRDERJ6gEzcQEwZUVEIxUaJLH1ja3mx1pxs3AADEo8hiS2YQMraw
-      fk/S9kECgYEAmB1tL0F796xtfaeNwQ35FZW2gpWvJLrBfO5vkXrA8JFhldW5LHr0
-      7xy+goivnFtD2rvCMNOVWdGT4yEftajz6vXsXLr2XQ8X3HH8O0BIqWyobguQs3t0
-      d4sWoM2Qt45r+B/UoLMPmkjtebmQe+gKbdv8rv+FWPAckc7L7MCkveA=
-      -----END RSA PRIVATE KEY-----
-    # Jobs params
-    jenkins_gerrit_url: ssh://admin@${_param:haproxy_gerrit_bind_host}:${_param:haproxy_gerrit_ssh_bind_port}
-    jenkins_aptly_api_url: http://${_param:haproxy_aptly_api_bind_host}:${_param:haproxy_aptly_api_bind_port}
-    jenkins_aptly_url: http://${_param:haproxy_aptly_public_bind_host}:${_param:haproxy_aptly_public_bind_port}
-    # Gerrit
-    gerrit_admin_password: ${_param:openldap_admin_password}
-    gerrit_admin_email: ${_param:admin_email}
-    gerrit_public_host: http://${_param:haproxy_gerrit_bind_host}:${_param:haproxy_gerrit_bind_port}
-    gerrit_admin_public_key: ${_param:jenkins_admin_public_key}
-    gerrit_admin_private_key: ${_param:jenkins_admin_private_key}
-    gerrit_auth_type: LDAP
-    gerrit_ldap_server: "ldap://${_param:cluster_vip_address}"
-    gerrit_ldap_bind_user: "cn=admin,${_param:openldap_dn}"
-    gerrit_ldap_bind_password: ${_param:openldap_admin_password}
-    gerrit_ldap_account_base: ou=people,${_param:openldap_dn}
-    gerrit_ldap_group_base: ou=groups,${_param:openldap_dn}
-
-    # Rundeck
-    docker_image_rundeck: "docker-prod-local.artifactory.mirantis.com/mirantis/oss/rundeck:latest"
-    rundeck_db_user: rundeck
-    rundeck_db_user_password: password
-    rundeck_db_host: ${_param:haproxy_postgresql_bind_host}
-    rundeck_postgresql_username: ${_param:rundeck_db_user}
-    rundeck_postgresql_password: ${_param:rundeck_db_user_password}
-    rundeck_postgresql_database: rundeck
-    rundeck_postgresql_host: ${_param:rundeck_db_host}
-
-    rundeck_cis_enabled: True
-    rundeck_cis_os_auth_url: http://172.16.10.254:5000/v3/auth/tokens
-    rundeck_cis_os_username: "${_param:oss_openstack_username}"
-    rundeck_cis_os_password: "${_param:oss_openstack_password}"
-    rundeck_cis_os_project_name: "${_param:oss_openstack_project}"
-    rundeck_cis_os_domain_id: "${_param:oss_openstack_domain_id}"
-    rundeck_cis_jobs_repository: "https://gerrit.mcp.mirantis.net/oss/rundeck-cis-jobs"
-    rundeck_cis_jobs_revision: "master"
-    rundeck_cis_os_docker_image: "docker-prod-local.artifactory.mirantis.com/mirantis/oss/cis-openstack:latest"
-    rundeck_cis_elasticsearch_url: http://${_param:haproxy_elasticsearch_bind_host}:${_param:haproxy_elasticsearch_http_bind_port}
-
-    rundeck_runbook_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBPHRctBuN16hVe05HxKeN1AqPqbjvWvqQ1zcr/sbJJXHgVBTACRD6G+DAi7SSJr7dLzyeNo042szJclsH/qf9h0tcytINATzye//x6MtzXZ4YIDkcd1Yhz1LRgCXk1PvIensJAdClYOymx+SRaJxEEzbLxgqhSnYOUY3xVGbUrgfXI9+ZG9hs9zfq5JEMRjQay5p+xuYv/wCoU+pbFPDmsW0hQ99O+XBHcwrpU3crkImetTM2WfnRlBkoJypLv/HicTJtnL91/BWcebvW50oxrEq1QQ82T1Wl3pQsJw24M48fXyl/HbF2QVP6O1Ptqr3O7cIByxJWHih3paZncVEj
-    rundeck_runbook_private_key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      MIIEpAIBAAKCAQEAwTx0XLQbjdeoVXtOR8SnjdQKj6m471r6kNc3K/7GySVx4FQU
-      wAkQ+hvgwIu0kia+3S88njaNONrMyXJbB/6n/YdLXMrSDQE88nv/8ejLc12eGCA5
-      HHdWIc9S0YAl5NT7yHp7CQHQpWDspsfkkWicRBM2y8YKoUp2DlGN8VRm1K4H1yPf
-      mRvYbPc36uSRDEY0GsuafsbmL/8AqFPqWxTw5rFtIUPfTvlwR3MK6VN3K5CJnrUz
-      Nln50ZQZKCcqS7/x4nEybZy/dfwVnHm71udKMaxKtUEPNk9Vpd6ULCcNuDOPH18p
-      fx2xdkFT+jtT7aq9zu3CAcsSVh4od6WmZ3FRIwIDAQABAoIBAQCsnUNY2G7Quzec
-      /KQFyi7eq+6vPK596ihwIEAhpdqPLkrWWGWc0bx/n02a0nGAKOpQjPS6ZAKtKg7L
-      WMLmll4cRLJWdrtCcLuv5ILS5uBu8s7ZwFckDZo8Y4YYrT+sdXFhOcAUYLGwOa/M
-      oD2WgvsseHl3eDZgtDJXQhTo4jtleW4/ZETmduUBx2djSfwx2vv8N6V7+5bH2kvL
-      3PgR3PYp1uD+dPDy00SwuiWDDwljubQzpres8K4ikIWWaU4/t9TUBv+PJt3Kbavi
-      0ca+jdpRdPCW4QmEhNT+D10B3DCN9uVt9leCrYzvcrT1ElqiL4ODBefG0clKq64d
-      Zc59IVypAoGBAO2PX2qApylv+uuVe2dscH10qUjgYIuXeszJYtSCiPbu7yMcuFWo
-      c6sqU2/l/4vdd8qeHvS75VPzmX2QfF9p1EsL+LE5tzc3m54WfJ884LLI+nx8ynKU
-      HrbaLCGCK09bLNXM7XkFTe9s+XrJzgqdff/rF2nZHHyoqPObSgaG//HnAoGBANA8
-      TusN74PUX4ABLwGCLEd4/qRa0kgFtwngrcUY9XMWhrJUqi9tKJLN2URhqTbOzFA0
-      qv3n6TgZQSVH4ojmgL8EElSU2qKjDQ/jk/kEr5A+sBLdzXWZWdGv/BdB2yn95JH4
-      qoD4E9PWkNwz+e6I5PivXrVVIA0PEZ2cthutR/dlAoGBAORHzvfoEzpliijSZ1h2
-      Qw67iWUngH8DnJSnvRnbKkSoTBJgqd5eVnCX5r/zs4Ky2kdRdQvWd0QaJVgc/Pcv
-      GjrXkS60+JPOEvNyRmU6ue3z5Yi03lIGdhFeS+QTUw0Z31bAaz7NUxwNixtsS1u2
-      Bftj7QbhBFfiNyCJDDSDi/XnAoGAbsd2sIO0ZSypNZ7rk+Ddj5Rl26fZcKlhq+aU
-      a2OQyI42UE7MTvjCef760+8kp1yywwSR5wvmPYrp5lxsvqnp2jTfT5H1Ekqt20MV
-      6Ic+ov1GjHLlJ+fSKcR21ySY5KkGXUWt53iSi8L9Q7h/ARBgx4/8UXmc2HWoyHGj
-      S+wOeiUCgYA2EMH3QOP+LewScNkdgDr9e20+NxmZs+b0ZOk6JAUE+/YLSNDlRQZV
-      fL0f0cjIyCdKfv+nR4gdMnm8RDHBiAqrKK3X9tiZ0fGmPHB+OLwYV8wE1u9jkJDA
-      IJA5GNU+Uj6+WbPO+hGn3NBWfb7/tR3ojSv7cBf2eEUh/vLSE9joKA==
-      -----END RSA PRIVATE KEY-----
-
-    # Pushkin
-    docker_image_pushkin: "docker-sandbox.sandbox.mirantis.net/vstoiko/oss/pushkin:latest"
-    pushkin_db_user: pushkin
-    pushkin_db_user_password: kRQaFJWiqhQfy6sN
-    pushkin_db_host: ${_param:haproxy_postgresql_bind_host}
-    pushkin_smtp_host: 127.0.0.1
-    pushkin_smtp_port: 25
-    pushkin_email_sender_password: ''
-
-    #..WebHook notification senders
-    webhook_from: pushkin@example.com
-    webhook_recipients: alerts@example.com
-    webhook_application_id: "23"
-    webhook_login_id: "11"
-    webhook_sfdc_username: pushkin
-
-    # SecurityMonkey
-    docker_image_security_monkey_api: "docker-sandbox.sandbox.mirantis.net/vstoiko/oss/security-monkey-api:6700"
-    docker_image_security_monkey_scheduler: "docker-sandbox.sandbox.mirantis.net/vstoiko/oss/security-monkey-scheduler:6700"
-    secmonkey_db_user: secmonkey
-    secmonkey_db_user_password: rt7HoJbb36eR9wWe
-    secmonkey_db_host: ${_param:haproxy_postgresql_bind_host}
-    security_monkey_openstack:
-      username: admin
-      password: workshop
-      auth_url: http://172.16.10.254:5000/v3/
-      project_name: admin
-      user_domain_name: "${_param:oss_openstack_domain_id}"
-      project_domain_name: "${_param:oss_openstack_domain_id}"
-
-    # OSS OpenStack
-    oss_openstack_username: "admin"
-    oss_openstack_password: "password"
-    oss_openstack_project: "admin"
-    oss_openstack_domain_id: "default"
-
-    # DevOps Portal
-    docker_image_devops_portal: "docker-prod-local.artifactory.mirantis.com/mirantis/oss/devops-portal:latest"
-
-    # ElasticSearch
-    docker_image_elasticsearch: "docker.elastic.co/elasticsearch/elasticsearch:5.4.1"
-
-
-  linux:
-    system:
-      package:
-        ca-certificates-java:
-          version: latest
-    network:
-      interface:
-        ens3:
-          enabled: true
-          type: eth
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/leader.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/leader.yml
deleted file mode 100644
index d4b5fb2..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/leader.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-classes:
-  # Services
-  - system.docker.client
-  - system.aptly.server.docker
-  # Jenkins
-  - system.jenkins.master.config
-  - system.jenkins.client
-  - system.jenkins.client.credential.gerrit
-  - system.jenkins.client.credential.salt
-  # Jobs
-  - system.jenkins.client.job.aptly
-  - system.jenkins.client.job.git-mirrors.downstream.pipelines
-  - system.jenkins.client.job.deploy.openstack
-  - system.jenkins.client.job.deploy.update.package
-  - system.jenkins.client.job.deploy.update.config
-  # Security
-  - system.jenkins.client.security.ldap
-  - system.jenkins.client.security.matrix
-  # Slaves
-  - system.jenkins.client.node
-  # OpenLDAP
-  - system.openldap.client
-  - system.openldap.client.people.admin
-
-  # Gerrit
-  - system.gerrit.client
-  - system.gerrit.client.project.ci
-
-  # DevOps Portal
-  - service.devops_portal.config
-
-  # Rundeck
-  - system.rundeck.server.docker
-  - system.rundeck.client
-  # Rundeck Projects
-  - system.rundeck.client.project.cicd
-
-  # PostgreSQL
-  - system.postgresql.client.pushkin
-  - system.postgresql.client.rundeck
-  - system.postgresql.client.security_monkey
-
-  # Docker
-  - system.docker.swarm.master
-
-  - cluster.virtual-mcp-ocata-cicd.infra
-  - cluster.virtual-mcp-ocata-cicd.cicd.control
-  - cluster.virtual-mcp-ocata-cicd.stacklight.client
-  - cluster.virtual-mcp-ocata-cicd.stacklight.server
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/manager.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/manager.yml
deleted file mode 100644
index 0f53a66..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/manager.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-classes:
-  - system.docker.swarm.manager
-  - cluster.virtual-mcp-ocata-cicd.infra
-  - cluster.virtual-mcp-ocata-cicd.cicd.control
-  - cluster.virtual-mcp-ocata-cicd.stacklight.server
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
deleted file mode 100644
index 082902e..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-classes:
-  # GlusterFSVolumes
-  - system.glusterfs.server.cluster
-  - system.glusterfs.server.volume.aptly
-  - system.glusterfs.server.volume.devops_portal
-  - system.glusterfs.server.volume.elasticsearch
-  - system.glusterfs.server.volume.gerrit
-  - system.glusterfs.server.volume.jenkins
-  - system.glusterfs.server.volume.mysql
-  - system.glusterfs.server.volume.openldap
-  - system.glusterfs.server.volume.postgresql
-  - system.glusterfs.server.volume.pushkin
-  - system.glusterfs.server.volume.registry
-  - system.glusterfs.server.volume.rundeck
-  - system.glusterfs.server.volume.salt_pki
-  - system.glusterfs.server.volume.security_monkey
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/init.yml
deleted file mode 100644
index 1b45a5c..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/init.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-parameters:
-  _param:
-    cicd_control_address: 172.16.10.90
-    cicd_control_node01_address: 172.16.10.91
-    cicd_control_node02_address: 172.16.10.92
-    cicd_control_node03_address: 172.16.10.93
-    cicd_control_hostname: cid
-    cicd_control_node01_hostname: cid01
-    cicd_control_node02_hostname: cid02
-    cicd_control_node03_hostname: cid03
-  linux:
-    network:
-      host:
-        ci:
-          params:
-            single_address: 172.16.10.90
-          address: ${_param:cicd_control_address}
-          names:
-          - ${_param:cicd_control_hostname}
-          - ${_param:cicd_control_hostname}.${_param:cluster_domain}
-        ci01:
-          params:
-            single_address: 172.16.10.91
-          address: ${_param:cicd_control_node01_address}
-          names:
-          - ${_param:cicd_control_node01_hostname}
-          - ${_param:cicd_control_node01_hostname}.${_param:cluster_domain}
-        ci02:
-          params:
-            single_address: 172.16.10.92
-          address: ${_param:cicd_control_node02_address}
-          names:
-          - ${_param:cicd_control_node02_hostname}
-          - ${_param:cicd_control_node02_hostname}.${_param:cluster_domain}
-        ci03:
-          params:
-            single_address: 172.16.10.93
-          address: ${_param:cicd_control_node03_address}
-          names:
-          - ${_param:cicd_control_node03_hostname}
-          - ${_param:cicd_control_node03_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/worker.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/worker.yml
deleted file mode 100644
index e69de29..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/worker.yml
+++ /dev/null
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml b/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
deleted file mode 100644
index e0425aa..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/infra/config.yml
+++ /dev/null
@@ -1,215 +0,0 @@
-classes:
-- service.git.client
-- system.linux.system.single
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.openstack
-- system.openssh.client.lab
-- system.salt.master.api
-- system.salt.master.pkg
-- system.reclass.storage.salt
-- system.salt.minion.ca.salt_master
-- system.salt.minion.cert.proxy
-- system.sphinx.server.doc.reclass
-- system.keystone.client.single
-- system.keystone.client.service.ceilometer
-- system.keystone.client.service.nova21
-- system.keystone.client.service.nova-placement
-- system.keystone.client.service.glare
-- system.keystone.client.service.cinder3
-- system.keystone.client.service.designate
-- system.mysql.client.single
-- system.reclass.storage.system.openstack_control_cluster
-- system.reclass.storage.system.openstack_compute_multi
-- system.reclass.storage.system.openstack_gateway_single
-- system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.cicd_control_cluster
-- cluster.virtual-mcp-ocata-cicd.openstack.proxy
-- cluster.virtual-mcp-ocata-cicd.stacklight.proxy
-- cluster.virtual-mcp-ocata-cicd.infra
-parameters:
-  _param:
-    reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
-    reclass_data_revision: master
-    salt_master_environment_repository: "https://github.com/tcpcloud"
-    salt_master_environment_revision: master
-    reclass_config_master: 192.168.10.90
-    single_address: 172.16.10.100
-    salt_master_host: 127.0.0.1
-    salt_master_base_environment: prd
-    salt_minion_ca_host: ${linux:network:fqdn}
-    salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
-  linux:
-    network:
-      interface:
-        ens4:
-          enabled: true
-          type: eth
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
-  nginx:
-    server:
-      site:
-        nginx_proxy_openstack_web:
-          proxy:
-            host: prx
-        nginx_proxy_openstack_api_heat_cfn:
-          enabled: false
-  salt:
-    master:
-      reactor:
-        reclass/minion/classify:
-        - salt://reclass/reactor/node_register.sls
-  reclass:
-    storage:
-      class_mapping:
-        common_node:
-          expression: all
-          node_param:
-            single_address:
-              value_template: <<node_control_ip>>
-            linux_system_codename:
-              value_template: <<node_os>>
-            salt_master_host:
-              value_template: <<node_master_ip>>
-        infra_config:
-          expression: <<node_hostname>>__startswith__cfg
-          cluster_param:
-            infra_config_address:
-              value_template: <<node_control_ip>>
-            infra_config_deploy_address:
-              value_template: <<node_deploy_ip>>
-            cluster_domain:
-              value_template: <<node_domain>>
-        openstack_control01:
-          expression: <<node_hostname>>__equals__ctl01
-          cluster_param:
-            openstack_control_node01_address:
-              value_template: <<node_control_ip>>
-        openstack_control02:
-          expression: <<node_hostname>>__equals__ctl02
-          cluster_param:
-            openstack_control_node02_address:
-              value_template: <<node_control_ip>>
-        openstack_control03:
-          expression: <<node_hostname>>__equals__ctl03
-          cluster_param:
-            openstack_control_node03_address:
-              value_template: <<node_control_ip>>
-        openstack_compute:
-          expression: <<node_hostname>>__startswith__cmp
-          node_class:
-            value_template:
-              - cluster.<<node_cluster>>.openstack.compute
-          node_param:
-            tenant_address:
-              value_template: <<node_tenant_ip>>
-            external_address:
-              value_template: <<node_external_ip>>
-        openstack_gateway:
-          expression: <<node_hostname>>__startswith__gtw
-          node_class:
-            value_template:
-              - cluster.<<node_cluster>>.openstack.gateway
-          node_param:
-            tenant_address:
-              value_template: <<node_tenant_ip>>
-            external_address:
-              value_template: <<node_external_ip>>
-          cluster_param:
-            openstack_gateway_node01_address:
-              value_template: <<node_control_ip>>
-        openstack_dashboard:
-          expression: <<node_hostname>>__startswith__prx
-          node_class:
-            value_template:
-              - cluster.<<node_cluster>>.openstack.dashboard
-              - cluster.<<node_cluster>>.openstack.proxy
-          cluster_param:
-            openstack_proxy_node01_address:
-              value_template: <<node_control_ip>>
-        cicd_control_node01:
-          expression: <<node_hostname>>__equals__cid01
-          cluster_param:
-            cicd_control_node01_address:
-              value_template: <<node_control_ip>>
-        cicd_control_node02:
-          expression: <<node_hostname>>__equals__cid02
-          cluster_param:
-            cicd_control_node02_address:
-              value_template: <<node_control_ip>>
-        cicd_control_node03:
-          expression: <<node_hostname>>__equals__cid03
-          cluster_param:
-            cicd_control_node03_address:
-              value_template: <<node_control_ip>>
-      node:
-        cicd_control_node01:
-          name: ${_param:cicd_control_node01_hostname}
-          domain: ${_param:cluster_domain}
-          classes:
-          - cluster.${_param:cluster_name}.cicd.control.leader
-          params:
-            salt_master_host: ${_param:reclass_config_master}
-            linux_system_codename: xenial
-            single_address: ${_param:cicd_control_node01_address}
-            keepalived_vip_priority: 103
-        cicd_control_node02:
-          name: ${_param:cicd_control_node02_hostname}
-          domain: ${_param:cluster_domain}
-          classes:
-          - cluster.${_param:cluster_name}.cicd.control.manager
-          params:
-            salt_master_host: ${_param:reclass_config_master}
-            linux_system_codename: xenial
-            single_address: ${_param:cicd_control_node02_address}
-            keepalived_vip_priority: 102
-            docker_swarm_role: worker
-        cicd_control_node03:
-          name: ${_param:cicd_control_node03_hostname}
-          domain: ${_param:cluster_domain}
-          classes:
-          - cluster.${_param:cluster_name}.cicd.control.manager
-          params:
-            salt_master_host: ${_param:reclass_config_master}
-            linux_system_codename: xenial
-            single_address: ${_param:cicd_control_node03_address}
-            keepalived_vip_priority: 101
-            docker_swarm_role: worker
-        openstack_control_node01:
-          classes:
-          - service.galera.master.cluster
-          params:
-            mysql_cluster_role: master
-            linux_system_codename: xenial
-        openstack_control_node02:
-          classes:
-          - service.galera.slave.cluster
-          params:
-            mysql_cluster_role: slave
-            linux_system_codename: xenial
-        openstack_control_node03:
-          classes:
-          - service.galera.slave.cluster
-          params:
-            mysql_cluster_role: slave
-            linux_system_codename: xenial
-        openstack_compute_node01:
-          params:
-            single_address: 172.16.10.105
-            tenant_address: 10.1.0.105
-            external_address: 10.16.0.105
-        openstack_compute_node02:
-          params:
-            single_address: 172.16.10.106
-            tenant_address: 10.1.0.106
-            external_address: 10.16.0.106
-        openstack_gateway_node01:
-          params:
-            tenant_address: 10.1.0.110
-            external_address: 10.16.0.110
-        openstack_proxy_node01:
-          classes:
-          - cluster.virtual-mcp-ocata-cicd.openstack.proxy
-          params:
-            linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/infra/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/infra/init.yml
deleted file mode 100644
index e535f83..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/infra/init.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-classes:
-- system.linux.system.single
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
-- system.openssh.server.team.all
-- system.rsyslog.client.single
-- cluster.virtual-mcp-ocata-cicd.cicd
-- cluster.virtual-mcp-ocata-cicd.openstack
-- cluster.virtual-mcp-ocata-cicd.stacklight
-- cluster.overrides
-parameters:
-  _param:
-    cluster_domain: virtual-mcp-ocata-cicd.local
-    cluster_name: virtual-mcp-ocata-cicd
-    # infra service addresses
-    infra_config_hostname: cfg01
-    infra_config_address: 172.16.10.100
-
-    salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
-    salt_minion_ca_authority: salt_master_ca
-  linux:
-    network:
-      resolv:
-        dns:
-          - 172.18.176.4
-          - 172.18.208.44
-      host:
-        cfg01:
-          address: ${_param:infra_config_address}
-          names:
-          - cfg01
-          - cfg01.${_param:cluster_domain}
-        cfg:
-          address: ${_param:infra_config_address}
-          names:
-          - cfg
-          - cfg.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/compute.yml
deleted file mode 100644
index d6fcac1..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/compute.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.linux.network.hosts
-- system.nova.compute.cluster
-- system.neutron.compute.cluster
-- system.heka.alarm.openstack_compute
-- cluster.virtual-mcp-ocata-cicd.infra
-parameters:
-  _param:
-    primary_interface: ens4
-    tenant_interface: ens5
-    external_interface: ens6
-    interface_mtu: 9000
-    linux_system_codename: xenial
-  nova:
-    compute:
-      vncproxy_url: http://${_param:cluster_vip_address}:6080
-      notification:
-        driver: messagingv2
-        topics: "notifications,${_param:stacklight_notification_topic}"
-        notify_on:
-          state_change: vm_and_task_state
-      message_queue:
-        members:
-          - host: ${_param:openstack_control_node01_address}
-          - host: ${_param:openstack_control_node02_address}
-          - host: ${_param:openstack_control_node03_address}
-  linux:
-    network:
-      bridge: openvswitch
-      interface:
-        dhcp_int:
-          enabled: true
-          name: ens3
-          proto: dhcp
-          type: eth
-          mtu: ${_param:interface_mtu}
-        primary_interface:
-          enabled: true
-          name: ${_param:primary_interface}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
-        tenant_interface:
-          enabled: true
-          name: ${_param:tenant_interface}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
-        br-mgmt:
-          enabled: true
-          type: bridge
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
-          use_interfaces:
-          - ${_param:primary_interface}
-        br-mesh:
-          enabled: true
-          type: bridge
-          proto: static
-          address: ${_param:tenant_address}
-          netmask: 255.255.255.0
-          use_interfaces:
-          - ${_param:tenant_interface}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
deleted file mode 100644
index 5729f54..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/control.yml
+++ /dev/null
@@ -1,155 +0,0 @@
-classes:
-- system.linux.system.lowmem
-- system.linux.system.repo.glusterfs
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.memcached.server.single
-- system.rabbitmq.server.cluster
-- system.rabbitmq.server.vhost.openstack
-- system.keystone.server.wsgi
-- system.keystone.server.cluster
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
-- system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
-- system.glusterfs.server.cluster
-- system.glance.control.cluster
-- system.heka.alarm.openstack_control
-- system.nova.control.cluster
-- system.neutron.control.openvswitch.cluster
-- system.cinder.control.cluster
-- system.heat.server.cluster
-- system.designate.server.cluster
-- system.designate.server.backend.bind
-- system.bind.server.single
-- system.galera.server.cluster
-- system.galera.server.database.ceilometer
-- system.galera.server.database.cinder
-- system.galera.server.database.glance
-- system.galera.server.database.grafana
-- system.galera.server.database.heat
-- system.galera.server.database.keystone
-- system.galera.server.database.nova
-- system.galera.server.database.designate
-- system.haproxy.proxy.listen.openstack.nova-placement
-- cluster.virtual-mcp-ocata-cicd.infra
-parameters:
-  _param:
-    glusterfs_service_host: ${_param:cluster_vip_address}
-    keepalived_vip_interface: ens4
-    linux_system_codename: xenial
-  linux:
-    system:
-      package:
-        python-msgpack:
-          version: latest
-    network:
-      interface:
-        ens4:
-          enabled: true
-          type: eth
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
-  keepalived:
-    cluster:
-      instance:
-        VIP:
-          virtual_router_id: 150
-  bind:
-    server:
-      control:
-        mgmt:
-          enabled: true
-          bind:
-            address: ${_param:single_address}
-            port: 953
-          allow:
-            - ${_param:openstack_control_node01_address}
-            - ${_param:openstack_control_node02_address}
-            - ${_param:openstack_control_node03_address}
-          keys:
-            - designate
-  keystone:
-    server:
-      admin_email: ${_param:admin_email}
-      notification:
-        driver: messagingv2
-        topics: "notifications,${_param:stacklight_notification_topic}"
-  designate:
-    server:
-      pools:
-        default:
-          description: 'test pool'
-          targets:
-            default:
-              description: 'test target1'
-            default1:
-              type: ${_param:designate_pool_target_type}
-              description: 'test target2'
-              masters: ${_param:designate_pool_target_masters}
-              options:
-                host: ${_param:openstack_control_node02_address}
-                port: 53
-                rndc_host: ${_param:openstack_control_node02_address}
-                rndc_port: 953
-                rndc_key_file: /etc/designate/rndc.key
-            default2:
-              type: ${_param:designate_pool_target_type}
-              description: 'test target3'
-              masters: ${_param:designate_pool_target_masters}
-              options:
-                host: ${_param:openstack_control_node03_address}
-                port: 53
-                rndc_host: ${_param:openstack_control_node03_address}
-                rndc_port: 953
-                rndc_key_file: /etc/designate/rndc.key
-      quota:
-        zones: ${_param:designate_quota_zones}
-    worker:
-      enabled: ${_param:designate_worker_enabled}
-  glance:
-    server:
-      storage:
-        engine: file
-      images: []
-      workers: 1
-      notification:
-        driver: messagingv2
-        topics: "notifications,${_param:stacklight_notification_topic}"
-  heat:
-    server:
-      notification:
-        driver: messagingv2
-        topics: "notifications,${_param:stacklight_notification_topic}"
-  neutron:
-    server:
-      notification:
-        driver: messagingv2
-        topics: "notifications,${_param:stacklight_notification_topic}"
-  nova:
-    controller:
-      networking: dvr
-      cpu_allocation: 54
-      metadata:
-        password: ${_param:metadata_password}
-      bind:
-        private_address: ${_param:cluster_local_address}
-        public_address: ${_param:cluster_vip_address}
-        novncproxy_port: 6080
-      vncproxy_url: http://${_param:cluster_vip_address}:6080
-      workers: 1
-      notification:
-        driver: messagingv2
-        topics: "notifications,${_param:stacklight_notification_topic}"
-  cinder:
-    volume:
-      notification:
-        driver: messagingv2
-        topics: "notifications,${_param:stacklight_notification_topic}"
-    controller:
-      notification:
-        driver: messagingv2
-        topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/dashboard.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/dashboard.yml
deleted file mode 100644
index 665229e..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/dashboard.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-classes:
-- system.linux.system.repo.ubuntu
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.horizon.server.single
-- cluster.virtual-mcp-ocata-cicd.infra
-parameters:
-  _param:
-    horizon_site_branding: OpenStack Dashboard
-  linux:
-    network:
-      interface:
-        ens4:
-          enabled: true
-          type: eth
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/gateway.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/gateway.yml
deleted file mode 100644
index 9cf601b..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/gateway.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.neutron.gateway.cluster
-- cluster.virtual-mcp-ocata-cicd.infra
-parameters:
-  _param:
-    primary_interface: ens4
-    tenant_interface: ens5
-    external_interface: ens6
-    interface_mtu: 9000
-    linux_system_codename: xenial
-  linux:
-    network:
-      bridge: openvswitch
-      interface:
-        dhcp_int:
-          enabled: true
-          name: ens3
-          proto: dhcp
-          type: eth
-          mtu: ${_param:interface_mtu}
-        primary_interface:
-          enabled: true
-          name: ${_param:primary_interface}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
-        tenant_interface:
-          enabled: true
-          name: ${_param:tenant_interface}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
-        external_interface:
-          enabled: true
-          name: ${_param:external_interface}
-          mtu: ${_param:interface_mtu}
-          proto: manual
-          type: eth
-        br-floating:
-          enabled: true
-          type: ovs_bridge
-          mtu: ${_param:interface_mtu}
-        br-mgmt:
-          enabled: true
-          type: bridge
-          proto: static
-          address: ${_param:single_address}
-          netmask: 255.255.255.0
-          mtu: ${_param:interface_mtu}
-          use_interfaces:
-          - ${_param:primary_interface}
-        br-mesh:
-          enabled: true
-          type: bridge
-          mtu: ${_param:interface_mtu}
-          proto: static
-          address: ${_param:tenant_address}
-          netmask: 255.255.255.0
-          use_interfaces:
-          - ${_param:tenant_interface}
-        float-to-ex:
-          enabled: true
-          type: ovs_port
-          mtu: ${_param:interface_mtu}
-          bridge: br-floating
-        br-ex:
-          enabled: true
-          type: bridge
-          mtu: ${_param:interface_mtu}
-          address: ${_param:external_address}
-          netmask: 255.255.255.0
-          use_interfaces:
-          - ${_param:external_interface}
-          use_ovs_ports:
-          - float-to-ex
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
deleted file mode 100644
index 382fb52..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
+++ /dev/null
@@ -1,186 +0,0 @@
-parameters:
-  _param:
-    openstack_version: ocata
-    apt_mk_version: nightly
-    mcp_repo_version: 1.1
-    openstack_region: RegionOne
-    admin_email: root@localhost
-    cluster_public_protocol: http
-    cluster_public_host: 172.16.10.254
-    neutron_public_protocol: http
-    neutron_control_dvr: False
-    neutron_tenant_network_types: "flat,vxlan"
-    neutron_l3_ha: False
-    neutron_global_physnet_mtu: 1500
-    neutron_external_mtu: 1500
-    neutron_gateway_dvr: False
-    neutron_gateway_agent_mode: legacy
-    neutron_compute_dvr: False
-    neutron_compute_agent_mode: legacy
-    neutron_compute_external_access: False
-    galera_server_cluster_name: openstack_cluster
-    galera_server_maintenance_password: workshop
-    galera_server_admin_password: workshop
-    cluster_vip_address: 172.16.10.254
-    cluster_local_address: ${_param:single_address}
-    cluster_node01_hostname: ctl01
-    cluster_node01_address: 172.16.10.101
-    cluster_node02_hostname: ctl02
-    cluster_node02_address: 172.16.10.102
-    cluster_node03_hostname: ctl03
-    cluster_node03_address: 172.16.10.103
-    rabbitmq_secret_key: workshop
-    rabbitmq_admin_password: workshop
-    rabbitmq_openstack_password: workshop
-    rabbitmq_cold_password: workshop
-    designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
-    designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
-    designate_pool_ns_records:
-      - hostname: 'ns1.example.org.'
-        priority: 10
-    designate_pool_nameservers:
-      - host: ${_param:openstack_control_node01_address}
-        port: 53
-      - host: ${_param:openstack_control_node02_address}
-        port: 53
-      - host: ${_param:openstack_control_node03_address}
-        port: 53
-    designate_pool_target_type: bind9
-    designate_pool_target_masters:
-      - host: ${_param:openstack_control_node01_address}
-        port: 5354
-      - host: ${_param:openstack_control_node02_address}
-        port: 5354
-      - host: ${_param:openstack_control_node03_address}
-        port: 5354
-    designate_pool_target_options:
-      host: ${_param:openstack_control_node01_address}
-      port: 53
-      rndc_host: ${_param:openstack_control_node01_address}
-      rndc_port: 953
-      rndc_key_file: /etc/designate/rndc.key
-    designate_quota_zones: 40
-    designate_version: ${_param:openstack_version}
-    designate_worker_enabled: true
-    glance_version: ${_param:openstack_version}
-    glance_service_host: ${_param:cluster_vip_address}
-    keystone_version: ${_param:openstack_version}
-    keystone_service_host: ${_param:cluster_vip_address}
-    heat_version: ${_param:openstack_version}
-    heat_service_host: ${_param:cluster_vip_address}
-    heat_domain_admin_password: workshop
-    ceilometer_version: ${_param:openstack_version}
-    ceilometer_service_host: ${_param:cluster_vip_address}
-    cinder_version: ${_param:openstack_version}
-    cinder_service_host: ${_param:cluster_vip_address}
-    ceilometer_graphite_publisher_host: 172.16.10.107
-    ceilometer_graphite_publisher_port: 2013
-    nova_version: ${_param:openstack_version}
-    nova_service_host: ${_param:cluster_vip_address}
-    nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
-    neutron_version: ${_param:openstack_version}
-    neutron_service_host: ${_param:cluster_vip_address}
-    designate_service_host: ${_param:cluster_vip_address}
-    metadata_password: workshop
-    mysql_admin_user: root
-    mysql_admin_password: workshop
-    mysql_cinder_password: workshop
-    mysql_ceilometer_password: workshop
-    mysql_glance_password: workshop
-    mysql_grafana_password: workshop
-    mysql_heat_password: workshop
-    mysql_keystone_password: workshop
-    mysql_neutron_password: workshop
-    mysql_nova_password: workshop
-    mysql_aodh_password: workshop
-    mysql_designate_password: workshop
-    keystone_service_token: workshop
-    keystone_admin_password: workshop
-    keystone_ceilometer_password: workshop
-    keystone_cinder_password: workshop
-    keystone_glance_password: workshop
-    keystone_heat_password: workshop
-    keystone_keystone_password: workshop
-    keystone_neutron_password: workshop
-    keystone_nova_password: workshop
-    keystone_designate_password: workshop
-    ceilometer_secret_key: workshop
-    horizon_version: ${_param:openstack_version}
-    horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
-    horizon_identity_host: ${_param:cluster_vip_address}
-    horizon_identity_encryption: none
-    horizon_identity_version: 2
-    mongodb_server_replica_set: ceilometer
-    mongodb_ceilometer_password: cloudlab
-    mongodb_admin_password: cloudlab
-    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
-
-    # openstack service addresses
-    openstack_proxy_address: 172.16.10.121
-    openstack_proxy_node01_address: 172.16.10.121
-    openstack_control_address: 172.16.10.254
-    openstack_control_node01_address: 172.16.10.101
-    openstack_control_node02_address: 172.16.10.102
-    openstack_control_node03_address: 172.16.10.103
-    openstack_database_address: ${_param:openstack_control_address}
-    openstack_message_queue_address: ${_param:openstack_control_address}
-    openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
-    openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
-    openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-    openstack_gateway_address: 172.16.10.110
-    openstack_gateway_node01_address: ${_param:openstack_gateway_address}
-
-  linux:
-    network:
-      purge_hosts: true
-      host:
-        prx:
-          address: ${_param:openstack_proxy_address}
-          names:
-          - prx
-          - prx.${_param:cluster_domain}
-        prx01:
-          address: ${_param:openstack_proxy_node01_address}
-          names:
-          - prx01
-          - prx01.${_param:cluster_domain}
-        ctl:
-          address: ${_param:openstack_control_address}
-          names:
-          - ctl
-          - ctl.${_param:cluster_domain}
-        ctl01:
-          address: ${_param:openstack_control_node01_address}
-          names:
-          - ctl01
-          - ctl01.${_param:cluster_domain}
-        ctl02:
-          address: ${_param:openstack_control_node02_address}
-          names:
-          - ctl02
-          - ctl02.${_param:cluster_domain}
-        ctl03:
-          address: ${_param:openstack_control_node03_address}
-          names:
-          - ctl03
-          - ctl03.${_param:cluster_domain}
-        gtw01:
-          address: ${_param:openstack_gateway_address}
-          names:
-          - gtw01
-          - gtw01.${_param:cluster_domain}
-        cmp01:
-          address: 172.16.10.105
-          names:
-          - cmp01
-          - cmp01.${_param:cluster_domain}
-        cmp02:
-          address: 172.16.10.106
-          names:
-          - cmp02
-          - cmp02.${_param:cluster_domain}
-    system:
-      user:
-        root:
-          name: root
-          password: false
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/proxy.yml
deleted file mode 100644
index 114f5a9..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/proxy.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-classes:
-- system.nginx.server.single
-- system.nginx.server.proxy.openstack_api
-- system.nginx.server.proxy.openstack_vnc
-- system.nginx.server.proxy.openstack_web
-- system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-cicd.infra
-parameters:
-  _param:
-    linux_system_codename: xenial
-    nginx_proxy_ssl:
-      enabled: true
-      authority: ${_param:salt_minion_ca_authority}
-      engine: salt
-      mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/client.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/client.yml
deleted file mode 100644
index f888e29..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/client.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-classes:
-- system.docker.host
-- system.elasticsearch.client.single
-- system.grafana.client
-- system.grafana.client.datasource.prometheus
-- system.kibana.client.single
-- system.linux.system.repo.docker
-- cluster.virtual-mcp-ocata-cicd.infra
-parameters:
-  _param:
-    # Elasticsearch/Kibana client parameters
-    stacklight_log_address: ${_param:stacklight_monitor_address}
-    # Grafana client parameters
-    grafana_address: ${_param:stacklight_monitor_address}
-    grafana_port: 15013
-    grafana_user: admin
-    grafana_password: ${_param:grafana_admin_password}
-    grafana_prometheus_address: ${_param:stacklight_monitor_address}
-    grafana_prometheus_port: 15016
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/init.yml
deleted file mode 100644
index 8d3e10e..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/init.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-parameters:
-  _param:
-    stacklight_monitor_address: 172.16.10.252
-    stacklight_node01_hostname: mon01
-    stacklight_node02_hostname: mon02
-    stacklight_node03_hostname: mon03
-    stacklight_node01_address: 172.16.10.107
-    stacklight_node02_address: 172.16.10.108
-    stacklight_node03_address: 172.16.10.109
-
-    # stacklight service addresses
-    stacklight_monitor_node01_address: 172.16.10.107
-    stacklight_monitor_node02_address: 172.16.10.108
-    stacklight_monitor_node03_address: 172.16.10.109
-    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
-    stacklight_log_address: ${_param:stacklight_monitor_address}
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-
-    # Prometheus
-    prometheus_control_address: ${_param:stacklight_monitor_address}
-
-    mysql_admin_user: root
-    mysql_admin_password: workshop
-
-    grafana_user: admin
-    grafana_admin_password: password
-
-    mysql_grafana_password: password
-    cluster_local_address: ${_param:single_address}
-    galera_server_cluster_name: monitoring_cluster
-    galera_server_maintenance_password: workshop
-    galera_server_admin_password: workshop
-
-    heka_elasticsearch_host: ${_param:stacklight_monitor_address}
-    elasticsearch_port: 9200
-    stacklight_environment: ${_param:cluster_domain}
-    stacklight_notification_topic: stacklight_notifications
-  linux:
-    network:
-      host:
-        mon:
-          address: ${_param:stacklight_monitor_address}
-          names:
-          - mon
-          - mon.${_param:cluster_domain}
-        mon01:
-          address: ${_param:stacklight_node01_address}
-          names:
-          - ${_param:stacklight_node01_hostname}
-          - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
-        mon02:
-          address: ${_param:stacklight_node02_address}
-          names:
-          - ${_param:stacklight_node02_hostname}
-          - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
-        mon03:
-          address: ${_param:stacklight_node03_address}
-          names:
-          - ${_param:stacklight_node03_hostname}
-          - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
-    system:
-      name: ${_param:infra_config_hostname}
-      domain: ${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/proxy.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/proxy.yml
deleted file mode 100644
index 3b6d25e..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/proxy.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-classes:
-- system.nginx.server.single
-- system.nginx.server.proxy.stacklight.grafana
-- system.nginx.server.proxy.stacklight.kibana
-- system.nginx.server.proxy.monitoring.prometheus_server
-- system.nginx.server.proxy.monitoring.prometheus_alertmanager
-- system.salt.minion.cert.proxy
-- cluster.virtual-mcp-ocata-cicd.infra
-parameters:
-  _param:
-    #cluster_public_host: ${_param:prometheus_control_address}
-    nginx_proxy_grafana_port: 15013
-    nginx_proxy_ssl:
-      enabled: true
-      authority: ${_param:salt_minion_ca_authority}
-      engine: salt
-      mode: secure
-    salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
deleted file mode 100644
index a9e8625..0000000
--- a/classes/cluster/virtual-mcp-ocata-cicd/stacklight/server.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-classes:
-- system.linux.system.repo.influxdb
-- system.linux.system.repo.elasticsearch
-- system.linux.system.repo.kibana
-- system.linux.system.repo.docker
-# Needed to install Galera packages
-- system.linux.system.repo.mcp.openstack
-- system.elasticsearch.server.cluster
-- system.elasticsearch.server.curator
-- system.kibana.server.single
-- system.haproxy.proxy.listen.stacklight.elasticsearch
-- system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb
-- service.haproxy.proxy.single
-- system.galera.server.cluster
-- system.galera.server.database.grafana
-- system.influxdb.server.single
-- system.influxdb.database.prometheus
-#- system.keepalived.cluster.instance.prometheus_server_vip
-- system.telegraf.agent.remote
-- system.prometheus.server.remote_write.docker
-- system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.dns
-- system.docker.host
-- system.docker.client
-- system.docker.swarm.stack.monitoring
-- system.docker.swarm.stack.dashboard
-- cluster.virtual-mcp-ocata-cicd.infra
-parameters:
-  _param:
-    cluster_vip_address: ${_param:stacklight_monitor_address}
-    cluster_public_host: mon
-    docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
-    docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
-    docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
-    docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
-    docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
-    docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
-    docker_image_grafana: grafana/grafana:4.5.2
-    grafana_admin_password: admin
-    keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
-    keepalived_prometheus_vip_password: password
-    keepalived_prometheus_vip_interface: ens3
-    # Docker/Elasticsearch
-    cluster_elasticsearch_port: 9200
-    cluster_kibana_port: 5601
-    cluster_grafana_port: 3000
-    cluster_node01_hostname: ${_param:stacklight_node01_hostname}
-    cluster_node01_address: ${_param:stacklight_node01_address}
-    cluster_node02_hostname: ${_param:stacklight_node02_hostname}
-    cluster_node02_address: ${_param:stacklight_node02_address}
-    cluster_node03_hostname: ${_param:stacklight_node03_hostname}
-    cluster_node03_address: ${_param:stacklight_node03_address}
-    # Kibana
-    kibana_elasticsearch_host: ${_param:cluster_vip_address}
-    # Galera
-    openstack_version: newton
-    # Grafana
-    grafana_database_type: mysql
-    grafana_database_host: ${_param:cluster_vip_address}
-    grafana_database_password: ${_param:mysql_grafana_password}
-    influxdb_port: 8086
-    influxdb_admin_password: password
-    influxdb_stacklight_password: lmapass
-    prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
-    prometheus_influxdb_db: prometheus
-    prometheus_influxdb_username: lma
-    prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
-  elasticsearch:
-    server:
-      heap:
-        size: 1
-  keepalived:
-    cluster:
-      instance:
-        VIP:
-          enabled: false
-
-  # Workaround for https://mirantis.jira.com/browse/PROD-12896 , remove when the bug is fixed
-  salt:
-    minion:
-      cert:
-        prometheus_server:
-          alternative_names: IP:${_param:cluster_vip_address},IP:${_param:cluster_node01_address},IP:${_param:cluster_node02_address},IP:${_param:cluster_node03_address}