Merge "Fix the heat-container-agent docker image"

magnum/drivers/common/image/heat-container-agent/Dockerfile

@@ -12,14 +12,24 @@ LABEL name="heat-container-agent" \
       distribution-scope="public"
 
 RUN dnf -y --setopt=tsflags=nodocs install \
-    findutils os-collect-config os-apply-config \
+        bash \
-    os-refresh-config dib-utils python-pip python-docker-py \
+        findutils \
-    python-yaml python-zaqarclient python2-oslo-log \
+        gcc \
-    python-psutil kubernetes-client && dnf clean all
+        kubernetes-client \
-
+        python-devel \
-# pip installing dpath as python-dpath is an older version of dpath
+        python-pip \
-# install docker-compose
+        python-psutil \
-RUN pip install --no-cache dpath docker-compose
+        redhat-rpm-config && \
+    pip install --no-cache --no-cache-dir \
+        dib-utils \
+        dpath \
+        os-apply-config \
+        os-collect-config \
+        os-refresh-config \
+        python-heatclient \
+        python-keystoneclient && \
+    dnf remove -y gcc redhat-rpm-config -y && \
+    dnf clean all
 
 ADD ./scripts/55-heat-config \
   /opt/heat-container-agent/scripts/

magnum/drivers/common/image/heat-container-agent/scripts/heat-config-notify

@@ -124,7 +124,7 @@ def main(argv=sys.argv, stdin=sys.stdin):
             project_id=iv['deploy_project_id'])
         endpoint = ks.service_catalog.url_for(
             service_type='messaging', endpoint_type='publicURL',
-            region_name=iv.get('deploy_region_name')
+            region_name=iv.get('deploy_region_name'))
 
         conf = {
             'auth_opts': {