Fix heat-container-agent

* use fedora base image from fedora registry
* fix ADD and run script
* move package install in Dockerfile for layers
* add zaqarclient

Change-Id: Iaa82fcd7af25ec81e982e6b170aa1d449f6e1166

hot/software-config/heat-container-agent/Dockerfile

@@ -1,7 +1,17 @@
-FROM fedora
+FROM registry.fedoraproject.org/fedora:25
 MAINTAINER “Rabi Mishra” <ramishra@redhat.com>
 ENV container docker
 
+RUN dnf -y --setopt=tsflags=nodocs install \
+    findutils os-collect-config os-apply-config \
+    os-refresh-config dib-utils python-pip python-docker-py \
+    python-yaml python-zaqarclient && \
+    dnf clean all
+
+# pip installing dpath as python-dpath is an older version of dpath
+# install docker-compose
+RUN pip install --no-cache dpath docker-compose
+
 ADD ./scripts/55-heat-config \
   /opt/stack/os-config-refresh/configure.d/
 
@@ -15,8 +25,8 @@ ADD ./scripts/heat-config-notify \
   /usr/bin/heat-config-notify
 
 ADD ./scripts/configure_container_agent.sh /tmp/
-RUN chmod 700 /tmp/configure_container_agent.sh ; \
-  /tmp/configure_container_agent.sh
+RUN chmod 700 /tmp/configure_container_agent.sh
+RUN /tmp/configure_container_agent.sh
 
 #create volumes to share the host directories
 VOLUME [ "/var/lib/cloud"]

hot/software-config/heat-container-agent/scripts/configure_container_agent.sh

@@ -1,20 +1,6 @@
 #!/bin/bash
 set -eux
 
-dnf -y update
-
-dnf -y install findutils os-collect-config os-apply-config \
-  os-refresh-config dib-utils python-pip python-docker-py \
-  python-yaml
-
-dnf clean all
-
-# pip installing dpath as python-dpath is an older version of dpath
-pip install dpath
-
-# install docker-compose
-pip install docker-compose
-
 # os-apply-config templates directory
 oac_templates=/usr/libexec/os-apply-config/templates
 mkdir -p $oac_templates/etc