Browse Source

Synchronise config with kayobe-config

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

Change-Id: Ib5946ef9423818ebc76cc89d1662cf0076e2f288
tags/5.0.0.0rc1
Mark Goddard 7 months ago
parent
commit
43db47305c

+ 0
- 12
etc/kayobe/inventory/group_vars/switches/interfaces View File

@@ -1,12 +0,0 @@
1
----
2
-# Switch configuration.
3
-
4
-###############################################################################
5
-# Interface configuration.
6
-
7
-# Interface configuration. Dict mapping switch interface names to configuration
8
-# dicts. Each dict contains a description item and a 'config' item which should
9
-# contain a list of per-interface configuration.
10
-# Generally this should be configured on a per-switch basis via a host_vars
11
-# file.
12
-switch_interface_config: {}

+ 6
- 0
etc/kayobe/kolla/globals.yml View File

@@ -1,2 +1,8 @@
1 1
 ---
2 2
 # Add extra Kolla global configuration here.
3
+
4
+# Although Kolla-Ansible provides full support for Fernet tokens, it still
5
+# defaults to UUID.  This setting overrides K-A and brings it in-line with
6
+# Keystone's default.
7
+#
8
+keystone_token_provider: 'fernet'

+ 1
- 1
etc/kayobe/monitoring.yml View File

@@ -23,7 +23,7 @@
23 23
 
24 24
 # Dict of monitoring node BIOS options. Format is same as that used by
25 25
 # stackhpc.drac role.
26
-#monitoring_bios_config: 
26
+#monitoring_bios_config:
27 27
 
28 28
 # Dict of default monitoring node BIOS options. Format is same as that used by
29 29
 # stackhpc.drac role.

+ 1
- 1
etc/kayobe/overcloud.yml View File

@@ -34,7 +34,7 @@
34 34
 #overcloud_host_image_workaround_cloud_init_enabled:
35 35
 
36 36
 # cloud-init repository for overcloud_host_image_workaround_cloud_init_enabled
37
-#overcloud_host_image_workaround_cloud_init_repo: https://stackhpc.github.io/cloud-init-repo/
37
+#overcloud_host_image_workaround_cloud_init_repo:
38 38
 
39 39
 ###############################################################################
40 40
 # Dummy variable to allow Ansible to accept this file.

Loading…
Cancel
Save