[mcp] Replace reclass system models with submodule

Change-Id: Id693f7b0f3542d605b0f71601f3bd21eb882c7ba
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

54 files changed, 0 insertions, 1701 deletions

diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/aptly.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/aptly.yml
deleted file mode 100644
index fb24c1f0d..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/aptly.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-parameters:
-  _param:
-    haproxy_aptly_api_bind_host: ${_param:haproxy_bind_address}
-    haproxy_aptly_api_bind_port: 8084
-    haproxy_aptly_public_bind_host: ${_param:haproxy_bind_address}
-    haproxy_aptly_public_bind_port: 8085
-  haproxy:
-    proxy:
-      listen:
-        aptly-api:
-          mode: http
-          options:
-            - forwardfor
-            - httpclose
-            - httplog
-          balance: source
-          binds:
-            - address: ${_param:haproxy_aptly_api_bind_host}
-              port: ${_param:haproxy_aptly_api_bind_port}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: 18084
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: 18084
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: 18084
-              params: backup check
-        aptly-public:
-          mode: http
-          options:
-            - forwardfor
-            - httpclose
-            - httplog
-          balance: source
-          binds:
-            - address: ${_param:haproxy_aptly_public_bind_host}
-              port: ${_param:haproxy_aptly_public_bind_port}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: 18085
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: 18085
-              params: check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: 18085
-              params: check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/gerrit.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/gerrit.yml
deleted file mode 100644
index 51d494b61..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/gerrit.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-parameters:
-  _param:
-    haproxy_gerrit_bind_host: ${_param:haproxy_bind_address}
-    haproxy_gerrit_bind_port: 8080
-    haproxy_gerrit_ssh_bind_host: ${_param:haproxy_gerrit_bind_host}
-    haproxy_gerrit_ssh_bind_port: 29418
-    haproxy_gerrit_ssl:
-      enabled: false
-  haproxy:
-    proxy:
-      listen:
-        gerrit:
-          mode: http
-          options:
-            - forwardfor
-            - httpchk
-            - httpclose
-            - httplog
-          balance: source
-          http_request:
-            - action: "add-header X-Forwarded-Proto https"
-              condition: "if { ssl_fc }"
-          binds:
-            - address: ${_param:haproxy_gerrit_bind_host}
-              port: ${_param:haproxy_gerrit_bind_port}
-              ssl: ${_param:haproxy_gerrit_ssl}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: 18083
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: 18083
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: 18083
-              params: backup check
-        gerrit_ssh:
-          mode: tcp
-          balance: source
-          binds:
-            - address: ${_param:haproxy_gerrit_ssh_bind_host}
-              port: ${_param:haproxy_gerrit_ssh_bind_port}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: 29417
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: 29417
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: 29417
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/jenkins.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/jenkins.yml
deleted file mode 100644
index eda12f84e..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/jenkins.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-parameters:
-  _param:
-    haproxy_jenkins_bind_host: ${_param:haproxy_bind_address}
-    haproxy_jenkins_bind_port: 8081
-    haproxy_jenkins_jnlp_bind_host: ${_param:haproxy_jenkins_bind_host}
-    haproxy_jenkins_jnlp_bind_port: 50000
-    haproxy_jenkins_ssl:
-      enabled: false
-  haproxy:
-    proxy:
-      listen:
-        jenkins:
-          mode: http
-          options:
-            - forwardfor
-#            - httpchk
-            - httpclose
-            - httplog
-          balance: source
-          http_request:
-            - action: "add-header X-Forwarded-Proto https"
-              condition: "if { ssl_fc }"
-          http_response:
-            - action: "del-header X-Frame-Options"
-          binds:
-            - address: ${_param:haproxy_jenkins_bind_host}
-              port: ${_param:haproxy_jenkins_bind_port}
-              ssl: ${_param:haproxy_jenkins_ssl}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: 18081
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: 18081
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: 18081
-              params: backup check
-        jenkins_jnlp:
-          mode: tcp
-          balance: source
-          binds:
-            - address: ${_param:haproxy_jenkins_jnlp_bind_host}
-              port: ${_param:haproxy_jenkins_jnlp_bind_port}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: 50001
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: 50001
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: 50001
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/docker/registry.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/docker/registry.yml
deleted file mode 100644
index 8d45e971f..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/docker/registry.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-parameters:
-  _param:
-    haproxy_docker_registry_listen_host: ${_param:haproxy_bind_address}
-    haproxy_docker_registry_listen_port: 5000
-    haproxy_docker_registry_ssl:
-      enabled: false
-  haproxy:
-    proxy:
-      listen:
-        registry:
-          mode: http
-          options:
-            - forwardfor
-            - httpclose
-            - httplog
-          balance: source
-          http_request:
-            - action: "add-header X-Forwarded-Proto https"
-              condition: "if { ssl_fc }"
-          binds:
-            - address: ${_param:haproxy_docker_registry_listen_host}
-              port: ${_param:haproxy_docker_registry_listen_port}
-              ssl: ${_param:haproxy_docker_registry_ssl}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: 15000
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: 15000
-              params: check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: 15000
-              params: check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/docker/visualizer.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/docker/visualizer.yml
deleted file mode 100644
index 409815c4d..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/docker/visualizer.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    haproxy_docker_visualizer_listen_port: 8091
-  haproxy:
-    proxy:
-      listen:
-        visualizer:
-          mode: http
-          options:
-            - forwardfor
-            - httpchk
-            - httpclose
-            - httplog
-          balance: source
-          binds:
-            - address: ${_param:haproxy_bind_address}
-              port: ${_param:haproxy_docker_visualizer_listen_port}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: 18090
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: 18090
-              params: check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: 18090
-              params: check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/elasticsearch.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/elasticsearch.yml
deleted file mode 100644
index cb1a8e5ec..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/elasticsearch.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        elasticsearch:
-          mode: http
-          service_name: elasticsearch
-          options:
-            - forwardfor
-            - httpchk
-            - httpclose
-            - httplog
-          balance: roundrobin
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 9200
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: 9200
-              params: check
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: 9200
-              params: check
-            - name: ${_param:cluster_node03_hostname}
-              host: ${_param:cluster_node03_address}
-              port: 9200
-              params: check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/kibana.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/kibana.yml
deleted file mode 100644
index a2180cb25..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/kibana.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        kibana:
-          mode: http
-          service_name: kibana
-          options:
-            - forwardfor
-#            - httpchk
-            - httpclose
-            - httplog
-          balance: source
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 80
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: 5601
-              params: check
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: 5601
-              params: check
-            - name: ${_param:cluster_node03_hostname}
-              host: ${_param:cluster_node03_address}
-              port: 5601
-              params: check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/apiserver.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/apiserver.yml
deleted file mode 100644
index a45a71a75..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/apiserver.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        k8s_secure:
-          type: kubernetes
-          options:
-            - ssl-hello-chk
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 443
-          servers:
-          - name: ${_param:cluster_node01_hostname}
-            host: ${_param:cluster_node01_address}
-            port: 443
-            params: check
-          - name: ${_param:cluster_node02_hostname}
-            host: ${_param:cluster_node02_address}
-            port: 443
-            params: check
-          - name: ${_param:cluster_node03_hostname}
-            host: ${_param:cluster_node03_address}
-            port: 443
-            params: check
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/apiserver_insecure.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/apiserver_insecure.yml
deleted file mode 100644
index a365c5190..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/apiserver_insecure.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        k8s_cluster:
-          type: kubernetes
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8080
-          servers:
-          - name: ${_param:cluster_node01_hostname}
-            host: ${_param:cluster_node01_address}
-            port: 8080
-            params: check
-          - name: ${_param:cluster_node02_hostname}
-            host: ${_param:cluster_node02_address}
-            port: 8080
-            params: check
-          - name: ${_param:cluster_node03_hostname}
-            host: ${_param:cluster_node03_address}
-            port: 8080
-            params: check
-        k8s_cluster_localhost:
-          type: kubernetes
-          binds:
-          - address: localhost
-            port: 8080
-          servers:
-          - name: ${_param:cluster_node01_hostname}
-            host: ${_param:cluster_node01_address}
-            port: 8080
-            params: check
-          - name: ${_param:cluster_node02_hostname}
-            host: ${_param:cluster_node02_address}
-            port: 8080
-            params: check
-          - name: ${_param:cluster_node03_hostname}
-            host: ${_param:cluster_node03_address}
-            port: 8080
-            params: check
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/etcd.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/etcd.yml
deleted file mode 100644
index c31419165..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/etcd.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        etcd_cluster:
-          type: etcd
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 4001
-          servers:
-          - name: etc01
-            host: ${_param:cluster_node01_address}
-            port: 4001
-            params: check
-          - name: etc02
-            host: ${_param:cluster_node02_address}
-            port: 4001
-            params: backup check
-          - name: etc03
-            host: ${_param:cluster_node03_address}
-            port: 4001
-            params: backup check
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/logging.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/logging.yml
deleted file mode 100644
index 48a4b5ce5..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/logging.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-classes:
-  - service.haproxy.proxy.single
-  - service.haproxy.proxy.stats
-  # Services
-  - system.haproxy.proxy._kibana
-  - system.haproxy.proxy._elasticsearch
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/monitoring.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/monitoring.yml
deleted file mode 100644
index a59d84ac8..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/monitoring.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-classes:
-  - service.haproxy.proxy.single
-  - service.haproxy.proxy.stats
-  # Services
-  - system.haproxy.proxy._rabbitmq
-  - system.haproxy.proxy._uchiwa
-  - system.haproxy.proxy._sensu
-  - system.haproxy.proxy._redis
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/mysql.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/mysql.yml
deleted file mode 100644
index a7ef9105b..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/mysql.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-parameters:
-  _param:
-    haproxy_mysql_bind_port: 3306
-    haproxy_mysql_source_port: 3306
-  haproxy:
-    proxy:
-      listen:
-        mysql:
-          mode: tcp
-          balance: source
-          binds:
-            - address: ${_param:haproxy_bind_address}
-              port: ${_param:haproxy_mysql_bind_port}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: ${_param:haproxy_mysql_source_port}
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: ${_param:haproxy_mysql_source_port}
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: ${_param:haproxy_mysql_source_port}
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/opencontrail/analytics.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/opencontrail/analytics.yml
deleted file mode 100644
index fd20277dd..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/opencontrail/analytics.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        contrail_analytics:
-          type: contrail-analytics
-          service_name: contrail
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8081
-          servers:
-          - name: nal01
-            host: ${_param:cluster_node01_address}
-            port: 9081
-            params: check inter 2000 rise 2 fall 3
-          - name: nal02
-            host: ${_param:cluster_node02_address}
-            port: 9081
-            params: check inter 2000 rise 2 fall 3
-          - name: nal03
-            host: ${_param:cluster_node03_address}
-            port: 9081
-            params: check inter 2000 rise 2 fall 3
-        contrail_config_stats:
-          type: contrail-config
-          service_name: contrail
-          check: false
-          format: listen
-          binds:
-          - address: '*'
-            port: 5937
-          user: haproxy
-          password: ${_param:opencontrail_stats_password}
-        contrail_openstack_stats:
-          type: contrail-config
-          service_name: contrail
-          check: false
-          format: listen
-          binds:
-          - address: '*'
-            port: 5936
-          user: haproxy
-          password: ${_param:opencontrail_stats_password}
-        contrail_collector_stats:
-          type: contrail-config
-          service_name: contrail
-          check: false
-          format: listen
-          binds:
-          - address: '*'
-            port: 5938
-          user: haproxy
-          password: ${_param:opencontrail_stats_password}
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/opencontrail/control.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/opencontrail/control.yml
deleted file mode 100644
index c38968275..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/opencontrail/control.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        contrail_api:
-          type: contrail-api
-          service_name: contrail
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8082
-          servers:
-          - name: ntw01
-            host: ${_param:cluster_node01_address}
-            port: 9100
-            params: check inter 2000 rise 2 fall 3
-          - name: ntw02
-            host: ${_param:cluster_node02_address}
-            port: 9100
-            params: check inter 2000 rise 2 fall 3
-          - name: ntw03
-            host: ${_param:cluster_node03_address}
-            port: 9100
-            params: check inter 2000 rise 2 fall 3
-        contrail_discovery:
-          type: contrail-api
-          service_name: contrail
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 5998
-          servers:
-          - name: ntw01
-            host: ${_param:cluster_node01_address}
-            port: 9110
-            params: check inter 2000 rise 2 fall 3
-          - name: ntw02
-            host: ${_param:cluster_node02_address}
-            port: 9110
-            params: check inter 2000 rise 2 fall 3
-          - name: ntw03
-            host: ${_param:cluster_node03_address}
-            port: 9110
-            params: check inter 2000 rise 2 fall 3
-        contrail_config_stats:
-          type: contrail-config
-          check: false
-          format: listen
-          binds:
-          - address: '*'
-            port: 5937
-          user: haproxy
-          password: ${_param:opencontrail_stats_password}
-        contrail_openstack_stats:
-          type: contrail-config
-          check: false
-          format: listen
-          binds:
-          - address: '*'
-            port: 5936
-          user: haproxy
-          password: ${_param:opencontrail_stats_password}
-        contrail_collector_stats:
-          type: contrail-config
-          check: false
-          format: listen
-          binds:
-          - address: '*'
-            port: 5938
-          user: haproxy
-          password: ${_param:opencontrail_stats_password}
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openldap.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openldap.yml
deleted file mode 100644
index b6f79a039..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openldap.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-parameters:
-  _param:
-    haproxy_openldap_bind_host: ${_param:haproxy_bind_address}
-    haproxy_openldap_bind_port: 389
-    haproxy_openldap_ssl_bind_port: 636
-  haproxy:
-    proxy:
-      listen:
-        openldap:
-          mode: tcp
-          balance: source
-          binds:
-            - address: ${_param:haproxy_openldap_bind_host}
-              port: ${_param:haproxy_openldap_bind_port}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: 1389
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: 1389
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: 1389
-              params: backup check
-        openldap_ssl:
-          mode: tcp
-          balance: source
-          binds:
-            - address: ${_param:haproxy_openldap_bind_host}
-              port: ${_param:haproxy_openldap_ssl_bind_port}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: 1636
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: 1636
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: 1636
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/aodh.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/aodh.yml
deleted file mode 100644
index 6b024aa2f..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/aodh.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        aodh-api:
-          type: openstack-service
-          service_name: aodh
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8042
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8042
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 8042
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 8042
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/ceilometer.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/ceilometer.yml
deleted file mode 100644
index 68eef43c6..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/ceilometer.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        ceilometer_api:
-          type: general-service
-          check: false
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8777
-          servers:
-          - name: ${_param:cluster_node01_hostname}
-            host: ${_param:cluster_node01_address}
-            port: 8777
-            params: check
-          - name: ${_param:cluster_node02_hostname}
-            host: ${_param:cluster_node02_address}
-            port: 8777
-            params: check
-          - name: ${_param:cluster_node03_hostname}
-            host: ${_param:cluster_node03_address}
-            port: 8777
-            params: check
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/cinder.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/cinder.yml
deleted file mode 100644
index a693e6e21..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/cinder.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        cinder_api:
-          type: openstack-service
-          service_name: cinder
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8776
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8776
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 8776
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 8776
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/designate.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/designate.yml
deleted file mode 100644
index 7a54af27d..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/designate.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        designate_api:
-          type: openstack-service
-          service_name: designate
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 9001
-          servers:
-          - name: ${_param:cluster_node01_hostname}
-            host: ${_param:cluster_node01_address}
-            port: 9001
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ${_param:cluster_node02_hostname}
-            host: ${_param:cluster_node02_address}
-            port: 9001
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/galera.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/galera.yml
deleted file mode 100644
index 254dc3b03..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/galera.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      timeout:
-        queue: '10s'
-        connect: '10s'
-        client: '10s'
-        server: '10s'
-        check: '10s'
-      listen:
-        mysql_cluster:
-          type: mysql
-          service_name: mysql
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 3306
-          servers:
-          - name: ${_param:cluster_node01_hostname}
-            host: ${_param:cluster_node01_address}
-            port: 3306
-            params: check inter 20s fastinter 2s downinter 2s rise 3 fall 3
-          - name: ${_param:cluster_node02_hostname}
-            host: ${_param:cluster_node02_address}
-            port: 3306
-            params: backup check inter 20s fastinter 2s downinter 2s rise 3 fall 3
-          - name: ${_param:cluster_node03_hostname}
-            host: ${_param:cluster_node03_address}
-            port: 3306
-            params: backup check inter 20s fastinter 2s downinter 2s rise 3 fall 3
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glance.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glance.yml
deleted file mode 100644
index 729cc5b69..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glance.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        glance_api:
-          type: openstack-service
-          service_name: glance
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 9292
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 9292
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 9292
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 9292
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-        glance_registry_api:
-          type: general-service
-          service_name: glance
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 9191
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 9191
-            params: check
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 9191
-            params: check
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 9191
-            params: check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glare.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glare.yml
deleted file mode 100644
index a98427511..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glare.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        glare:
-          type: general-service
-          service_name: glare
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 9494
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 9494
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 9494
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 9494
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/heat.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/heat.yml
deleted file mode 100644
index 440a018b2..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/heat.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        heat_cloudwatch_api:
-          type: openstack-service
-          service_name: heat
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8000
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8000
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 8000
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 8000
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-        heat_api:
-          type: openstack-service
-          service_name: heat
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8004
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8004
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 8004
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 8004
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-        heat_cfn_api:
-          type: openstack-service
-          service_name: heat
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8003
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8003
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 8003
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 8003
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/horizon.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/horizon.yml
deleted file mode 100644
index 9bf838cd7..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/horizon.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        horizon_web:
-          type: general-service
-          check: false
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8078
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8078
-            params: check
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 8078
-            params: check
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 8078
-            params: check
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/keystone.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/keystone.yml
deleted file mode 100644
index 17e537ecf..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/keystone.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        keystone_public_api:
-          type: openstack-service
-          service_name: keystone
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 5000
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 5000
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 5000
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 5000
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-        keystone_admin_api:
-          type: openstack-service
-          service_name: keystone
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 35357
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 35357
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 35357
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 35357
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/murano.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/murano.yml
deleted file mode 100644
index 0427820ba..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/murano.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        murano_api:
-          type: openstack-service
-          check: false
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8082
-          servers:
-          - name: ${_param:cluster_node01_hostname}
-            host: ${_param:cluster_node01_address}
-            port: 8082
-            params: check
-          - name: ${_param:cluster_node02_hostname}
-            host: ${_param:cluster_node02_address}
-            port: 8082
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/neutron.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/neutron.yml
deleted file mode 100644
index 1f8b4d596..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/neutron.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        neutron_api:
-          type: openstack-service
-          service_name: neutron
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 9696
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova-placement.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova-placement.yml
deleted file mode 100644
index e3b72b7dc..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova-placement.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        nova_placement_api:
-          mode: http
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8778
-          options:
-          - httpclose
-          - httplog
-          health-check:
-            http:
-              options:
-              - expect status 401
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8778
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 8778
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 8778
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova.yml
deleted file mode 100644
index 3865a822c..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        nova_ec2_api:
-          type: general-service
-          service_name: nova
-          check: false
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8773
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8773
-            params: check
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 8773
-            params: check
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 8773
-            params: check
-        nova_api:
-          type: openstack-service
-          service_name: nova
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8774
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8774
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 8774
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 8774
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-        nova_metadata_api:
-          type: openstack-service
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8775
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8775
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 8775
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 8775
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/novnc.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/novnc.yml
deleted file mode 100644
index 78b7d98bd..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/novnc.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        nova_novnc:
-          type: general-service
-          service_name: http
-          check: true
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 6080
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 6080
-            params: check
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 6080
-            params: check
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 6080
-            params: check
-
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/sahara.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/sahara.yml
deleted file mode 100644
index 3bbf8094c..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/sahara.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        sahara_api:
-          type: openstack-service
-          options:
-            - httplog
-          binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8386
-          servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8386
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
-            host: ${_param:cluster_node02_address}
-            port: 8386
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
-            host: ${_param:cluster_node03_address}
-            port: 8386
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/devops_portal.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/oss/devops_portal.yml
deleted file mode 100644
index e5c25cfbd..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/devops_portal.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-parameters:
-  _param:
-    haproxy_devops_portal_bind_host: ${_param:haproxy_bind_address}
-    haproxy_devops_portal_bind_port: 8800
-    haproxy_devops_portal_ssl:
-      enabled: false
-  haproxy:
-    proxy:
-      listen:
-        devops_portal:
-          mode: http
-          options:
-            - forwardfor
-            - httpchk
-            - httpclose
-            - httplog
-          balance: source
-          http_request:
-            - action: "add-header X-Forwarded-Proto https"
-              condition: "if { ssl_fc }"
-          binds:
-            - address: ${_param:haproxy_devops_portal_bind_host}
-              port: ${_param:haproxy_devops_portal_bind_port}
-              ssl: ${_param:haproxy_devops_portal_ssl}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: 18800
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: 18800
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: 18800
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/elasticsearch.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/oss/elasticsearch.yml
deleted file mode 100644
index 2f5d1ee40..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/elasticsearch.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-parameters:
-  _param:
-    haproxy_elasticsearch_bind_host: ${_param:haproxy_bind_address}
-    haproxy_elasticsearch_bind_port: 9200
-    haproxy_elasticsearch_exposed_port: 19200
-    haproxy_elasticsearch_ssl:
-      enabled: false
-  haproxy:
-    proxy:
-      listen:
-        elasticsearch:
-          mode: http
-          options:
-            - forwardfor
-            - httpchk
-            - httpclose
-            - httplog
-          balance: source
-          http_request:
-            - action: "add-header X-Forwarded-Proto https"
-              condition: "if { ssl_fc }"
-          binds:
-            - address: ${_param:haproxy_elasticsearch_bind_host}
-              port: ${_param:haproxy_elasticsearch_bind_port}
-              ssl: ${_param:haproxy_elasticsearch_ssl}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: ${_param:haproxy_elasticsearch_exposed_port}
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: ${_param:haproxy_elasticsearch_exposed_port}
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: ${_param:haproxy_elasticsearch_exposed_port}
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/postgresql.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/oss/postgresql.yml
deleted file mode 100644
index 1bc1f44c9..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/postgresql.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-parameters:
-  _param:
-    haproxy_postgresql_bind_host: ${_param:haproxy_bind_address}
-    haproxy_postgresql_bind_port: 5432
-    haproxy_postgresql_exposed_port: 15432
-    haproxy_postgresql_ssl:
-      enabled: false
-  haproxy:
-    proxy:
-      listen:
-        postgresql:
-          mode: tcp
-          balance: source
-          options:
-          - tcp-check
-          binds:
-            - address: ${_param:haproxy_postgresql_bind_host}
-              port: ${_param:haproxy_postgresql_bind_port}
-              ssl: ${_param:haproxy_postgresql_ssl}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: ${_param:haproxy_postgresql_exposed_port}
-              params: check port ${_param:haproxy_postgresql_exposed_port}
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: ${_param:haproxy_postgresql_exposed_port}
-              params: backup check port ${_param:haproxy_postgresql_exposed_port}
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: ${_param:haproxy_postgresql_exposed_port}
-              params: backup check port ${_param:haproxy_postgresql_exposed_port}
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/pushkin.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/oss/pushkin.yml
deleted file mode 100644
index db33352ca..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/pushkin.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-parameters:
-  _param:
-    haproxy_pushkin_bind_host: ${_param:haproxy_bind_address}
-    haproxy_pushkin_bind_port: 8887
-    haproxy_pushkin_exposed_port: 18887
-    haproxy_pushkin_ssl:
-      enabled: false
-  haproxy:
-    proxy:
-      listen:
-        pushkin:
-          mode: http
-          options:
-          - httpchk GET /apps
-          balance: source
-          http_request:
-            - action: "add-header X-Forwarded-Proto https"
-              condition: "if { ssl_fc }"
-          sticks:
-          - http-check expect status 200
-          binds:
-            - address: ${_param:haproxy_pushkin_bind_host}
-              port: ${_param:haproxy_pushkin_bind_port}
-              ssl: ${_param:haproxy_pushkin_ssl}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: ${_param:haproxy_pushkin_exposed_port}
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: ${_param:haproxy_pushkin_exposed_port}
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: ${_param:haproxy_pushkin_exposed_port}
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/rundeck.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/oss/rundeck.yml
deleted file mode 100644
index fbabb381d..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/rundeck.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-parameters:
-  _param:
-    haproxy_rundeck_bind_host: ${_param:haproxy_bind_address}
-    haproxy_rundeck_bind_port: 4440
-    haproxy_rundeck_ssl:
-      enabled: false
-  haproxy:
-    proxy:
-      listen:
-        rundeck:
-          mode: http
-          options:
-            - forwardfor
-            - httpchk
-            - httpclose
-            - httplog
-          balance: source
-          http_request:
-            - action: "add-header X-Forwarded-Proto https"
-              condition: "if { ssl_fc }"
-          binds:
-            - address: ${_param:haproxy_rundeck_bind_host}
-              port: ${_param:haproxy_rundeck_bind_port}
-              ssl: ${_param:haproxy_rundeck_ssl}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: 14440
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: 14440
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: 14440
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/security_monkey.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/oss/security_monkey.yml
deleted file mode 100644
index 549869996..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/security_monkey.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-parameters:
-  _param:
-    haproxy_security_monkey_bind_host: ${_param:haproxy_bind_address}
-    haproxy_security_monkey_bind_port: 5001
-    haproxy_security_monkey_exposed_port: 15001
-    haproxy_security_monkey_ssl:
-      enabled: false
-  haproxy:
-    proxy:
-      listen:
-        security_monkey:
-          mode: http
-          options:
-          - httpchk GET /
-          balance: source
-          http_request:
-            - action: "add-header X-Forwarded-Proto https"
-              condition: "if { ssl_fc }"
-          sticks:
-          - http-check expect status 404
-          binds:
-            - address: ${_param:haproxy_security_monkey_bind_host}
-              port: ${_param:haproxy_security_monkey_bind_port}
-              ssl: ${_param:haproxy_security_monkey_ssl}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: ${_param:haproxy_security_monkey_exposed_port}
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: ${_param:haproxy_security_monkey_exposed_port}
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: ${_param:haproxy_security_monkey_exposed_port}
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/phpldapadmin.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/phpldapadmin.yml
deleted file mode 100644
index b2b7f93da..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/phpldapadmin.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-parameters:
-  _param:
-    haproxy_phpldapadmin_bind_host: ${_param:haproxy_bind_address}
-    haproxy_phpldapadmin_bind_port: 8089
-  haproxy:
-    proxy:
-      listen:
-        phpldapadmin:
-          mode: http
-          options:
-            - forwardfor
-            - httpclose
-            - httplog
-          balance: source
-          binds:
-            - address: ${_param:haproxy_phpldapadmin_bind_host}
-              port: ${_param:haproxy_phpldapadmin_bind_port}
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: 18089
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: 18089
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: 18089
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/rabbitmq.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/rabbitmq.yml
deleted file mode 100644
index 83992dd11..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/rabbitmq.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        rabbitmq:
-          type: rabbitmq
-          service_name: rabbitmq
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 5672
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: 5672
-              params: check
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: 5672
-              params: backup check
-        rabbitmq_management:
-          type: rabbitmq
-          service_name: rabbitmq
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 15672
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: 15672
-              params: check
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: 15672
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/radosgw.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/radosgw.yml
deleted file mode 100644
index 369306ba4..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/radosgw.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-parameters:
-  _param:
-    haproxy_radosgw_bind_port: 8080
-    haproxy_radosgw_source_port: 8080
-  haproxy:
-    proxy:
-      listen:
-        radosgw:
-          mode: tcp
-          balance: source
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: ${_param:haproxy_radosgw_bind_port}
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: ${_param:haproxy_radosgw_source_port}
-              params: check
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: ${_param:haproxy_radosgw_source_port}
-              params: backup check
-            - name: ${_param:cluster_node03_hostname}
-              host: ${_param:cluster_node03_address}
-              port: ${_param:haproxy_radosgw_source_port}
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/redis.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/redis.yml
deleted file mode 100644
index fc4695337..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/redis.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        redis:
-          mode: tcp
-          service_name: redis
-          balance: source
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 6379
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: 6379
-              params: check
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: 6379
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/salt.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/salt.yml
deleted file mode 100644
index ba54c0740..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/salt.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        salt:
-          mode: http
-          options:
-            - forwardfor
-            - httpchk
-            - httpclose
-            - httplog
-          balance: source
-          timeout:
-            server: 20m
-            client: 20m
-          binds:
-            - address: ${_param:haproxy_bind_address}
-              port: 8000
-          servers:
-            - name: ${_param:cluster_node01_name}
-              host: ${_param:cluster_node01_address}
-              port: 8000
-              params: check
-            - name: ${_param:cluster_node02_name}
-              host: ${_param:cluster_node02_address}
-              port: 8000
-              params: backup check
-            - name: ${_param:cluster_node03_name}
-              host: ${_param:cluster_node03_address}
-              port: 8000
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/sensu.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/sensu.yml
deleted file mode 100644
index 739916cf1..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/sensu.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        sensu:
-          mode: http
-          options:
-            - forwardfor
-            - httpchk
-            - httpclose
-            - httplog
-          balance: source
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 4567
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: 4567
-              params: check
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: 4567
-              params: backup check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/elasticsearch.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/elasticsearch.yml
deleted file mode 100644
index 531d647f0..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/elasticsearch.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        elasticsearch:
-          mode: http
-          options:
-            - httplog
-            - http-keep-alive
-            - prefer-last-server
-            - dontlog-normal
-          balance: roundrobin
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 9200
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: 9200
-              params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3'
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: 9200
-              params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3'
-            - name: ${_param:cluster_node03_hostname}
-              host: ${_param:cluster_node03_address}
-              port: 9200
-              params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3'
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/grafana.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/grafana.yml
deleted file mode 100644
index 3f59ce268..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/grafana.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        grafana:
-          mode: http
-          options:
-            - httplog
-            - dontlog-normal
-          balance: source
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: ${_param:cluster_grafana_port}
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: 3000
-              params: 'check'
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: 3000
-              params: 'check'
-            - name: ${_param:cluster_node03_hostname}
-              host: ${_param:cluster_node03_address}
-              port: 3000
-              params: 'check'
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/influxdb.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/influxdb.yml
deleted file mode 100644
index 02e25d7b2..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/influxdb.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-parameters:
-  _param:
-    cluster_influxdb_port: ${_param:influxdb_port}
-  haproxy:
-    proxy:
-      listen:
-        influxdb:
-          mode: http
-          options:
-            - "httpchk GET /ping"
-            - httplog
-            - dontlog-normal
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: ${_param:cluster_influxdb_port}
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: 8086
-              params: 'check'
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: 8086
-              params: 'backup check'
-            - name: ${_param:cluster_node03_hostname}
-              host: ${_param:cluster_node03_address}
-              port: 8086
-              params: 'backup check'
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/kibana.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/kibana.yml
deleted file mode 100644
index e92e38a43..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/kibana.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        kibana:
-          mode: http
-          options:
-            - httplog
-            - http-keep-alive
-            - prefer-last-server
-            - dontlog-normal
-          balance: roundrobin
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 5601
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: 5601
-              params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3'
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: 5601
-              params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3'
-            - name: ${_param:cluster_node03_hostname}
-              host: ${_param:cluster_node03_address}
-              port: 5601
-              params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3'
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/redis.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/redis.yml
deleted file mode 100644
index 881e8ed9a..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/redis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        redis:
-          mode: tcp
-          check: False
-          health-check:
-            tcp:
-              options:
-                - send PING\r\n
-                - expect string +PONG
-                - send info\ replication\r\n
-                - expect string role:master
-                - send QUIT\r\n
-                - expect string +OK
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: ${_param:cluster_redis_port}
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: 6379
-              params: 'check'
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: 6379
-              params: 'check'
-            - name: ${_param:cluster_node03_hostname}
-              host: ${_param:cluster_node03_address}
-              port: 6379
-              params: 'check'
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/sensu.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/sensu.yml
deleted file mode 100644
index 33ab5bcd4..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/sensu.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        sensu:
-          mode: http
-          options:
-            - forwardfor
-            - httpchk
-            - httpclose
-            - httplog
-          balance: source
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 4567
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: 4567
-              params: check
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: 4567
-              params: check
-            - name: ${_param:cluster_node03_hostname}
-              host: ${_param:cluster_node03_address}
-              port: 4567
-              params: check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/uchiwa.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/uchiwa.yml
deleted file mode 100644
index 3bec0e82b..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/uchiwa.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        uchiwa:
-          mode: http
-          options:
-            - forwardfor
-            - httpchk
-            - httpclose
-            - httplog
-          balance: source
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 3001
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: 3001
-              params: check
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: 3001
-              params: check
-            - name: ${_param:cluster_node03_hostname}
-              host: ${_param:cluster_node03_address}
-              port: 3001
-              params: check
-
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stats.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stats.yml
deleted file mode 100644
index 1d093f17b..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/stats.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
-  _param:
-    haproxy_stats_port: 9600
-  haproxy:
-    proxy:
-      listen:
-        stats:
-          type: stats
-          check: false
-          binds:
-            - address: ${_param:haproxy_bind_address}
-              port: ${_param:haproxy_stats_port}
diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/uchiwa.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/uchiwa.yml
deleted file mode 100644
index 1f25bc49c..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/listen/uchiwa.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      listen:
-        uchiwa:
-          mode: http
-          options:
-            - forwardfor
-            - httpchk
-            - httpclose
-            - httplog
-          balance: source
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 80
-          servers:
-            - name: ${_param:cluster_node01_hostname}
-              host: ${_param:cluster_node01_address}
-              port: 3000
-              params: check
-            - name: ${_param:cluster_node02_hostname}
-              host: ${_param:cluster_node02_address}
-              port: 3000
-              params: check
diff --git a/mcp/reclass/classes/system/haproxy/proxy/single.yml b/mcp/reclass/classes/system/haproxy/proxy/single.yml
deleted file mode 100644
index dc9c6685a..000000000
--- a/mcp/reclass/classes/system/haproxy/proxy/single.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-parameters:
-  haproxy:
-    proxy:
-      enabled: true