commit 72e0a6e408779c8a5d7afd2c6f0c52598aba46b0
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu May 23 09:41:21 2019 +0000
committer Gerrit Code Review <mail@domain.com> Thu May 23 09:41:21 2019 +0000
tree ba704ee14f0bfb28256517a7e0d563c18865256e
parent 0946350f5f2448c85ce5613fd316bd0fa273a966
parent a5f04dbb86d911fe750b139cc4e27a328994a827

Merge "Fix check of setting volume options" into release/2019.2.0

glusterfs/server/setup.sls

diff --git a/glusterfs/server/setup.sls b/glusterfs/server/setup.sls
index b983810..53e66a7 100644
--- a/glusterfs/server/setup.sls
+++ b/glusterfs/server/setup.sls
@@ -98,7 +98,7 @@
 glusterfs_vol_{{ name }}_{{ key }}:
   cmd.run:
     - name: "gluster volume set '{{ name }}' '{{ key }}' '{{ value }}'"
-    - unless: "gluster volume info '{{ name }}' | grep '{{ key }}: {{ value }}'"
+    - unless: "gluster volume info '{{ name }}' | fgrep '{{ key }}: {{ value }}'"
     - require:
       {%- if force_compatibility %}
       - cmd: glusterfs_vol_{{ name }}