+++ /dev/null
-heat (2015.1.b0) trusty; urgency=medium
-
- * update from global requirements
- * add heat-docker package
-
- -- Igor Yozhikov <iyozhikov@mirantis.com> Fri, 30 Jan 2015 17:33:23 +0300
-
-
-heat (2014.2.1) trusty; urgency=medium
-
- Update from global requirements
-
- -- Denis Egorenko <degorenko@mirantis.com> Mon, 08 Dec 2014 13:33:23 +0000
-
-heat (2014.2.b3-0ubuntu1) trusty; urgency=medium
-
- * update for global requirements
- * fix init script (explicitly setting config file)
-
- -- Denis Egorenko <degorenko@mirantis.com> Wed, 17 Sep 2014 19:46:19 +0400
-
-heat (2014.2~b1-0ubuntu1) trusty; urgency=medium
-
- * updated for LP BP build from master
-
- -- Igor Yozhikov <iyozhikov@mirantis.com> Fri, 4 Jul 2014 12:39:05 +0400
-
-heat (2014.1.1-0ubuntu1) trusty; urgency=medium
-
- * Resynchronize with stable/icehouse (27557c9) (LP: #1328134):
- - [368b6d3] Avoid redundant polling of DB for metadata
- - [0f92683] Fix failed to delete the NovaFloatingIPAssociation resource
- - [930cb3c] Fix status reason in events for deployment signals
- - [4b9ff4f] Truncate status_reason to column length
- - [3c560c6] Catch NotFound for keystone delete operations
- - [e63baf6] Using correct attribute of exception
- - [08154b0] Allow NotFound to be created without args
- - [857ca78] Updated from global requirements
- - [03dd894] Don't dynamically create provider types in the global env
- - [937ac5a] Ignore nova limits set to '-1'
- - [27557c9] Don't pass enable_snat by default in Router
- * d/p/fix-requirements.patch: Drop minimum version of six to align to Ubuntu
- 14.04 version.
-
- -- Corey Bryant <corey.bryant@canonical.com> Mon, 09 Jun 2014 15:09:49 -0400
-
-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)
-
- [ Corey Bryant ]
- * New upstream release (LP: #1299055).
-
- -- Chuck Short <zulcss@ubuntu.com> Thu, 17 Apr 2014 07:27:41 -0400
-
-heat (2014.1~rc2-0ubuntu3) trusty; urgency=medium
-
- * debian/heat-common.postinst: Fix failing autopkg test.
-
- -- Chuck Short <zulcss@ubuntu.com> Mon, 14 Apr 2014 13:36:05 -0400
-
-heat (2014.1~rc2-0ubuntu2) trusty; urgency=medium
-
- * Fix up packaging based on Ubuntu Security Team review (LP: #1267557):
- - debian/control: Drop python-sendfile since it is no longer
- needed.
- - debian/heat-common.install: Correct permissions of /etc/heat.
- - debian/patches/sudoers_patch.patch: Change the directory location
- for the sudoers so that it users the standard /etc/sudoers.d
- directory.
-
- -- Chuck Short <zulcss@ubuntu.com> Fri, 11 Apr 2014 15:25:44 -0400
-
-heat (2014.1~rc2-0ubuntu1) trusty; urgency=medium
-
- * New upstream release candidate (LP: #1299055).
- * debian/patches/fix-requirements.patch: Don't install
- python-qpid since we use python-kombu by default (LP: #1296912).
-
- -- Chuck Short <zulcss@ubuntu.com> Thu, 10 Apr 2014 08:51:46 -0400
-
-heat (2014.1~rc1-0ubuntu1) trusty; urgency=medium
-
- * New upstream release (LP: #1299055)
- * debian/patches/use-oslo.sphinx-namespace.patch: Dropped no longer
- needed.
- * debian/control: Rename python-oslo.sphinx to python-oslosphinx.
-
- -- Chuck Short <zulcss@ubuntu.com> Mon, 31 Mar 2014 21:36:06 -0400
-
-heat (2014.1~b3-0ubuntu1) trusty; urgency=medium
-
- [ Chuck Short ]
- * New upstream release.
- * debian/patches/adjust-dependencies.patch: Dropped no longer needed.
- * debian/control: Add python-troveclient.
- * debian/rules: fail to build if testsuite fails.
- * debian/patches/use-oslo.sphinx-namespace.patch: Use oslo.sphinx namespace.
-
- [ Adam Gandelman ]
- * debian/heat-engine.install: Install /etc/heat/environment.d/*.
- (LP: #1285875).
-
- -- Chuck Short <zulcss@ubuntu.com> Thu, 06 Mar 2014 17:18:51 -0500
-
-heat (2014.1~b2-0ubuntu1) trusty; urgency=low
-
- [ James Page ]
- * d/p/*: Refreshed.
-
- [ Yolanda Robla ]
- * debian/control: Added lockfile to build depends
-
- [ Chuck Short ]
- * debian/patches/adjust-dependencies: Adjust Ubuntu dependencies.
- * debian/patches/skip-tests.patch: Skip failing tests on buildds.
- * debian/rules: Add pythonpath for tests.
-
- -- Chuck Short <zulcss@ubuntu.com> Thu, 23 Jan 2014 15:28:54 -0500
-
-heat (2014.1~b1-0ubuntu2) trusty; urgency=low
-
- * debian/patches/default-sqlite.patch: Update default sqlite path to
- fix heat-engine install failures.
-
- -- James Page <james.page@ubuntu.com> Fri, 06 Dec 2013 11:26:25 +0000
-
-heat (2014.1~b1-0ubuntu1) trusty; urgency=low
-
- [ Chuck Short ]
- * New upstream release.
- * debian/control:
- + Open icehouse release.
- + Dropped python-argparse, python-qpid, python-noseexcover,
- python-nose, and python-pycryptopp
- + Add versioned depends for python-pbr.
- + Add python-testscenarios as a build dependency.
- * debian/patches/default-sqlite.patch: Dropped no longer needed.
-
- [ Yolanda Robla ]
- * debian/control: Added python-heatclient as a build dependency.
-
- -- Chuck Short <zulcss@ubuntu.com> Thu, 05 Dec 2013 21:17:37 -0500
-
-heat (2013.2-0ubuntu1) saucy; urgency=low
-
- * New upstream release (LP: #1236462).
-
- -- Chuck Short <zulcss@ubuntu.com> Thu, 17 Oct 2013 09:30:24 -0400
-
-heat (2013.2~rc2-0ubuntu1) saucy; urgency=low
-
- * New upstream release candidate (LP: #1239156).
-
- -- James Page <james.page@ubuntu.com> Sat, 12 Oct 2013 16:53:03 +0100
-
-heat (2013.2~rc1-0ubuntu1) saucy; urgency=low
-
- * New upstream release.
- * debian/control: Dropped python-d2to1 build dependency.
-
- -- Chuck Short <zulcss@ubuntu.com> Thu, 03 Oct 2013 09:43:04 -0400
-
-heat (2013.2~b3-0ubuntu1) saucy; urgency=low
-
- [ Chuck Short ]
- * New upstream release.
- * debian/control: Add python-netaddr as build-dep.
- * debian/heat-common.install: Remove heat-boto and associated man-page
- * debian/heat-common.install: Remove heat-cfn and associated man-page
- * debian/heat-common.install: Remove heat-watch and associated man-page
- * debian/patches/fix-sqlalchemy-0.8.patch: Dropped
-
- [ Adam Gandelman ]
- * debian/patches/default-kombu.patch: Dropped.
- * debian/patches/default-sqlite.patch: Refreshed.
- * debian/*.install, rules: Install heat.conf.sample as common
- config file in heat-common. Drop other per-package configs, they
- are no longer used.
- * debian/rules: Clean pbr .egg from build dir if it exists.
-
- -- Chuck Short <zulcss@ubuntu.com> Mon, 09 Sep 2013 13:10:26 -0400
-
-heat (2013.2~b2.a186.g2b4b248-0ubuntu2) saucy; urgency=low
-
- * d/rules: Limit test execution concurrency to 1 to avoid test failures
- in buildds.
-
- -- James Page <james.page@ubuntu.com> 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/control: Add python-oslo.sphinx
-
- [ James Page ]
- * New upstream snapshot.
- * d/watch: Updated to track releases on launchpad.
- * d/control: Drop BD in pep8, no longer required.
- * d/control,rules: Drop use of openstack-pkg-tools, revert use of xz
- compression for debs.
- * d/control,*.config,*.templates,po: Drop use of debconf/dbconfig-common
- to configure heat.
- * d/*.upstart: Add upstart configurations for Ubuntu.
- * d/p/default-kombu.patch: Switch default messaging from qpid to
- kombu.
- * d/p/default-sqlite.patch: Use sqlite as default database option.
- * d/control: Add python-ceilometerclient to BD's.
- * d/rules: Fail package build for unit test failures.
- * d/*.install: Directly install configuration files to /etc/heat.
- * d/control: Update VCS locations to ubuntu-server-dev branches.
- * d/heat-common.{install,manpages}: Include new binaries and associated
- manpages.
-
- -- James Page <james.page@ubuntu.com> Thu, 08 Aug 2013 15:23:59 +0100
-
-heat (2013.2~b2-0ubuntu4) saucy; urgency=low
-
- [ Chuck Short ]
- * debian/rules: Enable testsuite during builds.
- * debian/patches/fix-sqlalchemy-0.8.patch: Build against sqlalchemy 0.8.
- * debian/patches/rename-quantumclient.patch: quantumclient -> neutronclient.
-
- -- Chuck Short <zulcss@ubuntu.com> Thu, 08 Aug 2013 01:08:42 +0000
-
-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.
- - Pass the testsuite if it fails.
-
- -- Chuck Short <zulcss@ubuntu.com> Wed, 07 Aug 2013 10:36:33 -0400
-
-heat (2013.2~b2-0ubuntu2) saucy; urgency=low
-
- * debian/control: Add sqlite3 to heat-common depends to fix
- an autopkgtest failure.
-
- -- Chuck Short <zulcss@ubuntu.com> Tue, 06 Aug 2013 15:36:33 +0000
-
-heat (2013.2~b2-0ubuntu1) saucy; urgency=low
-
- [ Yolanda Robla ]
- * debian/tests: added autopkg tests
-
- [ Chuck Short ]
- * New upstream release
- * debian/control:
- - Add python-pbr to build-depends.
- - Add python-d2to to build-depends.
- - Dropped python-argparse.
- - Add python-six to build-depends.
- - Dropped python-sendfile.
- - Dropped python-nose.
- - Added testrepository.
- - Added python-testtools.
- * debian/rules: Run testrepository instead of nosetets.
- * debian/patches/removes-lxml-version-limitation-from-pip-requires.patch: Dropped
- no longer needed.
- * debian/patches/fix-package-version-detection-when-building-doc.patch: Dropped
- no longer needed.
-
- -- Chuck Short <zulcss@ubuntu.com> Mon, 22 Jul 2013 16:22:29 -0400
-
-heat (2013.1-4) unstable; urgency=low
-
- * Fixed the dbsync to the new thing upstream is using (it was crashing the
- postinst).
- * Fixed the prerm script of heat-engine that was calling dbc_go heat instead
- of dbc_go heat-engine.
- * Added missing dependency: python-mysqldb.
-
- -- Thomas Goirand <zigo@debian.org> Wed, 22 May 2013 23:57:49 +0800
-
-heat (2013.1-3) unstable; urgency=low
-
- * Added missing dbconfig-common depends (Closes: #709126). Thanks to Andrea
- Beckmann for the bug report.
-
- -- Thomas Goirand <zigo@debian.org> Tue, 21 May 2013 12:38:11 +0800
-
-heat (2013.1-2) unstable; urgency=low
-
- * Uploading to unstable.
- * Removes the <=2.3.5 from python-lxml requirements.
- * Fix package version detection when building docs.
- * Cleans doc/build on the clean target.
-
- -- Thomas Goirand <zigo@debian.org> Thu, 16 May 2013 13:15:54 +0000
-
-heat (2013.1-1) experimental; urgency=low
-
- * Initial release (Closes: #695302).
-
- -- Thomas Goirand <zigo@debian.org> Mon, 04 Feb 2013 21:56:59 +0800
+++ /dev/null
-[DEFAULT]
-upstream-branch = master
-debian-branch = debian/havana
-upstream-tag = %(version)s
-compression = xz
-
-[git-buildpackage]
-export-dir = ../build-area/
-#cleaner = true
+++ /dev/null
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: heat-api-cfn
-# Required-Start: $network $local_fs $remote_fs $syslog
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Heat CFN API
-# Description: Heat CFN API server
-### END INIT INFO
-
-# Author: Thomas Goirand <zigo@debian.or>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Heat API"
-NAME=heat-api-cfn
-DAEMON=/usr/bin/heat-api-cfn
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-SYSTEM_USER=heat
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-. /lib/lsb/init-functions
-
-if [ ! -e /var/log/heat ] ; then
- mkdir -p /var/log/heat
- chown ${SYSTEM_USER} /var/log/heat
-fi
-
-do_start () {
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON || return 2
-}
-
-do_stop () {
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
- RETVAL="$?"
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- restart|force-reload)
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
+++ /dev/null
-/var/log/heat/api-cfn.log {
- daily
- missingok
-}
+++ /dev/null
-# vim: set ft=upstart ts=2 et:
-description "Heat API CFN server"
-author "James Page <james.page@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-exec start-stop-daemon --start --chuid heat --exec /usr/bin/heat-api-cfn
+++ /dev/null
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: heat-api-cloudwatch
-# Required-Start: $network $local_fs $remote_fs $syslog
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Heat cloudwatch API
-# Description: Heat cloudwatch API server
-### END INIT INFO
-
-# Author: Thomas Goirand <zigo@debian.or>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Heat API"
-NAME=heat-api-cloudwatch
-DAEMON=/usr/bin/heat-api-cloudwatch
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-SYSTEM_USER=heat
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-. /lib/lsb/init-functions
-
-if [ ! -e /var/log/heat ] ; then
- mkdir -p /var/log/heat
- chown ${SYSTEM_USER} /var/log/heat
-fi
-
-do_start () {
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON || return 2
-}
-
-do_stop () {
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
- RETVAL="$?"
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- restart|force-reload)
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
+++ /dev/null
-/var/log/heat/api-cloudwatch.log {
- daily
- missingok
-}
+++ /dev/null
-# vim: set ft=upstart ts=2 et:
-description "Heat API Cloudwatch server"
-author "James Page <james.page@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-exec start-stop-daemon --start --chuid heat --exec /usr/bin/heat-api-cloudwatch
+++ /dev/null
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: heat-api
-# Required-Start: $network $local_fs $remote_fs $syslog
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Heat API
-# Description: Heat API server
-### END INIT INFO
-# Author: Thomas Goirand <zigo@debian.or>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Heat API"
-NAME=heat-api
-DAEMON=/usr/bin/heat-api
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-SYSTEM_USER=heat
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-. /lib/lsb/init-functions
-
-if [ ! -e /var/log/heat ] ; then
- mkdir -p /var/log/heat
- chown ${SYSTEM_USER} /var/log/heat
-fi
-
-do_start () {
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON || return 2
-}
-
-do_stop () {
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
- RETVAL="$?"
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- restart|force-reload)
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
+++ /dev/null
-/var/log/heat/api.log {
- daily
- missingok
-}
+++ /dev/null
-# vim: set ft=upstart ts=2 et:
-description "Heat API server"
-author "James Page <james.page@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-exec start-stop-daemon --start --chuid heat --exec /usr/bin/heat-api
+++ /dev/null
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: heat-engine
-# Required-Start: $network $local_fs $remote_fs $syslog
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Heat Engine
-# Description: Heat Engine server
-### END INIT INFO
-
-# Author: Thomas Goirand <zigo@debian.or>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Heat Engine"
-NAME=heat-engine
-DAEMON=/usr/bin/heat-engine
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-SYSTEM_USER=heat
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-. /lib/lsb/init-functions
-
-if [ ! -e /var/log/heat ] ; then
- mkdir -p /var/log/heat
- chown ${SYSTEM_USER} /var/log/heat
-fi
-
-do_start () {
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1
- start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON || return 2
-}
-
-do_stop () {
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
- RETVAL="$?"
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- restart|force-reload)
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
+++ /dev/null
-/var/log/heat/engine.log {
- daily
- missingok
-}
+++ /dev/null
-#!/bin/sh
-
-set -e
-
-
-#if [ "$1" = "configure" ] ; then
-# su -s /bin/sh -c "heat-manage db_sync" heat
-#fi
-
-#DEBHELPER#
-
-exit 0
+++ /dev/null
-# vim: set ft=upstart ts=2 et:
-description "Heat Engine server"
-author "James Page <james.page@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-exec start-stop-daemon --start --chuid heat --exec /usr/bin/heat-engine
+++ /dev/null
-[DEFAULT]
-
-#
-# Options defined in heat.common.config
-#
-
-# Name of the engine node. This can be an opaque identifier.
-# It is not necessarily a hostname, FQDN, or IP address.
-# (string value)
-#host=heat
-
-
-#
-# Options defined in heat.common.config
-#
-
-# The default user for new instances. This option is
-# deprecated and will be removed in the Juno release. If it's
-# empty, Heat will use the default user set up with your cloud
-# image (for OS::Nova::Server) or 'ec2-user' (for
-# AWS::EC2::Instance). (string value)
-#instance_user=ec2-user
-
-# Driver to use for controlling instances. (string value)
-#instance_driver=heat.engine.nova
-
-# List of directories to search for plug-ins. (list value)
-#plugin_dirs=/usr/lib64/heat,/usr/lib/heat
-
-# The directory to search for environment files. (string
-# value)
-#environment_dir=/etc/heat/environment.d
-
-# Select deferred auth method, stored password or trusts.
-# (string value)
-#deferred_auth_method=password
-
-# Subset of trustor roles to be delegated to heat. If left
-# unset, all roles of a user will be delegated to heat when
-# creating a stack. (list value)
-#trusts_delegated_roles=
-
-# Maximum resources allowed per top-level stack. (integer
-# value)
-#max_resources_per_stack=1000
-
-# Maximum number of stacks any one tenant may have active at
-# one time. (integer value)
-#max_stacks_per_tenant=100
-
-# Number of times to retry to bring a resource to a non-error
-# state. Set to 0 to disable retries. (integer value)
-#action_retry_limit=5
-
-# Controls how many events will be pruned whenever a stack's
-# events exceed max_events_per_stack. Set this lower to keep
-# more events at the expense of more frequent purges. (integer
-# value)
-#event_purge_batch_size=10
-
-# Maximum events that will be available per stack. Older
-# events will be deleted when this is reached. Set to 0 for
-# unlimited events per stack. (integer value)
-#max_events_per_stack=1000
-
-# Timeout in seconds for stack action (ie. create or update).
-# (integer value)
-#stack_action_timeout=3600
-
-# Error wait time in seconds for stack action (ie. create or
-# update). (integer value)
-#error_wait_time=240
-
-# RPC timeout for the engine liveness check that is used for
-# stack locking. (integer value)
-#engine_life_check_timeout=2
-
-# Enable the legacy OS::Heat::CWLiteAlarm resource. (boolean
-# value)
-#enable_cloud_watch_lite=true
-
-# Enable the preview Stack Abandon feature. (boolean value)
-#enable_stack_abandon=false
-
-# Enable the preview Stack Adopt feature. (boolean value)
-#enable_stack_adopt=false
-
-# Deprecated. (string value)
-#onready=<None>
-
-
-#
-# Options defined in heat.common.config
-#
-
-# Seconds between running periodic tasks. (integer value)
-#periodic_interval=60
-
-# URL of the Heat metadata server. (string value)
-#heat_metadata_server_url=
-
-# URL of the Heat waitcondition server. (string value)
-#heat_waitcondition_server_url=
-
-# URL of the Heat CloudWatch server. (string value)
-#heat_watch_server_url=
-
-# Instance connection to CFN/CW API via https. (string value)
-#instance_connection_is_secure=0
-
-# Instance connection to CFN/CW API validate certs if SSL is
-# used. (string value)
-#instance_connection_https_validate_certificates=1
-
-# Default region name used to get services endpoints. (string
-# value)
-#region_name_for_services=<None>
-
-# Keystone role for heat template-defined users. (string
-# value)
-#heat_stack_user_role=heat_stack_user
-
-# Keystone domain ID which contains heat template-defined
-# users. If this option is set, stack_user_domain_name option
-# will be ignored. (string value)
-# Deprecated group/name - [DEFAULT]/stack_user_domain
-#stack_user_domain_id=<None>
-
-# Keystone domain name which contains heat template-defined
-# users. If `stack_user_domain_id` option is set, this option
-# is ignored. (string value)
-#stack_user_domain_name=<None>
-
-# Keystone username, a user with roles sufficient to manage
-# users and projects in the stack_user_domain. (string value)
-#stack_domain_admin=<None>
-
-# Keystone password for stack_domain_admin user. (string
-# value)
-#stack_domain_admin_password=<None>
-
-# Maximum raw byte size of any template. (integer value)
-#max_template_size=524288
-
-# Maximum depth allowed when using nested stacks. (integer
-# value)
-#max_nested_stack_depth=3
-
-# Number of heat-engine processes to fork and run. (integer
-# value)
-#num_engine_workers=1
-
-
-#
-# Options defined in heat.common.wsgi
-#
-
-# Maximum raw byte size of JSON request body. Should be larger
-# than max_template_size. (integer value)
-#max_json_body_size=1048576
-
-
-#
-# Options defined in oslo.messaging
-#
-
-# Use durable queues in amqp. (boolean value)
-# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
-#amqp_durable_queues=false
-
-# Auto-delete queues in amqp. (boolean value)
-#amqp_auto_delete=false
-
-# Size of RPC connection pool. (integer value)
-#rpc_conn_pool_size=30
-
-# Qpid broker hostname. (string value)
-#qpid_hostname=localhost
-
-# Qpid broker port. (integer value)
-#qpid_port=5672
-
-# Qpid HA cluster host:port pairs. (list value)
-#qpid_hosts=$qpid_hostname:$qpid_port
-
-# Username for Qpid connection. (string value)
-#qpid_username=
-
-# Password for Qpid connection. (string value)
-#qpid_password=
-
-# Space separated list of SASL mechanisms to use for auth.
-# (string value)
-#qpid_sasl_mechanisms=
-
-# Seconds between connection keepalive heartbeats. (integer
-# value)
-#qpid_heartbeat=60
-
-# Transport to use, either 'tcp' or 'ssl'. (string value)
-#qpid_protocol=tcp
-
-# Whether to disable the Nagle algorithm. (boolean value)
-#qpid_tcp_nodelay=true
-
-# The number of prefetched messages held by receiver. (integer
-# value)
-#qpid_receiver_capacity=1
-
-# The qpid topology version to use. Version 1 is what was
-# originally used by impl_qpid. Version 2 includes some
-# backwards-incompatible changes that allow broker federation
-# to work. Users should update to version 2 when they are
-# able to take everything down, as it requires a clean break.
-# (integer value)
-#qpid_topology_version=1
-
-# SSL version to use (valid only if SSL enabled). valid values
-# are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some
-# distributions. (string value)
-#kombu_ssl_version=
-
-# SSL key file (valid only if SSL enabled). (string value)
-#kombu_ssl_keyfile=
-
-# SSL cert file (valid only if SSL enabled). (string value)
-#kombu_ssl_certfile=
-
-# SSL certification authority file (valid only if SSL
-# enabled). (string value)
-#kombu_ssl_ca_certs=
-
-# How long to wait before reconnecting in response to an AMQP
-# consumer cancel notification. (floating point value)
-#kombu_reconnect_delay=1.0
-
-# The RabbitMQ broker address where a single node is used.
-# (string value)
-#rabbit_host=localhost
-
-# The RabbitMQ broker port where a single node is used.
-# (integer value)
-#rabbit_port=5672
-
-# RabbitMQ HA cluster host:port pairs. (list value)
-#rabbit_hosts=$rabbit_host:$rabbit_port
-
-# Connect over SSL for RabbitMQ. (boolean value)
-#rabbit_use_ssl=false
-
-# The RabbitMQ userid. (string value)
-#rabbit_userid=guest
-
-# The RabbitMQ password. (string value)
-#rabbit_password=guest
-
-# the RabbitMQ login method (string value)
-#rabbit_login_method=AMQPLAIN
-
-# The RabbitMQ virtual host. (string value)
-#rabbit_virtual_host=/
-
-# How frequently to retry connecting with RabbitMQ. (integer
-# value)
-#rabbit_retry_interval=1
-
-# How long to backoff for between retries when connecting to
-# RabbitMQ. (integer value)
-#rabbit_retry_backoff=2
-
-# Maximum number of RabbitMQ connection retries. Default is 0
-# (infinite retry count). (integer value)
-#rabbit_max_retries=0
-
-# Use HA queues in RabbitMQ (x-ha-policy: all). If you change
-# this option, you must wipe the RabbitMQ database. (boolean
-# value)
-#rabbit_ha_queues=false
-
-# If passed, use a fake RabbitMQ provider. (boolean value)
-#fake_rabbit=false
-
-# ZeroMQ bind address. Should be a wildcard (*), an ethernet
-# interface, or IP. The "host" option should point or resolve
-# to this address. (string value)
-#rpc_zmq_bind_address=*
-
-# MatchMaker driver. (string value)
-#rpc_zmq_matchmaker=oslo.messaging._drivers.matchmaker.MatchMakerLocalhost
-
-# ZeroMQ receiver listening port. (integer value)
-#rpc_zmq_port=9501
-
-# Number of ZeroMQ contexts, defaults to 1. (integer value)
-#rpc_zmq_contexts=1
-
-# Maximum number of ingress messages to locally buffer per
-# topic. Default is unlimited. (integer value)
-#rpc_zmq_topic_backlog=<None>
-
-# Directory for holding IPC sockets. (string value)
-#rpc_zmq_ipc_dir=/var/run/openstack
-
-# Name of this node. Must be a valid hostname, FQDN, or IP
-# address. Must match "host" option, if running Nova. (string
-# value)
-#rpc_zmq_host=heat
-
-# Seconds to wait before a cast expires (TTL). Only supported
-# by impl_zmq. (integer value)
-#rpc_cast_timeout=30
-
-# Heartbeat frequency. (integer value)
-#matchmaker_heartbeat_freq=300
-
-# Heartbeat time-to-live. (integer value)
-#matchmaker_heartbeat_ttl=600
-
-# Size of RPC greenthread pool. (integer value)
-#rpc_thread_pool_size=64
-
-# Driver or drivers to handle sending notifications. (multi
-# valued)
-#notification_driver=
-
-# AMQP topic used for OpenStack notifications. (list value)
-# Deprecated group/name - [rpc_notifier2]/topics
-#notification_topics=notifications
-
-# Seconds to wait for a response from a call. (integer value)
-#rpc_response_timeout=60
-
-# A URL representing the messaging driver to use and its full
-# configuration. If not set, we fall back to the rpc_backend
-# option and driver specific configuration. (string value)
-#transport_url=<None>
-
-# The messaging driver to use, defaults to rabbit. Other
-# drivers include qpid and zmq. (string value)
-#rpc_backend=rabbit
-
-# The default exchange under which topics are scoped. May be
-# overridden by an exchange name specified in the
-# transport_url option. (string value)
-#control_exchange=openstack
-
-
-#
-# Options defined in heat.api.middleware.ssl
-#
-
-# The HTTP Header that will be used to determine which the
-# original request protocol scheme was, even if it was removed
-# by an SSL terminator proxy. (string value)
-#secure_proxy_ssl_header=X-Forwarded-Proto
-
-
-#
-# Options defined in heat.common.crypt
-#
-
-# Encryption key used for authentication info in database.
-# (string value)
-#auth_encryption_key=notgood but just long enough i think
-
-
-#
-# Options defined in heat.common.heat_keystoneclient
-#
-
-# Fully qualified class name to use as a keystone backend.
-# (string value)
-#keystone_backend=heat.common.heat_keystoneclient.KeystoneClientV3
-
-
-#
-# Options defined in heat.engine.clients
-#
-
-# Fully qualified class name to use as a client backend.
-# (string value)
-#cloud_backend=heat.engine.clients.OpenStackClients
-
-
-#
-# Options defined in heat.engine.notification
-#
-
-# Default notification level for outgoing notifications.
-# (string value)
-#default_notification_level=INFO
-
-# Default publisher_id for outgoing notifications. (string
-# value)
-#default_publisher_id=<None>
-
-# List of drivers to send notifications (DEPRECATED). (multi
-# valued)
-#list_notifier_drivers=<None>
-
-
-#
-# Options defined in heat.engine.resources.loadbalancer
-#
-
-# Custom template for the built-in loadbalancer nested stack.
-# (string value)
-#loadbalancer_template=<None>
-
-
-#
-# Options defined in heat.openstack.common.eventlet_backdoor
-#
-
-# Enable eventlet backdoor. Acceptable values are 0, <port>,
-# and <start>:<end>, where 0 results in listening on a random
-# tcp port number; <port> results in listening on the
-# specified port number (and not enabling backdoor if that
-# port is in use); and <start>:<end> results in listening on
-# the smallest unused port number within the specified range
-# of port numbers. The chosen port is displayed in the
-# service's log file. (string value)
-#backdoor_port=<None>
-
-
-#
-# Options defined in heat.openstack.common.log
-#
-
-# Print debugging output (set logging level to DEBUG instead
-# of default WARNING level). (boolean value)
-#debug=false
-
-# Print more verbose output (set logging level to INFO instead
-# of default WARNING level). (boolean value)
-#verbose=false
-
-# Log output to standard error. (boolean value)
-#use_stderr=true
-
-# Format string to use for log messages with context. (string
-# value)
-#logging_context_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
-
-# Format string to use for log messages without context.
-# (string value)
-#logging_default_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
-
-# Data to append to log format when level is DEBUG. (string
-# value)
-#logging_debug_format_suffix=%(funcName)s %(pathname)s:%(lineno)d
-
-# Prefix each line of exception output with this format.
-# (string value)
-#logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s
-
-# List of logger=LEVEL pairs. (list value)
-#default_log_levels=amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN
-
-# Enables or disables publication of error events. (boolean
-# value)
-#publish_errors=false
-
-# Enables or disables fatal status of deprecations. (boolean
-# value)
-#fatal_deprecations=false
-
-# The format for an instance that is passed with the log
-# message. (string value)
-#instance_format="[instance: %(uuid)s] "
-
-# The format for an instance UUID that is passed with the log
-# message. (string value)
-#instance_uuid_format="[instance: %(uuid)s] "
-
-# The name of a logging configuration file. This file is
-# appended to any existing logging configuration files. For
-# details about logging configuration files, see the Python
-# logging module documentation. (string value)
-# Deprecated group/name - [DEFAULT]/log_config
-#log_config_append=<None>
-
-# DEPRECATED. A logging.Formatter log message format string
-# which may use any of the available logging.LogRecord
-# attributes. This option is deprecated. Please use
-# logging_context_format_string and
-# logging_default_format_string instead. (string value)
-#log_format=<None>
-
-# Format string for %%(asctime)s in log records. Default:
-# %(default)s . (string value)
-#log_date_format=%Y-%m-%d %H:%M:%S
-
-# (Optional) Name of log file to output to. If no default is
-# set, logging will go to stdout. (string value)
-# Deprecated group/name - [DEFAULT]/logfile
-#log_file=<None>
-
-# (Optional) The base directory used for relative --log-file
-# paths. (string value)
-# Deprecated group/name - [DEFAULT]/logdir
-#log_dir=<None>
-
-# Use syslog for logging. Existing syslog format is DEPRECATED
-# during I, and will change in J to honor RFC5424. (boolean
-# value)
-#use_syslog=false
-
-# (Optional) Enables or disables syslog rfc5424 format for
-# logging. If enabled, prefixes the MSG part of the syslog
-# message with APP-NAME (RFC5424). The format without the APP-
-# NAME is deprecated in I, and will be removed in J. (boolean
-# value)
-#use_syslog_rfc_format=false
-
-# Syslog facility to receive log lines. (string value)
-#syslog_log_facility=LOG_USER
-
-
-#
-# Options defined in heat.openstack.common.policy
-#
-
-# The JSON file that defines policies. (string value)
-#policy_file=policy.json
-
-# Default rule. Enforced when a requested rule is not found.
-# (string value)
-#policy_default_rule=default
-
-
-[auth_password]
-
-#
-# Options defined in heat.common.config
-#
-
-# Allow orchestration of multiple clouds. (boolean value)
-#multi_cloud=false
-
-# Allowed keystone endpoints for auth_uri when multi_cloud is
-# enabled. At least one endpoint needs to be specified. (list
-# value)
-#allowed_auth_uris=
-
-
-[clients]
-
-#
-# Options defined in heat.common.config
-#
-
-# Type of endpoint in Identity service catalog to use for
-# communication with the OpenStack service. (string value)
-#endpoint_type=publicURL
-
-# Optional CA cert file to use in SSL connections. (string
-# value)
-#ca_file=<None>
-
-# Optional PEM-formatted certificate chain file. (string
-# value)
-#cert_file=<None>
-
-# Optional PEM-formatted file that contains the private key.
-# (string value)
-#key_file=<None>
-
-# If set, then the server's certificate will not be verified.
-# (boolean value)
-#insecure=false
-
-
-[clients_ceilometer]
-
-#
-# Options defined in heat.common.config
-#
-
-# Type of endpoint in Identity service catalog to use for
-# communication with the OpenStack service. (string value)
-#endpoint_type=<None>
-
-# Optional CA cert file to use in SSL connections. (string
-# value)
-#ca_file=<None>
-
-# Optional PEM-formatted certificate chain file. (string
-# value)
-#cert_file=<None>
-
-# Optional PEM-formatted file that contains the private key.
-# (string value)
-#key_file=<None>
-
-# If set, then the server's certificate will not be verified.
-# (boolean value)
-#insecure=<None>
-
-
-[clients_cinder]
-
-#
-# Options defined in heat.common.config
-#
-
-# Type of endpoint in Identity service catalog to use for
-# communication with the OpenStack service. (string value)
-#endpoint_type=<None>
-
-# Optional CA cert file to use in SSL connections. (string
-# value)
-#ca_file=<None>
-
-# Optional PEM-formatted certificate chain file. (string
-# value)
-#cert_file=<None>
-
-# Optional PEM-formatted file that contains the private key.
-# (string value)
-#key_file=<None>
-
-# If set, then the server's certificate will not be verified.
-# (boolean value)
-#insecure=<None>
-
-
-#
-# Options defined in heat.common.config
-#
-
-# Allow client's debug log output. (boolean value)
-#http_log_debug=false
-
-
-[clients_glance]
-
-#
-# Options defined in heat.common.config
-#
-
-# Type of endpoint in Identity service catalog to use for
-# communication with the OpenStack service. (string value)
-#endpoint_type=<None>
-
-# Optional CA cert file to use in SSL connections. (string
-# value)
-#ca_file=<None>
-
-# Optional PEM-formatted certificate chain file. (string
-# value)
-#cert_file=<None>
-
-# Optional PEM-formatted file that contains the private key.
-# (string value)
-#key_file=<None>
-
-# If set, then the server's certificate will not be verified.
-# (boolean value)
-#insecure=<None>
-
-
-[clients_heat]
-
-#
-# Options defined in heat.common.config
-#
-
-# Type of endpoint in Identity service catalog to use for
-# communication with the OpenStack service. (string value)
-#endpoint_type=<None>
-
-# Optional CA cert file to use in SSL connections. (string
-# value)
-#ca_file=<None>
-
-# Optional PEM-formatted certificate chain file. (string
-# value)
-#cert_file=<None>
-
-# Optional PEM-formatted file that contains the private key.
-# (string value)
-#key_file=<None>
-
-# If set, then the server's certificate will not be verified.
-# (boolean value)
-#insecure=<None>
-
-
-#
-# Options defined in heat.common.config
-#
-
-# Optional heat url in format like
-# http://0.0.0.0:8004/v1/%(tenant_id)s. (string value)
-#url=
-
-
-[clients_keystone]
-
-#
-# Options defined in heat.common.config
-#
-
-# Type of endpoint in Identity service catalog to use for
-# communication with the OpenStack service. (string value)
-#endpoint_type=<None>
-
-# Optional CA cert file to use in SSL connections. (string
-# value)
-#ca_file=<None>
-
-# Optional PEM-formatted certificate chain file. (string
-# value)
-#cert_file=<None>
-
-# Optional PEM-formatted file that contains the private key.
-# (string value)
-#key_file=<None>
-
-# If set, then the server's certificate will not be verified.
-# (boolean value)
-#insecure=<None>
-
-
-[clients_neutron]
-
-#
-# Options defined in heat.common.config
-#
-
-# Type of endpoint in Identity service catalog to use for
-# communication with the OpenStack service. (string value)
-#endpoint_type=<None>
-
-# Optional CA cert file to use in SSL connections. (string
-# value)
-#ca_file=<None>
-
-# Optional PEM-formatted certificate chain file. (string
-# value)
-#cert_file=<None>
-
-# Optional PEM-formatted file that contains the private key.
-# (string value)
-#key_file=<None>
-
-# If set, then the server's certificate will not be verified.
-# (boolean value)
-#insecure=<None>
-
-
-[clients_nova]
-
-#
-# Options defined in heat.common.config
-#
-
-# Type of endpoint in Identity service catalog to use for
-# communication with the OpenStack service. (string value)
-#endpoint_type=<None>
-
-# Optional CA cert file to use in SSL connections. (string
-# value)
-#ca_file=<None>
-
-# Optional PEM-formatted certificate chain file. (string
-# value)
-#cert_file=<None>
-
-# Optional PEM-formatted file that contains the private key.
-# (string value)
-#key_file=<None>
-
-# If set, then the server's certificate will not be verified.
-# (boolean value)
-#insecure=<None>
-
-
-#
-# Options defined in heat.common.config
-#
-
-# Allow client's debug log output. (boolean value)
-#http_log_debug=false
-
-
-[clients_swift]
-
-#
-# Options defined in heat.common.config
-#
-
-# Type of endpoint in Identity service catalog to use for
-# communication with the OpenStack service. (string value)
-#endpoint_type=<None>
-
-# Optional CA cert file to use in SSL connections. (string
-# value)
-#ca_file=<None>
-
-# Optional PEM-formatted certificate chain file. (string
-# value)
-#cert_file=<None>
-
-# Optional PEM-formatted file that contains the private key.
-# (string value)
-#key_file=<None>
-
-# If set, then the server's certificate will not be verified.
-# (boolean value)
-#insecure=<None>
-
-
-[clients_trove]
-
-#
-# Options defined in heat.common.config
-#
-
-# Type of endpoint in Identity service catalog to use for
-# communication with the OpenStack service. (string value)
-#endpoint_type=<None>
-
-# Optional CA cert file to use in SSL connections. (string
-# value)
-#ca_file=<None>
-
-# Optional PEM-formatted certificate chain file. (string
-# value)
-#cert_file=<None>
-
-# Optional PEM-formatted file that contains the private key.
-# (string value)
-#key_file=<None>
-
-# If set, then the server's certificate will not be verified.
-# (boolean value)
-#insecure=<None>
-
-
-[database]
-
-#
-# Options defined in oslo.db
-#
-
-# The file name to use with SQLite. (string value)
-#sqlite_db=oslo.sqlite
-
-# If True, SQLite uses synchronous mode. (boolean value)
-#sqlite_synchronous=true
-
-# The back end to use for the database. (string value)
-# Deprecated group/name - [DEFAULT]/db_backend
-#backend=sqlalchemy
-
-# The SQLAlchemy connection string to use to connect to the
-# database. (string value)
-# Deprecated group/name - [DEFAULT]/sql_connection
-# Deprecated group/name - [DATABASE]/sql_connection
-# Deprecated group/name - [sql]/connection
-#connection=<None>
-
-# The SQLAlchemy connection string to use to connect to the
-# slave database. (string value)
-#slave_connection=<None>
-
-# The SQL mode to be used for MySQL sessions. This option,
-# including the default, overrides any server-set SQL mode. To
-# use whatever SQL mode is set by the server configuration,
-# set this to no value. Example: mysql_sql_mode= (string
-# value)
-#mysql_sql_mode=TRADITIONAL
-
-# Timeout before idle SQL connections are reaped. (integer
-# value)
-# Deprecated group/name - [DEFAULT]/sql_idle_timeout
-# Deprecated group/name - [DATABASE]/sql_idle_timeout
-# Deprecated group/name - [sql]/idle_timeout
-#idle_timeout=3600
-
-# Minimum number of SQL connections to keep open in a pool.
-# (integer value)
-# Deprecated group/name - [DEFAULT]/sql_min_pool_size
-# Deprecated group/name - [DATABASE]/sql_min_pool_size
-#min_pool_size=1
-
-# Maximum number of SQL connections to keep open in a pool.
-# (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_pool_size
-# Deprecated group/name - [DATABASE]/sql_max_pool_size
-#max_pool_size=<None>
-
-# Maximum number of database connection retries during
-# startup. Set to -1 to specify an infinite retry count.
-# (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_retries
-# Deprecated group/name - [DATABASE]/sql_max_retries
-#max_retries=10
-
-# Interval between retries of opening a SQL connection.
-# (integer value)
-# Deprecated group/name - [DEFAULT]/sql_retry_interval
-# Deprecated group/name - [DATABASE]/reconnect_interval
-#retry_interval=10
-
-# If set, use this value for max_overflow with SQLAlchemy.
-# (integer value)
-# Deprecated group/name - [DEFAULT]/sql_max_overflow
-# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow
-#max_overflow=<None>
-
-# Verbosity of SQL debugging information: 0=None,
-# 100=Everything. (integer value)
-# Deprecated group/name - [DEFAULT]/sql_connection_debug
-#connection_debug=0
-
-# Add Python stack traces to SQL as comment strings. (boolean
-# value)
-# Deprecated group/name - [DEFAULT]/sql_connection_trace
-#connection_trace=false
-
-# If set, use this value for pool_timeout with SQLAlchemy.
-# (integer value)
-# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout
-#pool_timeout=<None>
-
-# Enable the experimental use of database reconnect on
-# connection lost. (boolean value)
-#use_db_reconnect=false
-
-# Seconds between database connection retries. (integer value)
-#db_retry_interval=1
-
-# If True, increases the interval between database connection
-# retries up to db_max_retry_interval. (boolean value)
-#db_inc_retry_interval=true
-
-# If db_inc_retry_interval is set, the maximum seconds between
-# database connection retries. (integer value)
-#db_max_retry_interval=10
-
-# Maximum database connection retries before error is raised.
-# Set to -1 to specify an infinite retry count. (integer
-# value)
-#db_max_retries=20
-
-
-[ec2authtoken]
-
-#
-# Options defined in heat.api.aws.ec2token
-#
-
-# Authentication Endpoint URI. (string value)
-#auth_uri=<None>
-
-# Allow orchestration of multiple clouds. (boolean value)
-#multi_cloud=false
-
-# Allowed keystone endpoints for auth_uri when multi_cloud is
-# enabled. At least one endpoint needs to be specified. (list
-# value)
-#allowed_auth_uris=
-
-
-[heat_api]
-
-#
-# Options defined in heat.common.wsgi
-#
-
-# Address to bind the server. Useful when selecting a
-# particular network interface. (string value)
-#bind_host=0.0.0.0
-
-# The port on which the server will listen. (integer value)
-#bind_port=8004
-
-# Number of backlog requests to configure the socket with.
-# (integer value)
-#backlog=4096
-
-# Location of the SSL certificate file to use for SSL mode.
-# (string value)
-#cert_file=<None>
-
-# Location of the SSL key file to use for enabling SSL mode.
-# (string value)
-#key_file=<None>
-
-# Number of workers for Heat service. (integer value)
-#workers=0
-
-# Maximum line size of message headers to be accepted.
-# max_header_line may need to be increased when using large
-# tokens (typically those generated by the Keystone v3 API
-# with big service catalogs). (integer value)
-#max_header_line=16384
-
-
-[heat_api_cfn]
-
-#
-# Options defined in heat.common.wsgi
-#
-
-# Address to bind the server. Useful when selecting a
-# particular network interface. (string value)
-#bind_host=0.0.0.0
-
-# The port on which the server will listen. (integer value)
-#bind_port=8000
-
-# Number of backlog requests to configure the socket with.
-# (integer value)
-#backlog=4096
-
-# Location of the SSL certificate file to use for SSL mode.
-# (string value)
-#cert_file=<None>
-
-# Location of the SSL key file to use for enabling SSL mode.
-# (string value)
-#key_file=<None>
-
-# Number of workers for Heat service. (integer value)
-#workers=0
-
-# Maximum line size of message headers to be accepted.
-# max_header_line may need to be increased when using large
-# tokens (typically those generated by the Keystone v3 API
-# with big service catalogs). (integer value)
-#max_header_line=16384
-
-
-[heat_api_cloudwatch]
-
-#
-# Options defined in heat.common.wsgi
-#
-
-# Address to bind the server. Useful when selecting a
-# particular network interface. (string value)
-#bind_host=0.0.0.0
-
-# The port on which the server will listen. (integer value)
-#bind_port=8003
-
-# Number of backlog requests to configure the socket with.
-# (integer value)
-#backlog=4096
-
-# Location of the SSL certificate file to use for SSL mode.
-# (string value)
-#cert_file=<None>
-
-# Location of the SSL key file to use for enabling SSL mode.
-# (string value)
-#key_file=<None>
-
-# Number of workers for Heat service. (integer value)
-#workers=0
-
-# Maximum line size of message headers to be accepted.
-# max_header_line may need to be increased when using large
-# tokens (typically those generated by the Keystone v3 API
-# with big service catalogs.) (integer value)
-#max_header_line=16384
-
-
-[keystone_authtoken]
-
-#
-# Options defined in keystonemiddleware.auth_token
-#
-
-# Prefix to prepend at the beginning of the path. Deprecated,
-# use identity_uri. (string value)
-#auth_admin_prefix=
-
-# Host providing the admin Identity API endpoint. Deprecated,
-# use identity_uri. (string value)
-#auth_host=127.0.0.1
-
-# Port of the admin Identity API endpoint. Deprecated, use
-# identity_uri. (integer value)
-#auth_port=35357
-
-# Protocol of the admin Identity API endpoint (http or https).
-# Deprecated, use identity_uri. (string value)
-#auth_protocol=https
-
-# Complete public Identity API endpoint (string value)
-#auth_uri=<None>
-
-# Complete admin Identity API endpoint. This should specify
-# the unversioned root endpoint e.g. https://localhost:35357/
-# (string value)
-#identity_uri=<None>
-
-# API version of the admin Identity API endpoint (string
-# value)
-#auth_version=<None>
-
-# Do not handle authorization requests within the middleware,
-# but delegate the authorization decision to downstream WSGI
-# components (boolean value)
-#delay_auth_decision=false
-
-# Request timeout value for communicating with Identity API
-# server. (boolean value)
-#http_connect_timeout=<None>
-
-# How many times are we trying to reconnect when communicating
-# with Identity API Server. (integer value)
-#http_request_max_retries=3
-
-# This option is deprecated and may be removed in a future
-# release. Single shared secret with the Keystone
-# configuration used for bootstrapping a Keystone
-# installation, or otherwise bypassing the normal
-# authentication process. This option should not be used, use
-# `admin_user` and `admin_password` instead. (string value)
-#admin_token=<None>
-
-# Keystone account username (string value)
-#admin_user=<None>
-
-# Keystone account password (string value)
-#admin_password=<None>
-
-# Keystone service account tenant name to validate user tokens
-# (string value)
-#admin_tenant_name=admin
-
-# Env key for the swift cache (string value)
-#cache=<None>
-
-# Required if Keystone server requires client certificate
-# (string value)
-#certfile=<None>
-
-# Required if Keystone server requires client certificate
-# (string value)
-#keyfile=<None>
-
-# A PEM encoded Certificate Authority to use when verifying
-# HTTPs connections. Defaults to system CAs. (string value)
-#cafile=<None>
-
-# Verify HTTPS connections. (boolean value)
-#insecure=false
-
-# Directory used to cache files related to PKI tokens (string
-# value)
-#signing_dir=<None>
-
-# Optionally specify a list of memcached server(s) to use for
-# caching. If left undefined, tokens will instead be cached
-# in-process. (list value)
-# Deprecated group/name - [DEFAULT]/memcache_servers
-#memcached_servers=<None>
-
-# In order to prevent excessive effort spent validating
-# tokens, the middleware caches previously-seen tokens for a
-# configurable duration (in seconds). Set to -1 to disable
-# caching completely. (integer value)
-#token_cache_time=300
-
-# Determines the frequency at which the list of revoked tokens
-# is retrieved from the Identity service (in seconds). A high
-# number of revocation events combined with a low cache
-# duration may significantly reduce performance. (integer
-# value)
-#revocation_cache_time=10
-
-# (optional) if defined, indicate whether token data should be
-# authenticated or authenticated and encrypted. Acceptable
-# values are MAC or ENCRYPT. If MAC, token data is
-# authenticated (with HMAC) in the cache. If ENCRYPT, token
-# data is encrypted and authenticated in the cache. If the
-# value is not one of these options or empty, auth_token will
-# raise an exception on initialization. (string value)
-#memcache_security_strategy=<None>
-
-# (optional, mandatory if memcache_security_strategy is
-# defined) this string is used for key derivation. (string
-# value)
-#memcache_secret_key=<None>
-
-# (optional) number of seconds memcached server is considered
-# dead before it is tried again. (integer value)
-#memcache_pool_dead_retry=300
-
-# (optional) max total number of open connections to every
-# memcached server. (integer value)
-#memcache_pool_maxsize=10
-
-# (optional) socket timeout in seconds for communicating with
-# a memcache server. (integer value)
-#memcache_pool_socket_timeout=3
-
-# (optional) number of seconds a connection to memcached is
-# held unused in the pool before it is closed. (integer value)
-#memcache_pool_unused_timeout=60
-
-# (optional) number of seconds that an operation will wait to
-# get a memcache client connection from the pool. (integer
-# value)
-#memcache_pool_conn_get_timeout=10
-
-# (optional) use the advanced (eventlet safe) memcache client
-# pool. The advanced pool will only work under python 2.x.
-# (boolean value)
-#memcache_use_advanced_pool=false
-
-# (optional) indicate whether to set the X-Service-Catalog
-# header. If False, middleware will not ask for service
-# catalog on token validation and will not set the X-Service-
-# Catalog header. (boolean value)
-#include_service_catalog=true
-
-# Used to control the use and type of token binding. Can be
-# set to: "disabled" to not check token binding. "permissive"
-# (default) to validate binding information if the bind type
-# is of a form known to the server and ignore it if not.
-# "strict" like "permissive" but if the bind type is unknown
-# the token will be rejected. "required" any form of token
-# binding is needed to be allowed. Finally the name of a
-# binding method that must be present in tokens. (string
-# value)
-#enforce_token_bind=permissive
-
-# If true, the revocation list will be checked for cached
-# tokens. This requires that PKI tokens are configured on the
-# Keystone server. (boolean value)
-#check_revocations_for_cached=false
-
-# Hash algorithms to use for hashing PKI tokens. This may be a
-# single algorithm or multiple. The algorithms are those
-# supported by Python standard hashlib.new(). The hashes will
-# be tried in the order given, so put the preferred one first
-# for performance. The result of the first hash will be stored
-# in the cache. This will typically be set to multiple values
-# only while migrating from a less secure algorithm to a more
-# secure one. Once all the old tokens are expired this option
-# should be set to a single value for better performance.
-# (list value)
-#hash_algorithms=md5
-
-
-[matchmaker_redis]
-
-#
-# Options defined in oslo.messaging
-#
-
-# Host to locate redis. (string value)
-#host=127.0.0.1
-
-# Use this port to connect to redis host. (integer value)
-#port=6379
-
-# Password for Redis server (optional). (string value)
-#password=<None>
-
-
-[matchmaker_ring]
-
-#
-# Options defined in oslo.messaging
-#
-
-# Matchmaker ring file (JSON). (string value)
-# Deprecated group/name - [DEFAULT]/matchmaker_ringfile
-#ringfile=/etc/oslo/matchmaker_ring.json
-
-
-[paste_deploy]
-
-#
-# Options defined in heat.common.config
-#
-
-# The flavor to use. (string value)
-#flavor=<None>
-
-# The API paste config file to use. (string value)
-#api_paste_config=api-paste.ini
-
-
-[profiler]
-
-#
-# Options defined in heat.common.config
-#
-
-# If False fully disable profiling feature. (boolean value)
-#profiler_enabled=false
-
-# If False do not trace SQL requests. (boolean value)
-#trace_sqlalchemy=false
-
-
-[revision]
-
-#
-# Options defined in heat.common.config
-#
-
-# Heat build revision. If you would prefer to manage your
-# build revision separately, you can move this section to a
-# different file and add it as another config option. (string
-# value)
-#heat_revision=unknown
-
-
+++ /dev/null
-Description: Skip tests that fail in the buildds.
-Author: Chuck Short <zulcss@ubuntu.com>
-Forwarded: No
-diff --git a/heat/tests/test_server.py b/heat/tests/test_server.py
-index fabd8d8..c115c85 100644
---- a/heat/tests/test_server.py
-+++ b/heat/tests/test_server.py
-@@ -646,7 +646,10 @@ class ServersTest(HeatTestCase):
-
- update_template = copy.deepcopy(server.t)
- update_template['Properties']['image'] = self.getUniqueString()
-- updater = scheduler.TaskRunner(server.update, update_template)
-+ try:
-+ updater = scheduler.TaskRunner(server.update, update_template)
-+ except:
-+ self.skipTest('Skipped by Ubuntu')
- self.assertRaises(resource.UpdateReplace, updater)
-
- def _test_server_update_image_rebuild(self, status, policy='REBUILD'):
-@@ -678,7 +681,10 @@ class ServersTest(HeatTestCase):
- return_server.get = activate_status.__get__(return_server)
-
- self.m.ReplayAll()
-- scheduler.TaskRunner(server.update, update_template)()
-+ try:
-+ scheduler.TaskRunner(server.update, update_template)()
-+ except:
-+ self.skipTest('Skipped by Ubuntu')
- self.assertEqual(server.state, (server.UPDATE, server.COMPLETE))
- self.m.VerifyAll()
-
-@@ -729,7 +735,10 @@ class ServersTest(HeatTestCase):
- return_server.get = activate_status2.__get__(return_server)
- self.m.ReplayAll()
- updater = scheduler.TaskRunner(server.update, update_template)
-- error = self.assertRaises(exception.ResourceFailure, updater)
-+ try:
-+ error = self.assertRaises(exception.ResourceFailure, updater)
-+ except:
-+ self.skipTest('Skipped by Ubuntu')
- self.assertEqual(
- "Error: Rebuilding server failed, status 'ERROR'",
- str(error))
+++ /dev/null
-argparse python-argparse
-posix_ipc python-posix-ipc
-qpid_python python-qpid
+++ /dev/null
-#!/usr/bin/make -f
-
-#export DH_VERBOSE=1
-
-%:
- dh $@ --with python2
-
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-override_dh_auto_test:
- PYTHONPATH=. testr init && testr run
-endif
-
-override_dh_clean:
- dh_clean
- rm -rf heat.egg-info
- rm -rf doc/build
- find . -iname '*.pyc' -delete
- rm -f run_tests.err.log
- rm -rf pbr*.egg
-
-override_dh_install:
- dh_install
+++ /dev/null
-version=3
-opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
- https://launchpad.net/heat/+download https://launchpad.net/heat/.*/.*/.*/heat-(.*)\.tar\.gz
conf_file=/etc/heat/heat.conf
prepare_vm() {
- if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]
- then
- echo "mysql-server mysql-server/root_password select $MYSQL_PASSWORD" | sudo debconf-set-selections
- echo "mysql-server mysql-server/root_password_again select $MYSQL_PASSWORD" | sudo debconf-set-selections
- apt-get install -y mysql-server mysql-client python-mysqldb rabbitmq-server
- else
- yum install screen mysql-server MySQL-python MySQL-client rabbitmq-server -y
- service $(chkconfig | grep -oE '^mysql.?\s') start
- /usr/bin/mysqladmin -u root password $MYSQL_PASSWORD
- fi
- service rabbitmq-server start
- mysql -uroot -p$MYSQL_PASSWORD -Bse "create database heat"
- sed -i "/^\[database\]/a connection=mysql://root:$MYSQL_PASSWORD@localhost/heat" $conf_file
- heat-manage -d db_sync
- if [ "$?" != "0" ]
- then
- echo "Couldn't execute 'heat-manage db_sync'"
- RES=1
- fi
+ if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]
+ then
+ echo "mysql-server mysql-server/root_password select $MYSQL_PASSWORD" | sudo debconf-set-selections
+ echo "mysql-server mysql-server/root_password_again select $MYSQL_PASSWORD" | sudo debconf-set-selections
+ apt-get install -y mysql-server mysql-client python-mysqldb rabbitmq-server screen curl
+ else
+ yum install screen mysql-server MySQL-python MySQL-client rabbitmq-server -y
+ service $(chkconfig | grep -oE '^mysql.?\s') start
+ /usr/bin/mysqladmin -u root password $MYSQL_PASSWORD
+ fi
+ service rabbitmq-server start
+ mysql -uroot -p$MYSQL_PASSWORD -Bse "create database heat"
+ sed -i "/^\[database\]/a connection=mysql://root:$MYSQL_PASSWORD@localhost/heat" $conf_file
+ heat-manage -d db_sync
+ if [ "$?" != "0" ]
+ then
+ echo "Couldn't execute 'heat-manage db_sync'"
+ RES=1
+ fi
}
case $package in
- openstack-heat-common)
+ openstack-heat-common)
python -c 'import heat'
if [ $? -ne '0' ]; then
echo -e "Couldn't import module 'heat'"
files="policy.json api-paste.ini heat.conf"
for i in $config_files; do
if [ ! -f "/etc/heat/$i" ]; then
- RES=1
- echo "File /etc/heat/$i doesn't exist"
+ RES=1
+ echo "File /etc/heat/$i doesn't exist"
fi
done
- ;;
- python-heat)
+ ;;
+ python-heat)
python -c 'import heat'
if [ $? -ne '0' ]; then
echo -e "Couldn't import module 'heat'"
RES=1
fi
- ;;
- heat-common)
+ ;;
+ heat-common)
if [ -z "$(cut -d: -f1 /etc/passwd | grep 'heat')" ]; then
echo -e "User 'heat' doesn't exist"
RES=1
files="policy.json api-paste.ini heat.conf"
for i in $config_files; do
if [ ! -f "/etc/heat/$i" ]; then
- RES=1
- echo "File /etc/heat/$i doesn't exist"
+ RES=1
+ echo "File /etc/heat/$i doesn't exist"
fi
done
- ;;
- heat-api|openstack-heat-api)
+ ;;
+ heat-api|openstack-heat-api)
prepare_vm
screen -dmS heat-api
- sleep 2
+ sleep 3
echo "Starting Heat API..."
screen -S heat-api -p 0 -X stuff "heat-api --config-file $conf_file -d --log-file /tmp/heat-api.log 2>>/tmp/heat-api.log
-"
- sleep 5
+ "
+ sleep 7
curl_req=`curl http://localhost:8004/v1/tenant/stacks`
cat /tmp/heat-api.log
if [ `netstat -nat | grep 8004 | wc -l` != 0 ] && [[ $curl_req =~ Auth ]]
echo "Heat API didn't start"
RES=1
fi
- ;;
- heat-engine|openstack-heat-engine)
+ ;;
+ heat-engine|openstack-heat-engine)
prepare_vm
screen -dmS heat-engine
- sleep 2
+ sleep 3
echo "Starting Heat Engine..."
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
+ "
+ sleep 7
cat /tmp/heat-engine.log
trace_count=`cat /tmp/heat-engine.log | grep -i Traceback | wc -l`
if [ "$trace_count" -ne "0" ]
then
- echo "Something went wrong! Log file have trace errors! Check logs"
- RES=1
+ echo "Something went wrong! Log file have trace errors! Check logs"
+ RES=1
+ else
+ rabbit_connections=`cat /tmp/heat-engine.log | grep 'Connected to AMQP server on' | wc -l`
+ if [ "$rabbit_connections" -eq "0" ]
+ then
+ echo "Heat Engine: Can't connected to RabbitMQ"
+ RES=1
+ else
+ echo "Heat Engine successfully started"
+ fi
+ fi
+ ;;
+ heat-docker|openstack-heat-docker)
+ prepare_vm
+ screen -dmS heat-engine
+ sleep 3
+ 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 7
+ 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
- rabbit_connections=`cat /tmp/heat-engine.log | grep 'Connected to AMQP server on' | wc -l`
- if [ "$rabbit_connections" -eq "0" ]
- then
- echo "Heat Engine: Can't connected to RabbitMQ"
- RES=1
- else
- echo "Heat Engine successfully started"
- fi
+ 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-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)
+ ;;
+ heat-api-cfn|openstack-heat-api-cfn)
prepare_vm
screen -dmS heat-api-cfn
- sleep 2
+ sleep 3
echo "Starting Heat API CFN..."
screen -S heat-api-cfn -p 0 -X stuff "heat-api-cfn --config-file $conf_file -d --log-file /tmp/heat-api-cfn.log 2>>/tmp/heat-api-cfn.log
-"
- sleep 5
+ "
+ sleep 7
cat /tmp/heat-api-cfn.log
check_start_cfn=`cat /tmp/heat-api-cfn.log | grep 'Starting Heat API on' | wc -l`
if [ "$check_start_cfn" -ne "0" ]
RES=1
echo "Heat API CFN didn't start"
fi
- ;;
- heat-api-cloudwatch|openstack-heat-api-cloudwatch)
+ ;;
+ heat-api-cloudwatch|openstack-heat-api-cloudwatch)
prepare_vm
screen -dmS heat-api-clw
- sleep 2
+ sleep 3
echo "Starting Heat API Cloudwatch..."
screen -S heat-api-clw -p 0 -X stuff "heat-api-cloudwatch --config-file $conf_file -d --log-file /tmp/heat-api-clw.log 2>>/tmp/heat-api-clw.log
-"
- sleep 5
+ "
+ sleep 7
cat /tmp/heat-api-clw.log
check_start_clw=`cat /tmp/heat-api-clw.log | grep 'Starting Heat CloudWatch API on' | wc -l`
if [ "$check_start_clw" -ne "0" ]
RES=1
echo "Heat API Cloudwatch didn't start"
fi
- ;;
- *)
+ ;;
+ *)
echo "test not defined, skipping..."
- ;;
+ ;;
esac
killall -15 screen
exit $RES
--- /dev/null
+heat (2015.1.0-1~u14.04+mos1) mos7.0; urgency=medium
+
+ * Update version to 2015.1.0 according to current Kilo tag
+ * Add to Depends:
+ - oslo-concurrency
+ - oslo-context
+ - oslo-log
+ - oslo-middleware
+ - oslo-serialization
+ - osprofiler
+ - oslo-versionedobjects
+ * Update requirements according to global requirements
+ https://github.com/openstack/requirements/blob/stable/kilo/global-requirements.txt
+ * Sources are based on commit
+ 9d84d224e23c35f3d2f187a00934a7b7ee1fb380 from 6.1
+ and https://launchpad.net/ubuntu/vivid/+source/heat
+
+ -- Daniil Trishkin <dtrishkin@mirantis.com> Wed, 29 Apr 2015 11:20:02 +0300
Source: heat
Section: web
Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
-Uploaders:
- Loic Dachary (OuoU) <loic@debian.org>,
- Julien Danjou <acid@debian.org>,
- Thomas Goirand <zigo@debian.org>,
- Ghe Rivero <ghe.rivero@stackops.com>,
- Mehdi Abaakouk <sileht@sileht.net>
+Maintainer: MOS Heat Team <mos-heat@mirantis.com>
Build-Depends:
debhelper (>= 9),
- python-all (>= 2.6.6-3~),
- python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0),
+ dh-systemd,
+ openstack-pkg-tools (>= 21),
+ python-all (>= 2.7.1),
+ python-pbr (>= 0.10),
Build-Depends-Indep:
- python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0),
- python-babel,
- python-stevedore,
- python-boto,
- python-ceilometerclient,
- python-cinderclient,
- python-coverage,
- python-crypto,
- python-eventlet,
+ python-alembic,
+ python-babel (>= 1.3),
+ python-boto (>= 2.32.1),
+ python-ceilometerclient (>= 1.0.13),
+ python-cinderclient (>= 1:1.1.0),
+ python-coverage (>= 3.6),
+ python-crypto (>= 2.6),
+ python-eventlet (>= 0.16.1),
python-extras,
- python-glanceclient,
- python-greenlet,
- python-heatclient,
- python-httplib2,
- python-iso8601,
- python-keystoneclient,
- python-kombu,
- python-lockfile,
- python-lxml,
- python-memcache,
- python-migrate,
- python-mox,
- python-netaddr,
- python-neutronclient,
- python-novaclient,
- python-oslo.config,
- python-oslo.config,
- python-oslo.i18n,
- python-oslo.messaging,
- python-oslo.db,
- python-oslosphinx,
- python-paramiko,
+ python-glanceclient (>= 1:0.15.0),
+ python-greenlet (>= 0.3.2),
+ python-hacking (>= 0.10.0),
+ python-heatclient (>= 0.3.0),
+ python-httplib2 (>= 0.7.5),
+ python-iso8601 (>= 0.1.9),
+ python-keystoneclient (>= 1:1.1.0),
+ python-keystonemiddleware (>= 1.5.0),
+ python-kombu (>= 2.5.0),
+ python-lockfile (>= 1:0.8),
+ python-lxml (>= 2.3),
+ python-memcache (>= 1.48),
+ python-migrate (>= 0.9.5),
+ python-mock (>= 1.0),
+ python-mox (>= 0.5.3),
+ python-mysqldb,
+ python-netaddr (>= 0.7.12),
+ python-neutronclient (>= 1:2.3.11),
+ python-novaclient (>= 1:2.22.0),
+ python-oslo-concurrency (>= 1.8.0),
+ python-oslo-config (>= 1:1.9.3),
+ python-oslo-context (>= 0.2.0),
+ python-oslo-db (>= 1.7.0),
+ python-oslo-i18n (>= 1.5.0),
+ python-oslo-log (>= 1.0.0),
+ python-oslo-messaging (>= 1.8.0),
+ python-oslo-middleware (>= 1.0.0),
+ python-oslo-serialization (>= 1.4.0),
+ python-oslo-utils (>= 1.4.0),
+ python-oslosphinx (>= 2.5.0),
+ python-oslotest (>= 1.5.1),
+ python-osprofiler (>= 0.3.0),
+ python-paramiko (>= 1.13.0),
python-paste,
- python-pastedeploy,
- python-routes,
- python-requests,
- python-saharaclient,
+ python-pastedeploy (>= 1.5.0),
+ python-posix-ipc,
+ python-psycopg2,
+ python-requests (>= 2.2.0),
+ python-routes (>= 1.12.3),
+ python-saharaclient (>= 0.8.0),
python-setuptools,
- python-six,
- python-sphinx (>= 1.1.2), python-sphinx (<< 1.2.0) | python-sphinx (>> 1.2.0),
- python-sqlalchemy,
- python-swiftclient,
- python-testrepository,
- python-testscenarios,
- python-testtools,
- python-troveclient,
- python-webob,
- python-yaml,
- testrepository
-Standards-Version: 3.9.4
-Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/heat/juno/files
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/heat/juno
+ python-six (>= 1.9.0),
+ python-sphinx (>= 1.1.2),
+ python-sqlalchemy (>= 0.9.7),
+ python-stevedore (>= 1.3.0),
+ python-swiftclient (>= 1:2.2.0),
+ python-testrepository (>= 0.0.18),
+ python-testscenarios (>= 0.4),
+ python-testtools (>= 0.9.36),
+ python-troveclient (>= 1:1.0.7),
+ python-webob (>= 1.2.3),
+ python-yaml (>= 3.1.0),
+ subunit,
+ testrepository (>= 0.0.18),
+Standards-Version: 3.9.6
Homepage: http://wiki.openstack.org/Heat
XS-Testsuite: autopkgtest
+
+Package: heat-api-cloudwatch
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${ostack-lsb-base},
+ ${python:Depends},
+ adduser,
+ heat-common (= ${binary:Version}),
+Description: OpenStack orchestration service - CloudWatch API
+ 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 CloudWatch API.
+
+
+Package: heat-api-cfn
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${ostack-lsb-base},
+ ${python:Depends},
+ adduser,
+ heat-common (= ${binary:Version}),
+Description: OpenStack orchestration service - CFN API
+ 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 CloudFormation (CFN) API.
+
+
Package: python-heat
-Section: python
Architecture: all
+Section: python
Depends:
- python-argparse,
+ ${misc:Depends},
+ ${python:Depends},
+ python-alembic,
python-babel (>= 1.3),
+ python-boto (>= 2.32.1),
+ python-ceilometerclient (>= 1.0.13),
+ python-cinderclient (>= 1:1.1.0),
+ python-coverage (>= 3.6),
+ python-crypto (>= 2.6),
python-eventlet (>= 0.16.1),
+ python-extras,
+ python-glanceclient (>= 1:0.15.0),
python-greenlet (>= 0.3.2),
+ python-hacking (>= 0.10.0),
+ python-heatclient (>= 0.3.0),
python-httplib2 (>= 0.7.5),
python-iso8601 (>= 0.1.9),
- python-keystonemiddleware (>= 1.0.0),
+ python-keystoneclient (>= 1:1.1.0),
+ python-keystonemiddleware (>= 1.5.0),
python-kombu (>= 2.5.0),
+ python-lockfile (>= 1:0.8),
python-lxml (>= 2.3),
+ python-memcache (>= 1.48),
+ python-migrate (>= 0.9.5),
+ python-mysqldb,
python-netaddr (>= 0.7.12),
- 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.4.0),
- python-oslo.middleware (>= 0.3.0),
- python-oslo.serialization (>= 1.2.0),
- python-oslo.utils (>= 1.2.0),
+ python-neutronclient (>= 1:2.3.11),
+ python-novaclient (>= 1:2.22.0),
+ python-oslo-concurrency (>= 1.8.0),
+ python-oslo-config (>= 1:1.9.3),
+ python-oslo-context (>= 0.2.0),
+ python-oslo-db (>= 1.7.0),
+ python-oslo-i18n (>= 1.5.0),
+ python-oslo-log (>= 1.0.0),
+ python-oslo-messaging (>= 1.8.0),
+ python-oslo-middleware (>= 1.0.0),
+ python-oslo-serialization (>= 1.4.0),
+ python-oslo-utils (>= 1.4.0),
+ python-oslo-versionedobjects (>= 0.1.1),
+ python-oslosphinx (>= 2.5.0),
python-osprofiler (>= 0.3.0),
+ python-paste,
python-pastedeploy (>= 1.5.0),
- python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7),
+ python-pbr (>= 0.10),
python-posix-ipc,
- python-crypto (>= 2.6),
- python-ceilometerclient (>= 1.0.6),
- python-cinderclient (>= 1.1.0),
- python-glanceclient (>= 0.15.0),
- python-heatclient (>= 0.2.9),
- python-keystoneclient (>= 1:1.0.0),
- python-neutronclient (>= 1:2.3.6),
- python-novaclient (>= 1:2.18.0),
- python-saharaclient (>= 0.7.6),
+ python-psycopg2,
+ python-requests (>= 2.2.0),
+ python-routes (>= 1.12.3),
+ python-saharaclient (>= 0.8.0),
+ python-setuptools,
+ python-six (>= 1.9.0),
+ python-sphinx (>= 1.1.2),
+ python-sqlalchemy (>= 0.9.7),
+ python-stevedore (>= 1.3.0),
python-swiftclient (>= 1:2.2.0),
- python-troveclient (>= 1.0.7),
- python-yaml (>= 3.1.0),
- python-qpid,
- python-requests (>= 2.2.0), python-requests (<< 2.4.0) | python-requests (>> 2.4.0),
- python-routes (>= 1.12.3), python-routes ( << 2.0) | python-routes (>> 2.0),
- python-six (>= 1.7.0),
- python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.8.99) | python-sqlalchemy (>= 0.9.7), python-sqlalchemy ( << 0.9.99),
- python-migrate (>= 0.9.1), python-migrate ( << 0.9.2) | python-migrate (>> 0.9.2),
- python-stevedore (>= 1.1.0),
+ python-troveclient (>= 1:1.0.7),
python-webob (>= 1.2.3),
- python-boto (>= 2.4),
- python-extras,
- python-memcache,
- python-mysqldb,
- python-paste,
- python-setuptools,
- ${misc:Depends},
- ${python:Depends}
+ python-yaml (>= 3.1.0),
Description: OpenStack orchestration service - Python files
Heat is a service to orchestrate multiple composite cloud applications using
templates, through both an OpenStack-native ReST API and a
.
This package contains the Python libraries.
-Package: heat-common
+
+Package: heat-api
Architecture: all
Depends:
- adduser,
- python-heat (=${binary:Version}),
${misc:Depends},
- ${python:Depends}
-Description: OpenStack orchestration service - common files
+ ${ostack-lsb-base},
+ ${python:Depends},
+ adduser,
+ heat-common (= ${binary:Version}),
+Description: OpenStack orchestration service - ReST API
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 common files.
+ This package contains the ReST API.
+
Package: heat-docker
Architecture: all
.
This package contains the heat engine docker resource.
+
Package: heat-engine
Architecture: all
Depends:
- adduser,
- heat-common (=${binary:Version}),
${misc:Depends},
${ostack-lsb-base},
- ${python:Depends}
+ ${python:Depends},
+ adduser,
+ heat-common (= ${binary:Version}),
Description: OpenStack orchestration service - engine
Heat is a service to orchestrate multiple composite cloud applications using
templates, through both an OpenStack-native ReST API and a
This package contains the heat engine, which is the core service of heat, and
which the API servers will use.
-Package: heat-api
-Architecture: all
-Depends:
- adduser,
- heat-common (=${binary:Version}),
- ${misc:Depends},
- ${ostack-lsb-base},
- ${python:Depends}
-Description: OpenStack orchestration service - ReST API
- 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 ReST API.
-Package: heat-api-cfn
+Package: heat-common
Architecture: all
Depends:
- adduser,
- heat-common (=${binary:Version}),
${misc:Depends},
- ${ostack-lsb-base},
- ${python:Depends}
-Description: OpenStack orchestration service - CFN API
- 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 CloudFormation (CFN) API.
-
-Package: heat-api-cloudwatch
-Architecture: all
-Depends:
+ ${python:Depends},
adduser,
- heat-common (=${binary:Version}),
- ${misc:Depends},
- ${ostack-lsb-base},
- ${python:Depends}
-Description: OpenStack orchestration service - CloudWatch API
+ python-heat (= ${binary:Version}),
+Description: OpenStack orchestration service - common files
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 CloudWatch API.
+ This package contains the common files.
+
--- /dev/null
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: heat-api-cfn
+# Required-Start: $network $local_fs $remote_fs $syslog
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Heat CFN API
+# Description: Heat CFN API server
+### END INIT INFO
+
+# Author: Thomas Goirand <zigo@debian.or>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Heat API"
+PROJECT_NAME=heat
+NAME=${PROJECT_NAME}-api-cfn
--- /dev/null
+#doc/build/man/heat-api-cfn.1
--- /dev/null
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: heat-api-cloudwatch
+# Required-Start: $network $local_fs $remote_fs $syslog
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Heat cloudwatch API
+# Description: Heat cloudwatch API server
+### END INIT INFO
+
+# Author: Thomas Goirand <zigo@debian.or>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Heat API"
+PROJECT_NAME=heat
+NAME=${PROJECT_NAME}-api-cloudwatch
--- /dev/null
+#doc/build/man/heat-api-cloudwatch.1
--- /dev/null
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: heat-api
+# Required-Start: $network $local_fs $remote_fs $syslog
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Heat API
+# Description: Heat API server
+### END INIT INFO
+
+# Author: Thomas Goirand <zigo@debian.or>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Heat API"
+PROJECT_NAME=heat
+NAME=${PROJECT_NAME}-api
--- /dev/null
+#doc/build/man/heat-api.1
-debian/heat.conf etc/heat
-/usr/bin/heat-manage
/usr/bin/heat-keystone-setup
-etc/heat/policy.json
+/usr/bin/heat-manage
etc/heat/api-paste.ini
+etc/heat/heat.conf etc/heat
+etc/heat/policy.json
--- /dev/null
+/var/log/heat/*.log {
+ daily
+ missingok
+ compress
+ delaycompress
+ copytruncate
+ notifempty
+}
--- /dev/null
+#doc/build/man/heat-keystone-setup.1
set -e
if [ "$1" = "configure" ] ; then
- if ! getenv group heat > /dev/null 2>&1; then
+ if ! getent group heat > /dev/null 2>&1; then
addgroup --system heat >/dev/null
fi
- if ! getenv passwd heat > /dev/null 2>&1; then
+ if ! getent passwd heat > /dev/null 2>&1; then
adduser --system --home /var/lib/heat --ingroup heat --no-create-home \
--shell /bin/false heat
fi
--- /dev/null
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: heat-engine
+# Required-Start: $network $local_fs $remote_fs $syslog
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Heat Engine
+# Description: Heat Engine server
+### END INIT INFO
+
+# Author: Thomas Goirand <zigo@debian.or>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Heat Engine"
+PROJECT_NAME=heat
+NAME=${PROJECT_NAME}-engine
-usr/bin/heat-engine
etc/heat/environment.d
+usr/bin/heat-engine
--- /dev/null
+#doc/build/man/heat-engine.1
Description: Default to using sqlite
Author: James Page <james.page@ubuntu.com>
Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/etc/heat/heat.conf.sample b/etc/heat/heat.conf.sample
-index d2ca058..658cb5a 100644
+index 06ca086..3b980ab 100644
--- a/etc/heat/heat.conf.sample
+++ b/etc/heat/heat.conf.sample
-@@ -809,7 +809,7 @@
+@@ -858,7 +858,7 @@
# Deprecated group/name - [DEFAULT]/sql_connection
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
--- /dev/null
+diff -Naurp heat-2015.1.0.orig/requirements.txt heat-2015.1.0/requirements.txt
+--- heat-2015.1.0.orig/requirements.txt 2015-04-30 14:01:47.000000000 +0200
++++ heat-2015.1.0/requirements.txt 2015-04-30 14:44:43.546753986 +0200
+@@ -38,9 +38,8 @@ python-saharaclient>=0.8.0,<0.9.0
+ python-swiftclient>=2.2.0,<2.5.0
+ python-troveclient>=1.0.7,<1.1.0
+ PyYAML>=3.1.0
+-qpid-python
+ requests>=2.2.0,!=2.4.0
+-Routes>=1.12.3,!=2.0
++Routes>=1.12.3
+ six>=1.9.0
+ SQLAlchemy>=0.9.7,<=0.9.99
+ sqlalchemy-migrate>=0.9.5
--- /dev/null
+Description: assertRegex is python3; fallback to py2 version
+Author: James Page <james.page@ubuntu.com>
+Forwarded: no
+
+--- a/heat/tests/test_software_deployment.py
++++ b/heat/tests/test_software_deployment.py
+@@ -877,7 +877,7 @@ class SoftwareDeploymentTest(common.Heat
+ '^http://192.0.2.1/v1/AUTH_test_tenant_id/'
+ '(software_deployment_test_stack-deployment_mysql-.*)/(.*)'
+ '\\?temp_url_sig=.*&temp_url_expires=\\d*$')
+- self.assertRegex(temp_url, temp_url_pattern)
++ self.assertRegexpMatches(temp_url, temp_url_pattern)
+ m = temp_url_pattern.search(temp_url)
+ object_name = m.group(2)
+ self.assertEqual(container, m.group(1))
--- /dev/null
+#default-sqlite.patch
+fix-requirements.patch
+sudoers_patch.patch
+#default-log-dir.patch
+fixup-assert-regex.patch
--- /dev/null
+diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py
+index 1bccb8f..47c1865 100644
+--- a/heat/tests/test_parser.py
++++ b/heat/tests/test_parser.py
+@@ -914,7 +914,10 @@ class StackTest(common.HeatTestCase):
+ super(StackTest, self).setUp()
+
+ self.username = 'parser_stack_test_user'
+- self.tmpl = parser.Template(copy.deepcopy(empty_template))
++ try:
++ self.tmpl = parser.Template(copy.deepcopy(empty_template))
++ except:
++ self.skipTest('Skipped by Ubuntu')
+
+ self.ctx = utils.dummy_context()
+
+diff --git a/heat_integrationtests/common/test.py b/heat_integrationtests/common/test.py
+index 2973964..6e2e30b 100644
+--- a/heat_integrationtests/common/test.py
++++ b/heat_integrationtests/common/test.py
+@@ -68,8 +68,11 @@ class HeatIntegrationTest(testtools.TestCase):
+
+ self.conf = config.init_conf()
+
+- self.assertIsNotNone(self.conf.auth_url,
+- 'No auth_url configured')
++ try:
++ self.assertIsNotNone(self.conf.auth_url,
++ 'No auth_url configured')
++ except:
++ self.skipTest('Environment not set up')
+ self.assertIsNotNone(self.conf.username,
+ 'No username configured')
+ self.assertIsNotNone(self.conf.password,
+diff --git a/heat_integrationtests/functional/test_update.py b/heat_integrationtests/functional/test_update.py
+index 8cfb5c3..2c5b743 100644
+--- a/heat_integrationtests/functional/test_update.py
++++ b/heat_integrationtests/functional/test_update.py
+@@ -35,6 +35,7 @@ resources:
+ type: OS::Heat::RandomString
+ '''
+
++ @testtools.skip("Skipped by Ubuntu")
+ def setUp(self):
+ super(UpdateStackTest, self).setUp()
+ self.client = self.orchestration_client
Description: Change sudoers directory to be sudoers.d
Author: Chuck Short <zulcss@ubuntu.com>
Forwarded: Not needed.
-diff -Naurp heat-2014.1.rc2.orig/heat/engine/resources/nova_utils.py heat-2014.1.rc2/heat/engine/resources/nova_utils.py
---- heat-2014.1.rc2.orig/heat/engine/resources/nova_utils.py 2014-04-10 03:27:34.000000000 -0400
-+++ heat-2014.1.rc2/heat/engine/resources/nova_utils.py 2014-04-11 15:33:08.870985000 -0400
-@@ -198,8 +198,8 @@ def build_userdata(resource, userdata=No
+--- a/heat/engine/nova_utils.py
++++ b/heat/engine/nova_utils.py
+@@ -171,8 +171,8 @@
#
# See bug https://bugs.launchpad.net/heat/+bug/1257410
boothook_custom_user = r"""useradd -m %s
--- /dev/null
+oslo.rootwrap python-oslo-rootwrap
+oslo.vmware python-oslo-vmware
+oslo.concurrency python-oslo-concurrency
+oslo.config python-oslo-config
+oslo.context python-oslo-context
+oslo.log python-oslo-log
+oslo.i18n python-oslo-i18n
+oslo.versionedobjects python-oslo-versionedobjects
+oslo.db python-oslo-db
+oslo.serialization python-oslo-serialization
+oslo.middleware python-oslo-middleware
+oslo.utils python-oslo-utils
+oslo.messaging python-oslo-messaging
--- /dev/null
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+
+include /usr/share/openstack-pkg-tools/pkgos.make
+
+%:
+ dh $@ --buildsystem=python_distutils --with python2,systemd
+
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+override_dh_auto_test:
+ rm -rf .testrepository
+ testr init && \
+ set -e && \
+ TEMP_REZ=`mktemp -t` && \
+ testr run --subunit '^(?!heat_integrationtests)' | tee $$TEMP_REZ | subunit2pyunit; \
+ rm -f $$TEMP_REZ
+endif
+
+override_dh_clean:
+ dh_clean
+ rm -rf heat.egg-info
+ rm -rf doc/build
+ find . -iname '*.pyc' -delete
+ rm -f run_tests.err.log
+ rm -rf pbr*.egg
+ rm -f etc/heat/heat.conf
+ rm -f debian/*.init debian/*.service debian/*.upstart
+
+override_dh_install:
+ oslo-config-generator --config-file=config-generator.conf
+ cp etc/heat/heat.conf.sample etc/heat/heat.conf
+ dh_install
+
+#override_dh_installman:
+# python setup.py build
+# make -C doc man
+# dh_installman
Code Review / openstack-build / heat-build.git / commitdiff