Merge "Fix aodh dockerfile"

docker/aodh/aodh-base/Dockerfile.j2

@@ -12,7 +12,6 @@ MAINTAINER {{ maintainer }}
 
        {% set aodh_base_packages = [
             'openstack-aodh-common',
-            'python-aodhclient',
             'httpd',
             'mod_wsgi',
             'python-ldappool'
@@ -66,10 +65,10 @@ ADD aodh-base-archive /aodh-base-source
 
 RUN ln -s aodh-base-source/* 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 \
+    && mkdir -p /etc/aodh /var/www/cgi-bin/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
+    && chown -R aodh: /etc/aodh /var/www/cgi-bin/aodh
 
 {% endif %}
 

docker/openstack-base/Dockerfile.j2

@@ -74,6 +74,7 @@ MAINTAINER {{ maintainer }}
             'python-alembic',
             'python-amqp',
             'python-anyjson',
+            'python-aodhclient',
             'python-barbicanclient',
             'python-beaker',
             'python-cachetools',
@@ -163,6 +164,7 @@ MAINTAINER {{ maintainer }}
 # This will prevent questions from being asked during the install
 ENV DEBIAN_FRONTEND noninteractive
         {% set openstack_base_packages = [
+            'python-aodhclient',
             'python-barbicanclient',
             'python-ceilometerclient',
             'python-congressclient',
@@ -249,6 +251,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
         'alembic',
         'amqp',
         'anyjson',
+        'aodhclient',
         'appdirs',
         'cachetools',
         'cliff',