Merge "Savanna: use heat infra engine if available"

2014-02-27 22:38:39 +00:00
parent a340d68b1b 6857dbb2b4
commit c7adccb548
1 changed files with 6 additions and 0 deletions
--- 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