From 552effa0d1debd8f042908ac040ee05bc3c84a46 Mon Sep 17 00:00:00 2001
From: inc0 <michal.jastrzebski@intel.com>
Date: Fri, 26 Jun 2015 12:02:16 +0200
Subject: [PATCH] Add missing Magnum vars
Add missing vars to genenv and integration guide Magnum requires.
Co-Authored-By: Jeff Peeler <jpeeler@redhat.com>
Change-Id: I615098cffc081a53127275a07e95fecc924a862c
Closes-Bug: #1468997
---
docs/integration-guide.md | 2 ++
tools/genenv | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/docs/integration-guide.md b/docs/integration-guide.md
index c2bfe3c612..14ae8138ec 100755
--- a/docs/integration-guide.md
+++ b/docs/integration-guide.md
@@ -132,7 +132,9 @@ all containers. This allows a simple method of ensuring every type of node
RABBIT_PASSWORD=<password> - The RabbitMQ password
RABBIT_USERID=<rabbit> - The RabbitMQ user id on the host
MAGNUM_DB_NAME=<magnum> - The Magnum database name
+ MAGNUM_DB_USER=<magnum> - The Magnum database username
MAGNUM_DB_PASSWORD=<kolla> - The Magnum database password
+ MAGNUM_KEYSTONE_USER=<magnum> - The Magnum keystone username
MAGNUM_KEYSTONE_PASSWORD=<magnum> - The Magnum keystone password
MAGNUM_API_SERVICE_HOST=<IP> - The Magnum Host IP address
MAGNUM_API_SERVICE_PORT=<9511> - The Magnum port
diff --git a/tools/genenv b/tools/genenv
index 535d7356cc..1c743f57fb 100755
--- a/tools/genenv
+++ b/tools/genenv
@@ -167,7 +167,9 @@ HEAT_DOMAIN_PASS=$(openssl rand -hex 8)
# Magnum
MAGNUM_DB_NAME=magnum
+MAGNUM_DB_USER=magnum
MAGNUM_DB_PASSWORD=kolla
+MAGNUM_KEYSTONE_USER=magnum
MAGNUM_KEYSTONE_PASSWORD=magnum
MAGNUM_API_SERVICE_HOST=$HOST_IP
MAGNUM_API_SERVICE_PORT=9511
@@ -315,7 +317,9 @@ HEAT_API_CFN_SERVICE_PORT=$HEAT_API_CFN_SERVICE_PORT
HEAT_API_CFN_URL_HOST=$HEAT_API_CFN_URL_HOST
HEAT_DOMAIN_PASS=$HEAT_DOMAIN_PASS
MAGNUM_DB_NAME=$MAGNUM_DB_NAME
+MAGNUM_DB_USER=$MAGNUM_DB_USER
MAGNUM_DB_PASSWORD=$MAGNUM_DB_PASSWORD
+MAGNUM_KEYSTONE_USER=$MAGNUM_KEYSTONE_USER
MAGNUM_KEYSTONE_PASSWORD=$MAGNUM_KEYSTONE_PASSWORD
MAGNUM_API_SERVICE_HOST=$MAGNUM_API_SERVICE_HOST
PUBLIC_INTERFACE=$NOVA_PUBLIC_INTERFACE