From 3f4c45fac55690e62d0ecfa4bdf47ee59912459b Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Fri, 20 Mar 2015 13:31:45 -0700
Subject: [PATCH] Add ADMIN_USER_PASSWORD to genenv tool

The genenv tool was generating the wrong password for the openrc
file as a result of recent keystone rework.  This patch fixes that
problem.

Change-Id: I169e3255e3f3ef57938861c31ef4e342d9a32cbc
---
 docs/integration-guide.md | 1 +
 tools/genenv              | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/integration-guide.md b/docs/integration-guide.md
index d1127896d4..3bd6e2af6b 100644
--- a/docs/integration-guide.md
+++ b/docs/integration-guide.md
@@ -41,6 +41,7 @@ all containers.  This allows a simple method of ensuring every type of node
 
 ### Environment Variable KEY/VALUE pairs
 
+    ADMIN_USER_PASSWORD=<steakfordinner> - The admin user password
     ADMIN_TENANT_NAME=<admin> - tenant name
     DB_ROOT_PASSWORD=<mysql root password> - defines the MYSQL root password
     FLAT_INTERFACE=<nova or neutron networking flat interface device name>
diff --git a/tools/genenv b/tools/genenv
index 91ac42cc43..cd2a3bd00c 100755
--- a/tools/genenv
+++ b/tools/genenv
@@ -19,6 +19,9 @@ MY_DEV=$(ip route get $(ip route | awk '$1 == "default" {print $3}') |
 echo MY_IP=$MY_IP
 echo MY_DEV=$MY_DEV
 
+# Admin user password
+ADMIN_USER_PASSWORD=steakfordinner
+
 # Database
 HOST_IP=$MY_IP
 MYSQL_ROOT_PASSWORD=kolla
@@ -65,11 +68,12 @@ CONFIG_NETWORK=True
 cat > ./openrc <<EOF
 export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0"
 export OS_USERNAME=$ADMIN_TENANT_NAME
-export OS_PASSWORD=$PASSWORD
+export OS_PASSWORD=$ADMIN_USER_PASSWORD
 export OS_TENANT_NAME=$ADMIN_TENANT_NAME
 EOF
 
 cat > ./compose/openstack.env <<EOF
+ADMIN_USER_PASSWORD=$ADMIN_USER_PASSWORD
 ADMIN_TENANT_NAME=$ADMIN_TENANT_NAME
 CONFIG_NETWORK=$CONFIG_NETWORK
 DB_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD