Skip to content

Commit

Permalink
Merge "Bootstrap Keystone with versionless endpoints"
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed May 18, 2017
2 parents d192ebf + c0b5e8c commit 3eab9a2
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
upgrade:
- The keystone endpoints now have versionless URLs.
Any existing endpoints will be updated.
31 changes: 28 additions & 3 deletions tasks/keystone_service_setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
--bootstrap-role-name {{ keystone_role_name }} \
--bootstrap-service-name {{ keystone_service_name }} \
--bootstrap-region-id {{ keystone_service_region }} \
--bootstrap-admin-url {{ keystone_service_adminurl }} \
--bootstrap-public-url {{ keystone_service_publicurl }} \
--bootstrap-internal-url {{ keystone_service_internalurl }}
--bootstrap-admin-url {{ keystone_service_adminuri }} \
--bootstrap-public-url {{ keystone_service_publicuri }} \
--bootstrap-internal-url {{ keystone_service_internaluri }}
become: yes
become_user: "{{ keystone_system_user_name }}"
changed_when: false
Expand Down Expand Up @@ -136,3 +136,28 @@
until: add_service|success
retries: 5
delay: 10

# Create an endpoint
- name: Update Keystone endpoint
keystone:
command: "ensure_endpoint"
login_user: "{{ keystone_admin_user_name }}"
login_password: "{{ keystone_auth_admin_password }}"
login_project_name: "{{ keystone_admin_tenant_name }}"
endpoint: "{{ keystone_service_adminuri_proto }}://{{ ansible_host }}:{{ keystone_admin_port }}/v3"
ignore_catalog: True
region_name: "{{ keystone_service_region }}"
service_name: "{{ keystone_service_name }}"
service_type: "{{ keystone_service_type }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
endpoint_list:
- url: "{{ keystone_service_publicuri }}"
interface: "public"
- url: "{{ keystone_service_internaluri }}"
interface: "internal"
- url: "{{ keystone_service_adminuri }}"
interface: "admin"
register: add_service
until: add_service|success
retries: 5
delay: 10

0 comments on commit 3eab9a2

Please sign in to comment.