diff --git a/docs/integration-guide.md b/docs/integration-guide.md
index 47ce2ad545..0e130c2905 100755
--- a/docs/integration-guide.md
+++ b/docs/integration-guide.md
@@ -133,7 +133,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 e4cf50195b..28a11fda15 100755
--- a/tools/genenv
+++ b/tools/genenv
@@ -169,7 +169,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
@@ -320,7 +322,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