From ba01a7504fbc9882fc2c0137105e0ab72cea4535 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 10 Oct 2018 11:17:54 +0100
Subject: [PATCH] Synchronise config with kayobe-config

Synchronises changes made to kayobe-config that were not synced back to kayobe.

Change-Id: Ib5946ef9423818ebc76cc89d1662cf0076e2f288
(cherry picked from commit 43db47305c440c77cf10893c423dc0fc0daf4654)
---
 etc/kayobe/inventory/group_vars/switches/interfaces | 12 ------------
 etc/kayobe/kolla/globals.yml                        |  6 ++++++
 etc/kayobe/monitoring.yml                           |  2 +-
 etc/kayobe/overcloud.yml                            |  2 +-
 4 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 etc/kayobe/inventory/group_vars/switches/interfaces

diff --git a/etc/kayobe/inventory/group_vars/switches/interfaces b/etc/kayobe/inventory/group_vars/switches/interfaces
deleted file mode 100644
index acab83512..000000000
--- a/etc/kayobe/inventory/group_vars/switches/interfaces
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# Switch configuration.
-
-###############################################################################
-# Interface configuration.
-
-# Interface configuration. Dict mapping switch interface names to configuration
-# dicts. Each dict contains a description item and a 'config' item which should
-# contain a list of per-interface configuration.
-# Generally this should be configured on a per-switch basis via a host_vars
-# file.
-switch_interface_config: {}
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 794c5fee5..57af5bc0f 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -1,2 +1,8 @@
 ---
 # 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'
diff --git a/etc/kayobe/monitoring.yml b/etc/kayobe/monitoring.yml
index a5dabbff3..0b64855c8 100644
--- a/etc/kayobe/monitoring.yml
+++ b/etc/kayobe/monitoring.yml
@@ -23,7 +23,7 @@
 
 # Dict of monitoring node BIOS options. Format is same as that used by
 # stackhpc.drac role.
-#monitoring_bios_config: 
+#monitoring_bios_config:
 
 # Dict of default monitoring node BIOS options. Format is same as that used by
 # stackhpc.drac role.
diff --git a/etc/kayobe/overcloud.yml b/etc/kayobe/overcloud.yml
index 96001a62f..0764600bb 100644
--- a/etc/kayobe/overcloud.yml
+++ b/etc/kayobe/overcloud.yml
@@ -34,7 +34,7 @@
 #overcloud_host_image_workaround_cloud_init_enabled:
 
 # cloud-init repository for overcloud_host_image_workaround_cloud_init_enabled
-#overcloud_host_image_workaround_cloud_init_repo: https://stackhpc.github.io/cloud-init-repo/
+#overcloud_host_image_workaround_cloud_init_repo:
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.