Return of heat-docker package

 * add heat-docker resource package back

Change-Id: I9bd0896c67ca8fce8fdb5a1e95d7464b310c0e58

diff --git a/centos7/rpm/SPECS/openstack-heat.spec b/centos7/rpm/SPECS/openstack-heat.spec
index aff6abad306c28d8c21492d8a4468fca5667679b..0e4dbd8f6b1d117a2a1fec5a81914c7cf9c61c4b 100644 (file)
--- a/centos7/rpm/SPECS/openstack-heat.spec
+++ b/centos7/rpm/SPECS/openstack-heat.spec
@@ -6,7 +6,7 @@ Summary:        OpenStack Orchestration (heat)
 # https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z
 Epoch:         1
 Version:       5.0.0.0rc1
-Release:       1%{?dist}~mos8.0.1
+Release:       1%{?dist}~mos8.0.2
 License:       ASL 2.0
 URL:           http://www.openstack.org
 Source0:       http://tarballs.openstack.org/heat/heat-master.tar.gz
@@ -116,6 +116,11 @@ install -p -D -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/openstack-heat-api-cfn.s
 install -p -D -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/openstack-heat-engine.service
 install -p -D -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/openstack-heat-api-cloudwatch.service
 
+#docker resource
+mkdir -p %{buildroot}/usr/lib/heat/docker
+cp -vr contrib/heat_docker/heat_docker/* %{buildroot}/usr/lib/heat/docker/
+find %{buildroot}/usr/lib/heat/docker/ -type f -name "*.py[co]" -delete
+
 mkdir -p %{buildroot}/var/lib/heat/
 mkdir -p %{buildroot}/etc/heat/
 
@@ -255,6 +260,19 @@ useradd --uid 187 -r -g heat -d %{_sharedstatedir}/heat -s /sbin/nologin \
 -c "OpenStack Heat Daemons" heat
 exit 0
 
+# docker resource
+%package docker
+Summary: The Heat Docker resource
+Group: System Environment/Base
+Requires: python-docker-py >= 1.3
+Requires: %{name}-engine = %{epoch}:%{version}-%{release}
+
+%description docker
+OpenStack HEAT docker resource for managing docker instances on OpenStack
+
+%files docker
+/usr/lib/heat/docker
+
 %package engine
 Summary: The Heat engine
 

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 73165767fe53f544ca41550a053f6769dfea6b6f..bb6a896ffd23cf949b157f134133f8d043865e57 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -240,7 +240,7 @@ case $package in
             echo "Something went wrong! Log file have trace errors! Check logs"
             RES=1
         else
-            docker_regitered=$(grep -c 'Registering DockerInc::Docker::Container' $log_file)
+            docker_regitered=$(grep -c 'DockerInc::Docker::Container' $log_file)
             if [ "$docker_regitered" -eq "0" ]
             then
                 echo "Heat Docker: engine can't load docker resource"