commit a54c549e6173acfb13a9f33bcaa92d8e36badab7
author mcp-jenkins <mcp-jenkins@mirantis.com> Sun Jul 30 20:02:43 2017 +0000
committer Gerrit Code Review <gerrit2@980ef0291b9e> Sun Jul 30 20:02:43 2017 +0000
tree a8181e46fa5cfa3bd8920e1ea64475977a3594f8
parent 1cc01ae0602b3ff3617c5398632dde24e6f1d317
parent efb19383bcd0a2db9304a3fc77d3ad7441f439fb

Merge "Fix glusterfs meta/sphinx.yml"

glusterfs/meta/sphinx.yml

diff --git a/glusterfs/meta/sphinx.yml b/glusterfs/meta/sphinx.yml
index 33782a2..55c0408 100644
--- a/glusterfs/meta/sphinx.yml
+++ b/glusterfs/meta/sphinx.yml
@@ -7,7 +7,7 @@
       name: server
       param:
         version:
-          value: "{{ salt['cmd.run']('gluster --version|head -1') }}"
+          value: "{{ salt['cmd.run']('gluster --version 2>/dev/null || echo "unknown"|head -1') }}"
         {%- if pillar.glusterfs.server.get('peers', []) %}
         peers:
           value: {{ pillar.glusterfs.server.peers|yaml }}