commit 06917adaed6f5ee1d030812b7543098242c100f4
author Dennis Dmitriev <ddmitriev@mirantis.com> Mon Jul 10 18:24:19 2017 +0300
committer Dennis Dmitriev <ddmitriev@mirantis.com> Mon Jul 10 18:25:44 2017 +0300
tree b3d33b65a2238b0808220af737df05908b74699b
parent 0c5d258fca7d25ceafa080b2a08157401a85c9f4

Remove mock_bin for haproxy binary

Change-Id: I4b8d0b958978e83c40f144695975f52859201048

haproxy/meta/sphinx.yml

diff --git a/haproxy/meta/sphinx.yml b/haproxy/meta/sphinx.yml
index 61d61d1..2416021 100644
--- a/haproxy/meta/sphinx.yml
+++ b/haproxy/meta/sphinx.yml
@@ -7,7 +7,7 @@
       name: proxy
       param:
         version:
-          value: "{{ salt['cmd.run']('haproxy -v')|replace("HA-Proxy version ", '') }}"
+          value: "{{ salt['cmd.run']('haproxy -v 2>/dev/null || echo "unknown"')|replace("HA-Proxy version ", '') }}"
       endpoint:
         {%- for listen_name, listen in proxy.get('listen', {}).iteritems() %}
         {%- if listen.binds.0.address not in ["127.0.0.1", "localhost", "::1"] %}

tests/mock_bin/haproxy

diff --git a/tests/mock_bin/haproxy b/tests/mock_bin/haproxy
deleted file mode 100755
index 6b0ff14..0000000
--- a/tests/mock_bin/haproxy
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-# Mock for `haproxy -v`
-
-echo "HA-Proxy version 1.6.3 2015/12/25
-Copyright 2000-2015 Willy Tarreau <willy@haproxy.org>"