From 6857dbb2b4fb40a2ed3362ba46f7b130a85b2de1 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <slukjanov@mirantis.com>
Date: Tue, 25 Feb 2014 11:02:44 +0400
Subject: [PATCH] Savanna: use heat infra engine if available

In Savanna we have two provisioning engines:

* "savanna" that directly work with nova/neutron/glance/cinder/etc and
   we'd like to deprecate it early in Juno release cycle, but it's still
   useful due to the fact that it could work ok w/o Heat;
* "heat" engine uses Heat for provisioning of cluster resources, it's
   currently under active development and we're ready to make it default
   for OpenStack installations with enabled Heat.

Change-Id: I937337b3921e9e51768a118fb4b6bd95962622bd
---
 lib/savanna | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/savanna b/lib/savanna
index 954f0e711e..9feff236bc 100644
--- a/lib/savanna
+++ b/lib/savanna
@@ -135,6 +135,12 @@ function configure_savanna() {
         iniset $SAVANNA_CONF_FILE DEFAULT use_floating_ips true
     fi
 
+    if is_service_enabled heat; then
+        iniset $SAVANNA_CONF_FILE DEFAULT infrastructure_engine heat
+    else
+        iniset $SAVANNA_CONF_FILE DEFAULT infrastructure_engine savanna
+    fi
+
     iniset $SAVANNA_CONF_FILE DEFAULT use_syslog $SYSLOG
 
     recreate_database savanna utf8