openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add missing Magnum vars"

Browse Source
This commit is contained in:
Jenkins 2015-06-26 21:03:55 +00:00 committed by Gerrit Code Review
commit 8708de74fb
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/integration-guide.md
View File

@ -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

4
tools/genenv
View File

@ -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