From 5a06901664cd8d3bb326d9e731e7dd82eec54f35 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Sat, 2 May 2015 20:36:27 -0700
Subject: Add Magnum Containers as a Service to Kolla

This adds Magnum Containers as a Service to Kolla.

Change-Id: I572cd62845515f42a6a16291d2bd87ad8d972e24
Implements-blueprint: container-magnum
---
 tools/genenv | 12 ++++++++++++
 tools/kolla  |  1 +
 2 files changed, 13 insertions(+)

(limited to 'tools')

diff --git a/tools/genenv b/tools/genenv
index ecd648e5a..483c792dd 100755
--- a/tools/genenv
+++ b/tools/genenv
@@ -117,6 +117,13 @@ HEAT_API_SERVICE_HOST=$HOST_IP
 HEAT_API_CFN_SERVICE_HOST=$HOST_IP
 HEAT_API_CFN_URL_HOST=$HOST_IP
 
+# Magnum
+MAGNUM_DB_NAME=magnum
+MAGNUM_DB_PASSWORD=kolla
+MAGNUM_KEYSTONE_PASSWORD=magnum
+MAGNUM_API_SERVICE_HOST=$HOST_IP
+MAGNUM_API_SERVICE_PORT=9511
+
 cat > ./openrc <<EOF
 export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0"
 export OS_USERNAME=$ADMIN_TENANT_NAME
@@ -147,6 +154,7 @@ ADMIN_TENANT_NAME=$ADMIN_TENANT_NAME
 DB_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD
 FLAT_INTERFACE=$NOVA_FLAT_INTERFACE
 GLANCE_API_SERVICE_HOST=$GLANCE_API_SERVICE_HOST
+MAGNUM_API_SERVICE_HOST=$MAGNUM_API_SERVICE_PORT
 GLANCE_DB_NAME=$GLANCE_DB_NAME
 GLANCE_DB_PASSWORD=$GLANCE_DB_PASSWORD
 GLANCE_DB_USER=$GLANCE_DB_USER
@@ -192,6 +200,10 @@ HEAT_DB_NAME=$HEAT_DB_NAME
 HEAT_DB_PASSWORD=$HEAT_DB_PASSWORD
 HEAT_KEYSTONE_PASSWORD=$HEAT_KEYSTONE_PASSWORD
 HEAT_API_SERVICE_HOST=$HEAT_API_SERVICE_HOST
+MAGNUM_DB_NAME=$MAGNUM_DB_NAME
+MAGNUM_DB_PASSWORD=$MAGNUM_DB_PASSWORD
+MAGNUM_KEYSTONE_PASSWORD=$MAGNUM_KEYSTONE_PASSWORD
+MAGNUM_API_SERVICE_HOST=$MAGNUM_API_SERVICE_HOST
 PUBLIC_INTERFACE=$NOVA_PUBLIC_INTERFACE
 PUBLIC_IP=$HOST_IP
 PUBLIC_IP=$PUBLIC_IP
diff --git a/tools/kolla b/tools/kolla
index 805a5cca2..df69d64e8 100755
--- a/tools/kolla
+++ b/tools/kolla
@@ -38,6 +38,7 @@ function process_all {
         process neutron-agents
     fi
     process heat-api-engine
+    process magnum-api-conductor
     process horizon
 }
 
-- 
cgit v1.2.3