[mcp] Replace reclass system models with submodule

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

39 files changed, 0 insertions, 564 deletions

diff --git a/mcp/reclass/classes/system/glusterfs/client/cluster.yml b/mcp/reclass/classes/system/glusterfs/client/cluster.yml
deleted file mode 100644
index 24eab4fa5..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/cluster.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-classes:
-- service.glusterfs.client
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/aptly.yml b/mcp/reclass/classes/system/glusterfs/client/volume/aptly.yml
deleted file mode 100644
index 659f59d16..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/aptly.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    aptly_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        aptly:
-          path: /srv/volumes/aptly
-          server: ${_param:aptly_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/artifactory.yml b/mcp/reclass/classes/system/glusterfs/client/volume/artifactory.yml
deleted file mode 100644
index 878131fbb..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/artifactory.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    artifactory_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        artifactory:
-          path: /srv/volumes/artifactory
-          server: ${_param:artifactory_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/devops_portal.yml b/mcp/reclass/classes/system/glusterfs/client/volume/devops_portal.yml
deleted file mode 100644
index dc422012b..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/devops_portal.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    devops_portal_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        devops_portal:
-          path: /srv/volumes/devops_portal
-          server: ${_param:devops_portal_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/elasticsearch.yml b/mcp/reclass/classes/system/glusterfs/client/volume/elasticsearch.yml
deleted file mode 100644
index 02480937e..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/elasticsearch.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    elasticsearch_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        elasticsearch:
-          path: /srv/volumes/elasticsearch
-          server: ${_param:elasticsearch_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/gerrit.yml b/mcp/reclass/classes/system/glusterfs/client/volume/gerrit.yml
deleted file mode 100644
index 4598683b9..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/gerrit.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-parameters:
-  _param:
-    gerrit_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        gerrit:
-          path: /srv/volumes/gerrit
-          server: ${_param:gerrit_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
-          user: 1000
-          group: 1000
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/glance.yml b/mcp/reclass/classes/system/glusterfs/client/volume/glance.yml
deleted file mode 100644
index ec593b9fa..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/glance.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-parameters:
-  _param:
-    glance_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        glance:
-          path: /var/lib/glance/images
-          server: ${_param:glance_glusterfs_service_host}
-          user: glance
-          group: glance
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/jenkins.yml b/mcp/reclass/classes/system/glusterfs/client/volume/jenkins.yml
deleted file mode 100644
index c9fa258be..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/jenkins.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-parameters:
-  _param:
-    jenkins_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        jenkins:
-          path: /srv/volumes/jenkins
-          server: ${_param:jenkins_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
-          user: 1000
-          group: 1000
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/keystone.yml b/mcp/reclass/classes/system/glusterfs/client/volume/keystone.yml
deleted file mode 100644
index 713902972..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/keystone.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-parameters:
-  _param:
-    keystone_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        keystone-keys:
-          path: /var/lib/keystone/fernet-keys
-          server: ${_param:keystone_glusterfs_service_host}
-          user: keystone
-          group: keystone
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/mysql.yml b/mcp/reclass/classes/system/glusterfs/client/volume/mysql.yml
deleted file mode 100644
index 7761a0735..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/mysql.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    mysql_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        mysql:
-          path: /srv/volumes/mysql
-          server: ${_param:mysql_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/openldap.yml b/mcp/reclass/classes/system/glusterfs/client/volume/openldap.yml
deleted file mode 100644
index 22b10cd9c..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/openldap.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    openldap_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        openldap:
-          path: /srv/volumes/openldap
-          server: ${_param:openldap_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/postgresql.yml b/mcp/reclass/classes/system/glusterfs/client/volume/postgresql.yml
deleted file mode 100644
index b49c905d8..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/postgresql.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    postgresql_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        postgresql:
-          path: /srv/volumes/postgresql
-          server: ${_param:postgresql_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/prometheus.yml b/mcp/reclass/classes/system/glusterfs/client/volume/prometheus.yml
deleted file mode 100644
index 3fae59b3a..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/prometheus.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    prometheus_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        prometheus:
-          path: /srv/volumes/prometheus
-          server: ${_param:prometheus_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/pushkin.yml b/mcp/reclass/classes/system/glusterfs/client/volume/pushkin.yml
deleted file mode 100644
index ee09ef860..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/pushkin.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    pushkin_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        pushkin:
-          path: /srv/volumes/pushkin
-          server: ${_param:pushkin_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/registry.yml b/mcp/reclass/classes/system/glusterfs/client/volume/registry.yml
deleted file mode 100644
index af932a681..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/registry.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    registry_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        registry:
-          path: /srv/volumes/registry
-          server: ${_param:registry_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/rundeck.yml b/mcp/reclass/classes/system/glusterfs/client/volume/rundeck.yml
deleted file mode 100644
index f0c6ccdf9..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/rundeck.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    rundeck_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        rundeck:
-          path: /srv/volumes/rundeck
-          server: ${_param:rundeck_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/salt.yml b/mcp/reclass/classes/system/glusterfs/client/volume/salt.yml
deleted file mode 100644
index 048d38b94..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/salt.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    salt_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        saltmaster:
-          path: /etc/salt/pki/master
-          server: ${_param:salt_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/salt_pki.yml b/mcp/reclass/classes/system/glusterfs/client/volume/salt_pki.yml
deleted file mode 100644
index 9083e19ba..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/salt_pki.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    salt_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        salt_pki:
-          path: /srv/salt/pki
-          server: ${_param:salt_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/security_monkey.yml b/mcp/reclass/classes/system/glusterfs/client/volume/security_monkey.yml
deleted file mode 100644
index b00866978..000000000
--- a/mcp/reclass/classes/system/glusterfs/client/volume/security_monkey.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  _param:
-    security_monkey_glusterfs_service_host: ${_param:glusterfs_service_host}
-    glusterfs_node01_address: ${_param:cluster_node01_address}
-    glusterfs_node02_address: ${_param:cluster_node02_address}
-    glusterfs_node03_address: ${_param:cluster_node03_address}
-  glusterfs:
-    client:
-      volumes:
-        security_monkey:
-          path: /srv/volumes/security_monkey
-          server: ${_param:security_monkey_glusterfs_service_host}
-          opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/mcp/reclass/classes/system/glusterfs/cluster.yml b/mcp/reclass/classes/system/glusterfs/cluster.yml
deleted file mode 100644
index 8a5c59539..000000000
--- a/mcp/reclass/classes/system/glusterfs/cluster.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-classes:
-- service.glusterfs.server
diff --git a/mcp/reclass/classes/system/glusterfs/server/cluster.yml b/mcp/reclass/classes/system/glusterfs/server/cluster.yml
deleted file mode 100644
index 87aa0e950..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/cluster.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-classes:
-- service.glusterfs.server
-parameters:
-  glusterfs:
-    _support:
-      iptables:
-        enabled: false
-    server:
-      peers:
-      - ${_param:cluster_node01_address}
-      - ${_param:cluster_node02_address}
-      - ${_param:cluster_node03_address}
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/aptly.yml b/mcp/reclass/classes/system/glusterfs/server/volume/aptly.yml
deleted file mode 100644
index db0163821..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/aptly.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        aptly:
-          storage: /srv/glusterfs/aptly
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/aptly
-            - ${_param:cluster_node02_address}:/srv/glusterfs/aptly
-            - ${_param:cluster_node03_address}:/srv/glusterfs/aptly
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/artifactory.yml b/mcp/reclass/classes/system/glusterfs/server/volume/artifactory.yml
deleted file mode 100644
index a19115e9c..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/artifactory.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        artifactory:
-          storage: /srv/glusterfs/artifactory
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/artifactory
-            - ${_param:cluster_node02_address}:/srv/glusterfs/artifactory
-            - ${_param:cluster_node03_address}:/srv/glusterfs/artifactory
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/devops_portal.yml b/mcp/reclass/classes/system/glusterfs/server/volume/devops_portal.yml
deleted file mode 100644
index 0b71b6280..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/devops_portal.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        devops_portal:
-          storage: /srv/glusterfs/devops_portal
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/devops_portal
-            - ${_param:cluster_node02_address}:/srv/glusterfs/devops_portal
-            - ${_param:cluster_node03_address}:/srv/glusterfs/devops_portal
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/elasticsearch.yml b/mcp/reclass/classes/system/glusterfs/server/volume/elasticsearch.yml
deleted file mode 100644
index 73f35c102..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/elasticsearch.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        elasticsearch:
-          storage: /srv/glusterfs/elasticsearch
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/elasticsearch
-            - ${_param:cluster_node02_address}:/srv/glusterfs/elasticsearch
-            - ${_param:cluster_node03_address}:/srv/glusterfs/elasticsearch
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/gerrit.yml b/mcp/reclass/classes/system/glusterfs/server/volume/gerrit.yml
deleted file mode 100644
index 6667f936b..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/gerrit.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        gerrit:
-          storage: /srv/glusterfs/gerrit
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/gerrit
-            - ${_param:cluster_node02_address}:/srv/glusterfs/gerrit
-            - ${_param:cluster_node03_address}:/srv/glusterfs/gerrit
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/glance.yml b/mcp/reclass/classes/system/glusterfs/server/volume/glance.yml
deleted file mode 100644
index 8276a448a..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/glance.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        glance:
-          storage: /srv/glusterfs/glance
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/glance
-            - ${_param:cluster_node02_address}:/srv/glusterfs/glance
-            - ${_param:cluster_node03_address}:/srv/glusterfs/glance
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/jenkins.yml b/mcp/reclass/classes/system/glusterfs/server/volume/jenkins.yml
deleted file mode 100644
index 5c077d0bb..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/jenkins.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        jenkins:
-          storage: /srv/glusterfs/jenkins
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/jenkins
-            - ${_param:cluster_node02_address}:/srv/glusterfs/jenkins
-            - ${_param:cluster_node03_address}:/srv/glusterfs/jenkins
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/keystone.yml b/mcp/reclass/classes/system/glusterfs/server/volume/keystone.yml
deleted file mode 100644
index 229d787d5..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/keystone.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        keystone-keys:
-          storage: /srv/glusterfs/keystone-keys
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/keystone-keys
-            - ${_param:cluster_node02_address}:/srv/glusterfs/keystone-keys
-            - ${_param:cluster_node03_address}:/srv/glusterfs/keystone-keys
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/mysql.yml b/mcp/reclass/classes/system/glusterfs/server/volume/mysql.yml
deleted file mode 100644
index 0e7367c37..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/mysql.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        mysql:
-          storage: /srv/glusterfs/mysql
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/mysql
-            - ${_param:cluster_node02_address}:/srv/glusterfs/mysql
-            - ${_param:cluster_node03_address}:/srv/glusterfs/mysql
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
\ No newline at end of file
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/openldap.yml b/mcp/reclass/classes/system/glusterfs/server/volume/openldap.yml
deleted file mode 100644
index d507b44f7..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/openldap.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        openldap:
-          storage: /srv/glusterfs/openldap
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/openldap
-            - ${_param:cluster_node02_address}:/srv/glusterfs/openldap
-            - ${_param:cluster_node03_address}:/srv/glusterfs/openldap
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/postgresql.yml b/mcp/reclass/classes/system/glusterfs/server/volume/postgresql.yml
deleted file mode 100644
index 26290f888..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/postgresql.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        postgresql:
-          storage: /srv/glusterfs/postgresql
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/postgresql
-            - ${_param:cluster_node02_address}:/srv/glusterfs/postgresql
-            - ${_param:cluster_node03_address}:/srv/glusterfs/postgresql
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/prometheus.yml b/mcp/reclass/classes/system/glusterfs/server/volume/prometheus.yml
deleted file mode 100644
index 144847a0b..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/prometheus.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        prometheus:
-          storage: /srv/glusterfs/prometheus
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/prometheus
-            - ${_param:cluster_node02_address}:/srv/glusterfs/prometheus
-            - ${_param:cluster_node03_address}:/srv/glusterfs/prometheus
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/pushkin.yml b/mcp/reclass/classes/system/glusterfs/server/volume/pushkin.yml
deleted file mode 100644
index 52d393ef1..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/pushkin.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        pushkin:
-          storage: /srv/glusterfs/pushkin
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/pushkin
-            - ${_param:cluster_node02_address}:/srv/glusterfs/pushkin
-            - ${_param:cluster_node03_address}:/srv/glusterfs/pushkin
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/registry.yml b/mcp/reclass/classes/system/glusterfs/server/volume/registry.yml
deleted file mode 100644
index 5df7d8a70..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/registry.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        registry:
-          storage: /srv/glusterfs/registry
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/registry
-            - ${_param:cluster_node02_address}:/srv/glusterfs/registry
-            - ${_param:cluster_node03_address}:/srv/glusterfs/registry
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/rundeck.yml b/mcp/reclass/classes/system/glusterfs/server/volume/rundeck.yml
deleted file mode 100644
index 22e5563fd..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/rundeck.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        rundeck:
-          storage: /srv/glusterfs/rundeck
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/rundeck
-            - ${_param:cluster_node02_address}:/srv/glusterfs/rundeck
-            - ${_param:cluster_node03_address}:/srv/glusterfs/rundeck
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/salt.yml b/mcp/reclass/classes/system/glusterfs/server/volume/salt.yml
deleted file mode 100644
index f87b02938..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/salt.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        saltmaster:
-          storage: /srv/glusterfs/saltmaster
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/saltmaster
-            - ${_param:cluster_node02_address}:/srv/glusterfs/saltmaster
-            - ${_param:cluster_node03_address}:/srv/glusterfs/saltmaster
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/salt_pki.yml b/mcp/reclass/classes/system/glusterfs/server/volume/salt_pki.yml
deleted file mode 100644
index 7af39daab..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/salt_pki.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        salt_pki:
-          storage: /srv/glusterfs/salt_pki
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/salt_pki
-            - ${_param:cluster_node02_address}:/srv/glusterfs/salt_pki
-            - ${_param:cluster_node03_address}:/srv/glusterfs/salt_pki
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/security_monkey.yml b/mcp/reclass/classes/system/glusterfs/server/volume/security_monkey.yml
deleted file mode 100644
index 478aec3af..000000000
--- a/mcp/reclass/classes/system/glusterfs/server/volume/security_monkey.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
-  glusterfs:
-    server:
-      volumes:
-        security_monkey:
-          storage: /srv/glusterfs/security_monkey
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/security_monkey
-            - ${_param:cluster_node02_address}:/srv/glusterfs/security_monkey
-            - ${_param:cluster_node03_address}:/srv/glusterfs/security_monkey
-          options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING