From 3ab68c3577b984f1d3f88ff4ab2f083b1e6018fb Mon Sep 17 00:00:00 2001 From: Igor Yozhikov Date: Fri, 30 Jan 2015 17:35:15 +0300 Subject: [PATCH] Update docker resource python script location * add python-docker as runtime requirement * docker resource add as additional package heat-docker * add tests for heat-docker * update requirements to requirements.txt versions Change-Id: Ifc1be30531e89c478f7c84d16c77dc2b8fbb2660 Related-Bug: #1404911 --- debian/changelog | 22 +++++++++++++++------- debian/control | 34 +++++++++++++++++++++++++--------- debian/heat-docker.dirs | 1 + debian/heat-docker.install | 1 + tests/runtests.sh | 25 +++++++++++++++++++++++++ 5 files changed, 67 insertions(+), 16 deletions(-) create mode 100644 debian/heat-docker.dirs create mode 100644 debian/heat-docker.install diff --git a/debian/changelog b/debian/changelog index ad81001a..24d90c64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +heat (2015.1.b0) trusty; urgency=medium + + * update from global requirements + * add heat-docker package + + -- Igor Yozhikov Fri, 30 Jan 2015 17:33:23 +0300 + + heat (2014.2.1) trusty; urgency=medium Update from global requirements @@ -41,7 +49,7 @@ heat (2014.1-0ubuntu1) trusty; urgency=medium [ Chuck Short ] * New upstream release. (LP: #1299055) * debian/heat-common.postinst: Create directory before changing - permissions. (LP: #1267557) + permissions. (LP: #1267557) [ Corey Bryant ] * New upstream release (LP: #1299055). @@ -50,7 +58,7 @@ heat (2014.1-0ubuntu1) trusty; urgency=medium heat (2014.1~rc2-0ubuntu3) trusty; urgency=medium - * debian/heat-common.postinst: Fix failing autopkg test. + * debian/heat-common.postinst: Fix failing autopkg test. -- Chuck Short Mon, 14 Apr 2014 13:36:05 -0400 @@ -116,7 +124,7 @@ heat (2014.1~b2-0ubuntu1) trusty; urgency=low heat (2014.1~b1-0ubuntu2) trusty; urgency=low * debian/patches/default-sqlite.patch: Update default sqlite path to - fix heat-engine install failures. + fix heat-engine install failures. -- James Page Fri, 06 Dec 2013 11:26:25 +0000 @@ -179,14 +187,14 @@ heat (2013.2~b3-0ubuntu1) saucy; urgency=low heat (2013.2~b2.a186.g2b4b248-0ubuntu2) saucy; urgency=low * d/rules: Limit test execution concurrency to 1 to avoid test failures - in buildds. + in buildds. -- James Page Thu, 08 Aug 2013 15:42:32 +0100 heat (2013.2~b2.a186.g2b4b248-0ubuntu1) saucy; urgency=low [ Chuck Short ] - * debian/patches/rename-quantumclient.patch: Dropped no longer needed. + * debian/patches/rename-quantumclient.patch: Dropped no longer needed. * debian/control: Add python-oslo.sphinx [ James Page ] @@ -224,7 +232,7 @@ heat (2013.2~b2-0ubuntu3) saucy; urgency=low * Resynchronize with debian, remaining changes: - Add sqlite3 to heat-common depends to fix an autopkgtest failure. - - Add autopkg tests. + - Add autopkg tests. - Pass the testsuite if it fails. -- Chuck Short Wed, 07 Aug 2013 10:36:33 -0400 @@ -232,7 +240,7 @@ heat (2013.2~b2-0ubuntu3) saucy; urgency=low heat (2013.2~b2-0ubuntu2) saucy; urgency=low * debian/control: Add sqlite3 to heat-common depends to fix - an autopkgtest failure. + an autopkgtest failure. -- Chuck Short Tue, 06 Aug 2013 15:36:33 +0000 diff --git a/debian/control b/debian/control index 0ab5da08..b7e2c1b1 100644 --- a/debian/control +++ b/debian/control @@ -75,7 +75,7 @@ Architecture: all Depends: python-argparse, python-babel (>= 1.3), - python-eventlet (>= 0.15.2), + python-eventlet (>= 0.16.1), python-greenlet (>= 0.3.2), python-httplib2 (>= 0.7.5), python-iso8601 (>= 0.1.9), @@ -83,13 +83,14 @@ Depends: python-kombu (>= 2.5.0), python-lxml (>= 2.3), python-netaddr (>= 0.7.12), - python-oslo.config (>= 1.4.0), - python-oslo.i18n (>= 1.0.0), + python-oslo.config (>= 1.6.0), + python-oslo.context (>= 0.1.0), + python-oslo.i18n (>= 1.3.0), python-oslo.messaging (>= 1.4.0), python-oslo.messaging (<< 1.5.0) | python-oslo.messaging (>> 1.5.0), - python-oslo.db (>= 1.1.0), - python-oslo.middleware (>= 0.1.0), - python-oslo.serialization (>= 1.0.0), - python-oslo.utils (>= 1.0.0), + python-oslo.db (>= 1.4.0), + python-oslo.middleware (>= 0.3.0), + python-oslo.serialization (>= 1.2.0), + python-oslo.utils (>= 1.2.0), python-osprofiler (>= 0.3.0), python-pastedeploy (>= 1.5.0), python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), @@ -97,9 +98,9 @@ Depends: python-crypto (>= 2.6), python-ceilometerclient (>= 1.0.6), python-cinderclient (>= 1.1.0), - python-glanceclient (>= 0.14.0), + python-glanceclient (>= 0.15.0), python-heatclient (>= 0.2.9), - python-keystoneclient (>= 1:0.11.1), + python-keystoneclient (>= 1:1.0.0), python-neutronclient (>= 1:2.3.6), python-novaclient (>= 1:2.18.0), python-saharaclient (>= 0.7.6), @@ -143,6 +144,21 @@ Description: OpenStack orchestration service - common files . This package contains the common files. +Package: heat-docker +Architecture: all +Depends: + python-docker (>= 0.7.0), + heat-engine (=${binary:Version}), + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends} +Description: OpenStack orchestration service docker resource + Heat is a service to orchestrate multiple composite cloud applications using + templates, through both an OpenStack-native ReST API and a + CloudFormation-compatible Query API. + . + This package contains the heat engine docker resource. + Package: heat-engine Architecture: all Depends: diff --git a/debian/heat-docker.dirs b/debian/heat-docker.dirs new file mode 100644 index 00000000..aee75347 --- /dev/null +++ b/debian/heat-docker.dirs @@ -0,0 +1 @@ +/usr/lib/heat/docker diff --git a/debian/heat-docker.install b/debian/heat-docker.install new file mode 100644 index 00000000..16f88330 --- /dev/null +++ b/debian/heat-docker.install @@ -0,0 +1 @@ +contrib/heat_docker/heat_docker/* /usr/lib/heat/docker diff --git a/tests/runtests.sh b/tests/runtests.sh index a44db8ba..4831c904 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -108,6 +108,31 @@ case $package in fi fi ;; + heat-docker|openstack-heat-docker) + prepare_vm + screen -dmS heat-engine + sleep 2 + echo "Starting Heat Engine with docker resource..." + screen -S heat-engine -p 0 -X stuff "heat-engine --config-file $conf_file -d --log-file /tmp/heat-engine.log 2>>/tmp/heat-engine.log +" + sleep 5 + cat /tmp/heat-engine.log + trace_count=$(grep -ic Traceback /tmp/heat-engine.log) + if [ "$trace_count" -ne "0" ] + then + echo "Something went wrong! Log file have trace errors! Check logs" + RES=1 + else + docker_regitered=$(grep -c 'Registering DockerInc::Docker::Container' /tmp/heat-engine.log) + if [ "$docker_regitered" -eq "0" ] + then + echo "Heat Docker: engine can't load docker resource" + RES=1 + else + echo "Heat Docker: engine loaded docker resource successfully" + fi + fi + ;; heat-api-cfn|openstack-heat-api-cfn) prepare_vm screen -dmS heat-api-cfn -- 2.45.2