diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2
index ccb757c5bb82d5c9d973fb8d222e38c9ad7ed4ca..275be3aff2533ee8c938df2f5233444920daef5a 100644
--- a/docker/aodh/aodh-api/Dockerfile.j2
+++ b/docker/aodh/aodh-api/Dockerfile.j2
@@ -17,5 +17,3 @@ RUN chmod 755 /usr/local/bin/kolla_aodh_extend_start
{% block aodh_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }}
-
-USER aodh
diff --git a/docker/aodh/aodh-api/extend_start.sh b/docker/aodh/aodh-api/extend_start.sh
index 65349464cb76bc56c07339a3ff78ecbcd797e811..0826a46452ff1aebffe88c508361b3219ddf2451 100644
--- a/docker/aodh/aodh-api/extend_start.sh
+++ b/docker/aodh/aodh-api/extend_start.sh
@@ -1,8 +1,18 @@
#!/bin/bash
+# NOTE(pbourke): httpd will not clean up after itself in some cases which
+# results in the container not being able to restart. (bug #1489676, 1557036)
+if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
+ # Loading Apache2 ENV variables
+ . /etc/apache2/envvars
+ rm -rf /var/run/apache2/*
+else
+ rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
+fi
+
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
- aodh-manage db_sync
+ aodh-dbsync
exit 0
fi
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2
index effbf67ba62b5440c39d466ef0768212c5242e13..68d2c4a20030cf7f450623c95c0013e85111cf49 100644
--- a/docker/aodh/aodh-base/Dockerfile.j2
+++ b/docker/aodh/aodh-base/Dockerfile.j2
@@ -4,27 +4,81 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
+ {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
+
+ {% set aodh_base_packages = [
+ 'openstack-aodh-common',
+ 'python-aodhclient',
+ 'httpd',
+ 'mod_wsgi',
+ 'python-ldappool'
+ ] %}
-{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
- {% set aodh_base_packages = ['openstack-aodh-common'] %}
-{% elif base_distro in ['ubuntu'] %}
- {% set aodh_base_packages = ['aodh-common'] %}
-{% endif %}
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
+RUN mkdir -p /var/www/cgi-bin/aodh \
+ && cp -a /usr/lib/python2.7/site-packages/aodh/api/app.wsgi /var/www/cgi-bin/aodh/ \
+ && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
+ {% elif base_distro in ['ubuntu'] %}
+
+ {% set aodh_base_packages = [
+ 'aodh-common',
+ 'apache2',
+ 'libapache2-mod-wsgi',
+ 'python-ldappool'
+ ] %}
+{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
+RUN mkdir -p /var/www/cgi-bin/aodh \
+ && cp -a /usr/lib/python2.7/dist-packages/aodh/api/app.wsgi /var/www/cgi-bin/aodh/ \
+ && echo > /etc/apache2/ports.conf
+ {% endif %}
+
{% elif install_type == 'source' %}
+ {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
+
+ {% set aodh_base_packages = [
+ 'httpd',
+ 'mod_wsgi',
+ 'python-ldappool'
+ ] %}
+
+{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
+RUN mkdir -p /var/www/cgi-bin/aodh \
+ && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
+ {% elif base_distro in ['ubuntu', 'debian'] %}
+
+ {% set aodh_base_packages = [
+ 'apache2',
+ 'libapache2-mod-wsgi',
+ 'python-ldappool'
+ ] %}
+
+{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
+RUN mkdir -p /var/www/cgi-bin/aodh \
+ && echo > /etc/apache2/ports.conf
+ {% endif %}
ADD aodh-base-archive /aodh-base-source
+
RUN ln -s aodh-base-source/* aodh \
&& useradd --user-group aodh \
- && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /aodh \
- && mkdir -p /etc/aodh /var/log/aodh /home/aodh \
- && cp -r /aodh/etc/* /etc/aodh/ \
- && chown -R aodh: /etc/aodh /var/log/aodh /home/aodh
+ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt pymongo /aodh \
+ && mkdir -p /etc/aodh /var/log/kolla/aodh /var/www/cgi-bin/aodh /home/aodh \
+ && cp -r /aodh/etc/aodh/* /etc/aodh/ \
+ && cp /aodh/aodh/api/app.wsgi /var/www/cgi-bin/aodh \
+ && chown -R aodh: /etc/aodh /var/log/kolla/aodh /var/www/cgi-bin/aodh /home/aodh
{% endif %}
RUN usermod -a -G kolla aodh
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+COPY aodh_sudoers /etc/sudoers.d/kolla_aodh_sudoers
+
+RUN usermod -a -G kolla aodh \
+ && chmod 750 /etc/sudoers.d \
+ && chmod 640 /etc/sudoers.d/kolla_aodh_sudoers \
+ && chmod 755 /var/www/cgi-bin/aodh \
+ && touch /usr/local/bin/kolla_aodh_extend_start \
+ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_aodh_extend_start
{% block aodh_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/aodh/aodh-base/aodh_sudoers b/docker/aodh/aodh-base/aodh_sudoers
new file mode 100644
index 0000000000000000000000000000000000000000..2ec268c9dcd4f2269652c4a568a6cc5fd04b9a03
--- /dev/null
+++ b/docker/aodh/aodh-base/aodh_sudoers
@@ -0,0 +1 @@
+%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R aodh\: /var/lib/aodh/, /bin/chown -R aodh\: /var/lib/aodh/
diff --git a/docker/aodh/aodh-base/extend_start.sh b/docker/aodh/aodh-base/extend_start.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f3b1d2d49c9dc8b4917a5522d6f2d5e0b88045f4
--- /dev/null
+++ b/docker/aodh/aodh-base/extend_start.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Create log dir for Aodh logs
+AODH_LOG_DIR="/var/log/kolla/aodh"
+if [[ ! -d "${AODH_LOG_DIR}" ]]; then
+ mkdir -p ${AODH_LOG_DIR}
+fi
+if [[ $(stat -c %U:%G ${AODH_LOG_DIR}) != "aodh:kolla" ]]; then
+ chown aodh:kolla ${AODH_LOG_DIR}
+fi
+if [[ $(stat -c %a ${AODH_LOG_DIR}) != "755" ]]; then
+ chmod 755 ${AODH_LOG_DIR}
+fi
+
+. /usr/local/bin/kolla_aodh_extend_start