commit 0b8494fe171edaaf30f9ee74116bb29e96fd32d8
author Éric Lemoine <elemoine@mirantis.com> Wed Dec 14 15:27:05 2016 +0000
committer Éric Lemoine <elemoine@mirantis.com> Fri Dec 16 14:30:33 2016 +0000
tree 4c992c94681117d6caacf75125972f677ab63d84
parent aecf659bb698f1c45bc39cbee90ba58cd25712b7

Split GlusterFS install from the Elastic class

This change separates the installation of GlusterFS for Elasticsearch
snapshots from the Elasticsearch system class for better flexibility.
It also removes the use of GlusterFS for the mk20 and mk22 StackLight
labs because it generates random errors during the deployment.

https://github.com/Mirantis/mk-lab-salt-model/pull/195

elasticsearch/server/cluster.yml

diff --git a/elasticsearch/server/cluster.yml b/elasticsearch/server/cluster.yml
index b59417a..8f53f21 100644
--- a/elasticsearch/server/cluster.yml
+++ b/elasticsearch/server/cluster.yml
@@ -1,8 +1,6 @@
 classes:
 - service.elasticsearch.server.cluster
 - service.java.environment
-- service.glusterfs.server
-- service.glusterfs.client
 parameters:
   _param:
     java_environment_version: "8"
@@ -40,34 +38,3 @@
         - host: ${_param:cluster_node01_address}
         - host: ${_param:cluster_node02_address}
         - host: ${_param:cluster_node03_address}
-      snapshot:
-        repo:
-          path: /var/lib/elasticsearch/repo
-  glusterfs:
-    server:
-      peers:
-        - ${_param:cluster_node01_address}
-        - ${_param:cluster_node02_address}
-        - ${_param:cluster_node03_address}
-      volumes:
-        elasticrepo:
-          storage: /srv/glusterfs/elasticrepo
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/elasticrepo
-            - ${_param:cluster_node02_address}:/srv/glusterfs/elasticrepo
-            - ${_param:cluster_node03_address}:/srv/glusterfs/elasticrepo
-          options:
-            cluster.readdir-optimize: On
-            cluster.lookup-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING
-    client:
-      volumes:
-        elasticrepo:
-          path: /var/lib/elasticsearch/repo
-          server: ${_param:cluster_node01_address}
-          user: elasticsearch
-          group: elasticsearch

elasticsearch/server/storage/glusterfs.yml

diff --git a/elasticsearch/server/storage/glusterfs.yml b/elasticsearch/server/storage/glusterfs.yml
new file mode 100644
index 0000000..25e9c54
--- /dev/null
+++ b/elasticsearch/server/storage/glusterfs.yml
@@ -0,0 +1,37 @@
+classes:
+- service.glusterfs.server
+- service.glusterfs.client
+parameters:
+  elasticsearch:
+    server:
+      snapshot:
+        repo:
+          path: /var/lib/elasticsearch/repo
+  glusterfs:
+    server:
+      peers:
+        - ${_param:cluster_node01_address}
+        - ${_param:cluster_node02_address}
+        - ${_param:cluster_node03_address}
+      volumes:
+        elasticrepo:
+          storage: /srv/glusterfs/elasticrepo
+          replica: 3
+          bricks:
+            - ${_param:cluster_node01_address}:/srv/glusterfs/elasticrepo
+            - ${_param:cluster_node02_address}:/srv/glusterfs/elasticrepo
+            - ${_param:cluster_node03_address}:/srv/glusterfs/elasticrepo
+          options:
+            cluster.readdir-optimize: On
+            cluster.lookup-optimize: On
+            nfs.disable: On
+            network.remote-dio: On
+            diagnostics.client-log-level: WARNING
+            diagnostics.brick-log-level: WARNING
+    client:
+      volumes:
+        elasticrepo:
+          path: /var/lib/elasticsearch/repo
+          server: ${_param:cluster_node01_address}
+          user: elasticsearch
+          group: elasticsearch