openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fixes Keystone openrc and sets / for scripts"

Browse Source
This commit is contained in:
Jenkins 2015-03-20 19:14:28 +00:00 committed by Gerrit Code Review
commit ed617a59f8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/keystone/Dockerfile
View File

@ -7,8 +7,8 @@ RUN yum -y install openstack-keystone \
; yum clean all
# Add start-up and check scripts
ADD ./start.sh /opt/kolla/start.sh
ADD ./check.sh /opt/kolla/check.sh
ADD ./start.sh /start.sh
ADD ./check.sh /check.sh
# Run the Keystone start script
CMD ["/opt/kolla/start.sh"]
CMD ["/start.sh"]

4
docker/keystone/start.sh
View File

@ -106,8 +106,8 @@ crudini --set $cfg \
# Setup the openrc auth file
cat > /openrc <<EOF
export OS_AUTH_URL=http://"${KEYSTONE_PUBLIC_SERVICE_HOST}":"${KEYSTONE_PUBLIC_SERVICE_PORT}/v"${KEYSTONE_API_VERSION}"
export OS_USERNAME=admin
export OS_AUTH_URL=http://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v${KEYSTONE_API_VERSION}
export OS_USERNAME=${KEYSTONE_USER}
export OS_PASSWORD=${KEYSTONE_ADMIN_PASSWORD}
export OS_TENANT_NAME=${ADMIN_TENANT_NAME}
EOF