openstack/kolla-ansible
Code Issues Proposed changes

Merge "Keystone container should use the openstackclient"

Browse Source
This commit is contained in:
Jenkins 2015-08-31 11:12:29 +00:00 committed by Gerrit Code Review
commit 23e289ecc9
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" PUBLIC_URL: "http://{{ kolla_external_address }}:{{ keystone_public_port }}/v2.0"
INTERNAL_URL: "http://{{ kolla_internal_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" ADMIN_URL: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}/v2.0"
OS_SERVICE_TOKEN: "{{ keystone_admin_token }}" OS_TOKEN: "{{ keystone_admin_token }}"
OS_SERVICE_ENDPOINT: "http://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_admin_port }}/v2.0" OS_URL: "http://{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_admin_port }}/v2.0"
run_once: True run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed 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 $CMD
sleep 5 sleep 5
keystone service-create --name keystone --type identity \ openstack service create --name keystone --description "OpenStack Identity" identity
--description "OpenStack Identity" openstack endpoint create --region "${REGION_NAME}" \
keystone endpoint-create --region "${REGION_NAME}" \
--publicurl "${PUBLIC_URL}" \ --publicurl "${PUBLIC_URL}" \
--internalurl "${INTERNAL_URL}" \ --internalurl "${INTERNAL_URL}" \
--adminurl "${ADMIN_URL}" \ --adminurl "${ADMIN_URL}" \
--service-id $(keystone service-list | awk '/ identity / {print $2}') identity
openstack project create --description "Admin Project" admin
keystone tenant-create --description "Admin Project" --name admin openstack user create --password "${KEYSTONE_ADMIN_PASSWORD}" admin
keystone user-create --pass "${KEYSTONE_ADMIN_PASSWORD}" --name admin openstack role create admin
keystone role-create --name admin openstack role add --project admin --user admin admin
keystone user-role-add --user admin --tenant admin --role admin
exit 0 exit 0
fi fi