From c0b5e8c90a159e9930651da9d217176080b5ff82 Mon Sep 17 00:00:00 2001
From: ArchiFleKs <lefevre.kevin@gmail.com>
Date: Fri, 5 May 2017 11:18:11 +0200
Subject: [PATCH] Bootstrap Keystone with versionless endpoints

Change-Id: Id88657f2abb4bd0741751a6cf035d93ad62bc310
Depends-On: I8fce922e2907584138a132f37887f227eabe9abe
Partial-Bug: #1688320
---
 ...stone-endpoints-urls-679748dec6ee6dd7.yaml |  4 +++
 tasks/keystone_service_setup.yml              | 31 +++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/keystone-endpoints-urls-679748dec6ee6dd7.yaml

diff --git a/releasenotes/notes/keystone-endpoints-urls-679748dec6ee6dd7.yaml b/releasenotes/notes/keystone-endpoints-urls-679748dec6ee6dd7.yaml
new file mode 100644
index 00000000..d8ad6b1b
--- /dev/null
+++ b/releasenotes/notes/keystone-endpoints-urls-679748dec6ee6dd7.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - The keystone endpoints now have versionless URLs.
+    Any existing endpoints will be updated.
diff --git a/tasks/keystone_service_setup.yml b/tasks/keystone_service_setup.yml
index d57df7c3..3035630b 100644
--- a/tasks/keystone_service_setup.yml
+++ b/tasks/keystone_service_setup.yml
@@ -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
@@ -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