openstack/kolla-ansible
Code Issues Proposed changes

Add ADMIN_USER_PASSWORD to genenv tool

Browse Source 
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
This commit is contained in:
Steven Dake 2015-03-20 13:31:45 -07:00
parent ed617a59f8
commit 3f4c45fac5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/integration-guide.md
View File

@ -41,6 +41,7 @@ all containers. This allows a simple method of ensuring every type of node
### Environment Variable KEY/VALUE pairs ### Environment Variable KEY/VALUE pairs
ADMIN_USER_PASSWORD=<steakfordinner> - The admin user password
ADMIN_TENANT_NAME=<admin> - tenant name ADMIN_TENANT_NAME=<admin> - tenant name
DB_ROOT_PASSWORD=<mysql root password> - defines the MYSQL root password DB_ROOT_PASSWORD=<mysql root password> - defines the MYSQL root password
FLAT_INTERFACE=<nova or neutron networking flat interface device name> FLAT_INTERFACE=<nova or neutron networking flat interface device name>

6
tools/genenv
View File

@ -19,6 +19,9 @@ MY_DEV=$(ip route get $(ip route | awk '$1 == "default" {print $3}') |
echo MY_IP=$MY_IP echo MY_IP=$MY_IP
echo MY_DEV=$MY_DEV echo MY_DEV=$MY_DEV
# Admin user password
ADMIN_USER_PASSWORD=steakfordinner
# Database # Database
HOST_IP=$MY_IP HOST_IP=$MY_IP
MYSQL_ROOT_PASSWORD=kolla MYSQL_ROOT_PASSWORD=kolla
@ -65,11 +68,12 @@ CONFIG_NETWORK=True
cat > ./openrc <<EOF cat > ./openrc <<EOF
export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0" export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0"
export OS_USERNAME=$ADMIN_TENANT_NAME export OS_USERNAME=$ADMIN_TENANT_NAME
export OS_PASSWORD=$PASSWORD export OS_PASSWORD=$ADMIN_USER_PASSWORD
export OS_TENANT_NAME=$ADMIN_TENANT_NAME export OS_TENANT_NAME=$ADMIN_TENANT_NAME
EOF EOF
cat > ./compose/openstack.env <<EOF cat > ./compose/openstack.env <<EOF
ADMIN_USER_PASSWORD=$ADMIN_USER_PASSWORD
ADMIN_TENANT_NAME=$ADMIN_TENANT_NAME ADMIN_TENANT_NAME=$ADMIN_TENANT_NAME
CONFIG_NETWORK=$CONFIG_NETWORK CONFIG_NETWORK=$CONFIG_NETWORK
DB_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD DB_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD