summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@redhat.com>2014-11-11 16:52:12 -0500
committerThomas Wiest <twiest@redhat.com>2014-11-11 16:52:12 -0500
commit543d5bcd4207268bd8d529cea6628614ea20da67 (patch)
tree49a003f5b103dfe5a4f3216075b9b543fb9683d4
parent1d5ea59b5ceb028ec03eb2b66ae3e1aafe1b0ca9 (diff)
downloadopenshift-543d5bcd4207268bd8d529cea6628614ea20da67.tar.gz
openshift-543d5bcd4207268bd8d529cea6628614ea20da67.tar.bz2
openshift-543d5bcd4207268bd8d529cea6628614ea20da67.tar.xz
openshift-543d5bcd4207268bd8d529cea6628614ea20da67.zip
removed zbxapi workaround as it's no longer needed
-rw-r--r--roles/docker_img_monitoring/files/monitoring_container/Dockerfile4
1 files changed, 0 insertions, 4 deletions
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