From 5d82c788a8a3af943abf4001ab393bc490d9ad3a Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Wed, 12 Jun 2019 13:22:44 +0100
Subject: [PATCH] Remove mentions of UUID Keystone token provider
Keystone removed the UUID token provider in Rocky and Kolla Ansible
removed support for configuring it. This commit reflects these changes
in Kayobe.
Change-Id: I5a2c71e7e65f99687437f6a26a0c4a942022f4e9
---
ansible/roles/kolla-ansible/templates/globals.yml.j2 | 4 ++--
etc/kayobe/kolla/globals.yml | 6 ------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2
index edeab143..0a80a50e 100644
--- a/ansible/roles/kolla-ansible/templates/globals.yml.j2
+++ b/ansible/roles/kolla-ansible/templates/globals.yml.j2
@@ -187,8 +187,8 @@ enable_{{ feature_flag }}: {{ hostvars[inventory_hostname]['kolla_enable_' ~ fea
# Keystone - Identity Options
#############################
-# Valid options are [ uuid, fernet ]
-#keystone_token_provider: 'uuid'
+# Valid options are [ fernet ]
+#keystone_token_provider: 'fernet'
# Interval to rotate fernet keys by (in seconds). Must be an interval of
# 60(1 min), 120(2 min), 180(3 min), 240(4 min), 300(5 min), 360(6 min),
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 57af5bc0..794c5fee 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -1,8 +1,2 @@
---
# Add extra Kolla global configuration here.
-
-# Although Kolla-Ansible provides full support for Fernet tokens, it still
-# defaults to UUID. This setting overrides K-A and brings it in-line with
-# Keystone's default.
-#
-keystone_token_provider: 'fernet'
--
GitLab