Merge "Synchronise config with kayobe-config" into stable/queens

etc/kayobe/inventory/group_vars/switches/interfaces

@@ -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: {}

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'

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.

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.