openstack/kolla-ansible
Code Issues Proposed changes

Keystone container should use the openstackclient

Browse Source 
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
This commit is contained in:
Sam Yaple 2015-08-29 10:11:42 +00:00
parent 5e521f0550
commit 7f17203406
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/keystone/tasks/bootstrap.yml
View File

@ -52,8 +52,8 @@
PUBLIC_URL: "http://{{ kolla_external_address }}:{{ keystone_public_port }}/v2.0"
INTERNAL_URL: "http://{{ kolla_internal_address }}:{{ keystone_public_port }}/v2.0"
ADMIN_URL: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}/v2.0"
OS_SERVICE_TOKEN: "{{ keystone_admin_token }}"
OS_SERVICE_ENDPOINT: "http://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_admin_port }}/v2.0"
OS_TOKEN: "{{ keystone_admin_token }}"
OS_URL: "http://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_admin_port }}/v2.0"
run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed

17
docker/keystone/start.sh
View File

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