Merge pull request #12679 from yfix/devel

zabbix.py: Added additional ini file search path

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')