3 files changed, 62 insertions, 9 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2
index 422ecefc1..b279a4c0b 100644
--- a/docker/ceilometer/ceilometer-api/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2
@@ -7,13 +7,55 @@ MAINTAINER {{ maintainer }}
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-        {% set ceilometer_api_packages = ['openstack-ceilometer-api'] %}
+        {% set ceilometer_api_packages = [
+            'openstack-ceilometer-api',
+            'httpd',
+            'mod_wsgi'
+        ] %}
+{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }}
+RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
     {% elif base_distro in ['ubuntu'] %}
-        {% set ceilometer_api_packages = ['ceilometer-api'] %}
+        {% set ceilometer_api_packages = [
+            'ceilometer-api',
+            'apache2',
+            'libapache2-mod-wsgi'
+        ] %}
+{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }}
+RUN echo > /etc/apache2/ports.conf
     {% endif %}
 
+
+{% elif install_type == 'source' %}
+
+    {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+
+        {% set ceilometer_api_packages = [
+                'httpd',
+                'mod_wsgi',
+                'gettext'
+        ] %}
+
 {{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }}
 
+{% block ceilometer_api_redhat_source_setup %}
+RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
+{% endblock %}
+
+    {% elif base_distro in ['ubuntu', 'debian'] %}
+
+        {% set ceilometer_api_packages = [
+                'apache2',
+                'libapache2-mod-wsgi',
+                'gettext'
+        ] %}
+
+{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }}
+
+{% block ceilometer_api_ubuntu_source_setup %}
+RUN echo > /etc/apache2/ports.conf
+{% endblock %}
+    {% endif %}
+
 {% endif %}
 
 COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start
@@ -22,5 +64,3 @@ RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start
 {% block ceilometer_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 {{ include_footer }}
-
-USER ceilometer
diff --git a/docker/ceilometer/ceilometer-api/extend_start.sh b/docker/ceilometer/ceilometer-api/extend_start.sh
index 0a8cb6b6f..7918a8605 100644
--- a/docker/ceilometer/ceilometer-api/extend_start.sh
+++ b/docker/ceilometer/ceilometer-api/extend_start.sh
@@ -3,7 +3,15 @@
 # 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
-    ceilometer-dbsync
+    sudo -H -u ceilometer ceilometer-upgrade --skip-gnocchi-resource-types
     sudo chown -R ceilometer: /var/lib/ceilometer/
     exit 0
 fi
+
+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
diff --git a/docker/ceilometer/ceilometer-base/extend_start.sh b/docker/ceilometer/ceilometer-base/extend_start.sh
index b6027cf6d..4d3fe6b61 100644
--- a/docker/ceilometer/ceilometer-base/extend_start.sh
+++ b/docker/ceilometer/ceilometer-base/extend_start.sh
@@ -1,10 +1,15 @@
 #!/bin/bash
 
-if [[ ! -d "/var/log/kolla/ceilometer" ]]; then
-    mkdir -p /var/log/kolla/ceilometer
+CEILOMETER_LOG_DIR=/var/log/kolla/ceilometer
+
+if [[ ! -d "${CEILOMETER_LOG_DIR}" ]]; then
+    mkdir -p "${CEILOMETER_LOG_DIR}"
+fi
+if [[ $(stat -c %U:%G "${CEILOMETER_LOG_DIR}") != "ceilometer:kolla" ]]; then
+    chown ceilometer:kolla "${CEILOMETER_LOG_DIR}"
 fi
-if [[ $(stat -c %a /var/log/kolla/ceilometer) != "755" ]]; then
-    chmod 755 /var/log/kolla/ceilometer
+if [[ $(stat -c %a "${CEILOMETER_LOG_DIR}") != "755" ]]; then
+    chmod 755 "${CEILOMETER_LOG_DIR}"
 fi
 
 . /usr/local/bin/kolla_ceilometer_extend_start