diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-20 19:14:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-20 19:14:28 +0000 |
| commit | ed617a59f80307920367050f63e316e3ef939825 (patch) | |
| tree | 799065e0659ed94deecd3325c10530a09b3f9af1 /docker | |
| parent | fb425db56db16ec4ac061a2ee49054eed4fc284a (diff) | |
| parent | 8eb36e7cde708c36074874401601744caed817c4 (diff) | |
| download | kolla-ed617a59f80307920367050f63e316e3ef939825.tar.gz kolla-ed617a59f80307920367050f63e316e3ef939825.zip | |
Merge "Fixes Keystone openrc and sets / for scripts"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/Dockerfile | 6 | ||||
| -rwxr-xr-x | docker/keystone/start.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile index 3be9ae3cc..7f1ade48f 100644 --- a/docker/keystone/Dockerfile +++ b/docker/keystone/Dockerfile @@ -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"] diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index 829caf6e9..2f6d902d6 100755 --- a/docker/keystone/start.sh +++ b/docker/keystone/start.sh @@ -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 |