Gate fix: httpd image, elasticsearch, openstack-exporter

There was a change in the upstream reference httpd image for
apache that changed how modules were built for apache.
This change adds the required fix to accomodate the change.
See isssue here docker-library/httpd#87

The Elasticsearch image tag was updated to accomodate the kernel
versions used in the gate as part of the kernel update playbook
See elastic/elasticsearch#28349 (comment)

The openstack-exporter binary was changed to reflect changes made
to the openstack-exporter image

Change-Id: I1deb9e7cde794421dd33fade566c2a9fdb5007e6

elasticsearch/templates/etc/_httpd.conf.tpl

@@ -43,6 +43,7 @@ Listen 80
 # Example:
 # LoadModule foo_module modules/mod_foo.so
 #
+LoadModule mpm_event_module modules/mod_mpm_event.so
 LoadModule authn_file_module modules/mod_authn_file.so
 LoadModule authn_core_module modules/mod_authn_core.so
 LoadModule authz_host_module modules/mod_authz_host.so

elasticsearch/values.yaml

@@ -21,7 +21,7 @@ images:
  apache_proxy: docker.io/httpd:2.4
  memory_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
  curator: docker.io/bobrik/curator:5.2.0
- elasticsearch: docker.io/elasticsearch:5.4.2
+ elasticsearch: docker.io/elasticsearch:5.6.4
  helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
  dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
  snapshot_repository: docker.io/kolla/ubuntu-source-heat-engine:3.0.3

kibana/templates/etc/_httpd.conf.tpl

@@ -43,6 +43,7 @@ Listen 80
 # Example:
 # LoadModule foo_module modules/mod_foo.so
 #
+LoadModule mpm_event_module modules/mod_mpm_event.so
 LoadModule authn_file_module modules/mod_authn_file.so
 LoadModule authn_core_module modules/mod_authn_core.so
 LoadModule authz_host_module modules/mod_authz_host.so

prometheus-openstack-exporter/templates/bin/_prometheus-openstack-exporter.sh.tpl

@@ -20,7 +20,7 @@ set -ex
 COMMAND="${@:-start}"
 
 function start () {
- exec python /usr/local/bin/prometheus_openstack_exporter/exporter.py
+ exec python /usr/local/bin/exporter/main.py
 }
 
 function stop () {

tools/gate/chart-deploys/default.yaml

@@ -35,7 +35,7 @@ chart_groups:
  - prometheus_openstack_exporter
 
  - name: openstack_infra_logging
- timeout: 600
+ timeout: 1200
  charts:
  - openstack_elasticsearch
  - fluent_logging
@@ -192,7 +192,7 @@ charts:
  chart_name: elasticsearch
  release: elasticsearch
  namespace: openstack
- timeout: 300
+ timeout: 600
  test:
  enabled: true
  timeout: 600
@@ -208,10 +208,10 @@ charts:
  chart_name: fluent-logging
  release: fluent-logging
  namespace: openstack
- timeout: 300
+ timeout: 600
  test:
  enabled: true
- timeout: 300
+ timeout: 600
  output: false
 
  kibana: