From 9cd2fa921cdbf0e73bf5da05007fb47193ce5acc Mon Sep 17 00:00:00 2001
From: Ryan Brady <rbrady@redhat.com>
Date: Wed, 12 Nov 2014 18:34:01 -0500
Subject: [PATCH] Migrate heat-engine element to svc-map

This patch migrates the heat-engine element from map-services
to svc-map by adding a svc-map file and adding the -a option to
os-svc-install script calls.

Change-Id: I1dc31cf388cb26996d693554d3250a60a9b0e010
---
 elements/heat-engine/install.d/20-heat-crontab               | 1 +
 .../heat-engine/install.d/heat-source-install/10-heat-engine | 3 ++-
 .../os-refresh-config/configure.d/90-heat-db-sync            | 1 +
 .../os-refresh-config/post-configure.d/79-heat-engine        | 5 +++--
 elements/heat-engine/svc-map                                 | 3 +++
 5 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 elements/heat-engine/svc-map

diff --git a/elements/heat-engine/install.d/20-heat-crontab b/elements/heat-engine/install.d/20-heat-crontab
index 76e7523eb..04dd6593f 100755
--- a/elements/heat-engine/install.d/20-heat-crontab
+++ b/elements/heat-engine/install.d/20-heat-crontab
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -ue
+set -o pipefail
 
 # If https://bugs.launchpad.net/heat/+bug/1239377 is ever fixed we can
 # configure heat to purge automatically and remove this.
diff --git a/elements/heat-engine/install.d/heat-source-install/10-heat-engine b/elements/heat-engine/install.d/heat-source-install/10-heat-engine
index 2b3a1b059..556bd205a 100755
--- a/elements/heat-engine/install.d/heat-source-install/10-heat-engine
+++ b/elements/heat-engine/install.d/heat-source-install/10-heat-engine
@@ -1,9 +1,10 @@
 #!/bin/bash
 set -eu
+set -o pipefail
 
 cp -r /opt/stack/heat/etc/heat/environment.d /etc/heat
 cp -r /opt/stack/heat/etc/heat/templates /etc/heat
 
 ln -s $HEAT_VENV_DIR/bin/heat-manage /usr/local/bin/heat-manage
 
-os-svc-daemon -i "$HEAT_VENV_DIR" heat-engine heat heat-engine
+os-svc-daemon -a -i "$HEAT_VENV_DIR" heat-engine heat heat-engine
diff --git a/elements/heat-engine/os-refresh-config/configure.d/90-heat-db-sync b/elements/heat-engine/os-refresh-config/configure.d/90-heat-db-sync
index fcd7c13e0..12222a9a1 100755
--- a/elements/heat-engine/os-refresh-config/configure.d/90-heat-db-sync
+++ b/elements/heat-engine/os-refresh-config/configure.d/90-heat-db-sync
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eux
+set -o pipefail
 
 if os-is-bootstrap-host ; then
     sudo -u heat -- heat-manage db_sync
diff --git a/elements/heat-engine/os-refresh-config/post-configure.d/79-heat-engine b/elements/heat-engine/os-refresh-config/post-configure.d/79-heat-engine
index 24a4a9687..7928c7a71 100755
--- a/elements/heat-engine/os-refresh-config/post-configure.d/79-heat-engine
+++ b/elements/heat-engine/os-refresh-config/post-configure.d/79-heat-engine
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 set -eu
+set -o pipefail
 
-os-svc-enable -n heat-engine
+os-svc-enable -an heat-engine
 
-os-svc-restart -n heat-engine
+os-svc-restart -an heat-engine
diff --git a/elements/heat-engine/svc-map b/elements/heat-engine/svc-map
new file mode 100644
index 000000000..d7cf2efd7
--- /dev/null
+++ b/elements/heat-engine/svc-map
@@ -0,0 +1,3 @@
+heat-engine:
+  default: openstack-heat-engine
+  debian: heat-engine