aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-29 10:11:42 +0000
committerSam Yaple <sam@yaple.net>2015-08-30 08:35:54 +0000
commit7f172034065a5b1b4e0b53f6c2c8108c5823a28b (patch)
tree3f20462ad8be0893f8bcdd15cc00d515b9ceeacd /docker
parent5e521f0550cab5989580fe1a92c112d367f33072 (diff)
downloadkolla-7f172034065a5b1b4e0b53f6c2c8108c5823a28b.tar.gz
kolla-7f172034065a5b1b4e0b53f6c2c8108c5823a28b.zip
Keystone container should use the openstackclient
Initially it did not use this client due to the fact that the client didn't seem to want to work in the containers. Now it works fine and it should be used instead of the deprecated keystone client Change-Id: Ib0e172c677e200e5df01c478b7ea257b30c0df0b Closes-Bug: #1490126
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/keystone/start.sh17
1 files changed, 7 insertions, 10 deletions
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index d964b0303..0f1dc7db0 100755
--- a/docker/keystone/start.sh
+++ b/docker/keystone/start.sh
@@ -29,19 +29,16 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
$CMD
sleep 5
- keystone service-create --name keystone --type identity \
- --description "OpenStack Identity"
- keystone endpoint-create --region "${REGION_NAME}" \
+ openstack service create --name keystone --description "OpenStack Identity" identity
+ openstack endpoint create --region "${REGION_NAME}" \
--publicurl "${PUBLIC_URL}" \
--internalurl "${INTERNAL_URL}" \
--adminurl "${ADMIN_URL}" \
- --service-id $(keystone service-list | awk '/ identity / {print $2}')
-
- keystone tenant-create --description "Admin Project" --name admin
- keystone user-create --pass "${KEYSTONE_ADMIN_PASSWORD}" --name admin
- keystone role-create --name admin
- keystone user-role-add --user admin --tenant admin --role admin
-
+ identity
+ openstack project create --description "Admin Project" admin
+ openstack user create --password "${KEYSTONE_ADMIN_PASSWORD}" admin
+ openstack role create admin
+ openstack role add --project admin --user admin admin
exit 0
fi