From a2422bfb605b45125ce7ef153abf02cc975eba94 Mon Sep 17 00:00:00 2001
From: Yuri Vysotskiy <yuri.vysotskiy@gmail.com>
Date: Thu, 8 Oct 2015 11:44:27 +0300
Subject: [PATCH] Added additional ini file search path into
 contrib/inventory/zabbix.py

---
 contrib/inventory/zabbix.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/inventory/zabbix.py b/contrib/inventory/zabbix.py
index 9b4d81c309a..28b643bca63 100755
--- a/contrib/inventory/zabbix.py
+++ b/contrib/inventory/zabbix.py
@@ -52,7 +52,11 @@ class ZabbixInventory(object):
 
     def read_settings(self):
         config = ConfigParser.SafeConfigParser()
-        config.read(os.path.dirname(os.path.realpath(__file__)) + '/zabbix.ini')
+        conf_path = './zabbix.ini'
+        if not os.path.exists(conf_path):
+	        conf_path = os.path.dirname(os.path.realpath(__file__)) + '/zabbix.ini'
+        if os.path.exists(conf_path):
+	        config.read(conf_path)
         # server
         if config.has_option('zabbix', 'server'):
             self.zabbix_server = config.get('zabbix', 'server')