From 543d5bcd4207268bd8d529cea6628614ea20da67 Mon Sep 17 00:00:00 2001 From: Thomas Wiest Date: Tue, 11 Nov 2014 16:52:12 -0500 Subject: removed zbxapi workaround as it's no longer needed --- roles/docker_img_monitoring/files/monitoring_container/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'roles/docker_img_monitoring/files/monitoring_container/Dockerfile') diff --git a/roles/docker_img_monitoring/files/monitoring_container/Dockerfile b/roles/docker_img_monitoring/files/monitoring_container/Dockerfile index cd1651bc1..14e7f8650 100644 --- a/roles/docker_img_monitoring/files/monitoring_container/Dockerfile +++ b/roles/docker_img_monitoring/files/monitoring_container/Dockerfile @@ -12,10 +12,6 @@ RUN yum -y install ruby193-rubygem-zbxapi cronie zabbix-sender ruby openshift-or # Setup ctr-ipc dir RUN ln -s /shared/var/run/ctr-ipc /var/run/ctr-ipc -# TEMP WORKAROUND: until zbxapi rpm is updated to work with zbx 2.4 -RUN ruby -i -ane 'if $_ =~ /APIInfo.version/ ; puts " @major,@minor=2,0" ; else puts $_ ; end' /opt/rh/ruby193/root/usr/share/gems/gems/zbxapi-0.3.3/zbxapi.rb - - # Container specific files ADD start.rb /start.rb ADD register-with-zabbix.rb /register-with-zabbix.rb -- cgit v1.2.3