Merge pull request #29 from twiest/pr

made ops-ctl-haproxy work inside of the proxy container.

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

roles/docker_img_proxy/files/proxy_container/Dockerfile

@@ -7,7 +7,7 @@ MAINTAINER Thomas Wiest <twiest@redhat.com>
 RUN yum -y update ; yum clean all
 
 # Container Specific RPMs
-RUN yum -y install rhc-server-common httpd mod_security mod_ssl haproxy15 supervisor ruby ; yum clean all
+RUN yum -y install rsyslog rhc-server-common httpd mod_security mod_ssl haproxy15 supervisor ruby ruby193-ruby openshift-origin-util-scl ; yum clean all
 # this needs to be on it's own line, otherwise the libra_user group isn't setup properly yet
 RUN yum -y install rhc-site-static ; yum clean all
 
@@ -17,6 +17,9 @@ RUN yum -y install https://kojipkgs.fedoraproject.org//work/tasks/8506/7818506/s
 # Setup libra_user group with correct members
 RUN usermod -a -G libra_user apache
 
+# Setup libra_ops group for compatibility with host puppet
+RUN groupadd libra_ops
+
 # Setup ctr-ipc dir
 RUN ln -s /shared/var/run/ctr-ipc /var/run/ctr-ipc
 

roles/docker_img_proxy/files/proxy_container/start.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo _
-for shared_dir in /etc/haproxy /etc/pki /etc/httpd /var/lib/haproxy
+for shared_dir in /etc/haproxy /etc/pki /etc/httpd /var/lib/haproxy /usr/local/bin /usr/local/lib
 do
   echo "Setting up /shared${shared_dir}..."
   rm -rf $shared_dir
@@ -27,5 +27,9 @@ echo "Fixing symlink /etc/httpd/run..."
 ln -sf /var/run/httpd /shared/etc/httpd/run
 echo _
 
+echo "Starting rsyslog service..."
+service rsyslog start
+echo _
+
 echo "Starting supervisord"
 exec /usr/bin/supervisord