summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2018-10-10 11:17:54 +0100
committerMark Goddard <mark@stackhpc.com>2018-10-10 11:17:54 +0100
commit43db47305c440c77cf10893c423dc0fc0daf4654 (patch)
tree1a9b2bf73dc2f00244d3f2984099ab4c6a0f7b27
parentebf93b8dc187a9e4f40a5b1c0e0a58e13ab44006 (diff)
Synchronise config with kayobe-config
Synchronises changes made to kayobe-config that were not synced back to kayobe. Change-Id: Ib5946ef9423818ebc76cc89d1662cf0076e2f288
Notes
Notes (review): Code-Review+2: Doug Szumski <doug@stackhpc.com> Workflow+1: Mark Goddard <mark@stackhpc.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 02 Nov 2018 10:22:02 +0000 Reviewed-on: https://review.openstack.org/609350 Project: openstack/kayobe Branch: refs/heads/master
-rw-r--r--etc/kayobe/inventory/group_vars/switches/interfaces12
-rw-r--r--etc/kayobe/kolla/globals.yml6
-rw-r--r--etc/kayobe/monitoring.yml2
-rw-r--r--etc/kayobe/overcloud.yml2
4 files changed, 8 insertions, 14 deletions
diff --git a/etc/kayobe/inventory/group_vars/switches/interfaces b/etc/kayobe/inventory/group_vars/switches/interfaces
deleted file mode 100644
index acab835..0000000
--- a/etc/kayobe/inventory/group_vars/switches/interfaces
+++ /dev/null
@@ -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.
12switch_interface_config: {}
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 794c5fe..57af5bc 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -1,2 +1,8 @@
1--- 1---
2# Add extra Kolla global configuration here. 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#
8keystone_token_provider: 'fernet'
diff --git a/etc/kayobe/monitoring.yml b/etc/kayobe/monitoring.yml
index a5dabbf..0b64855 100644
--- a/etc/kayobe/monitoring.yml
+++ b/etc/kayobe/monitoring.yml
@@ -23,7 +23,7 @@
23 23
24# Dict of monitoring node BIOS options. Format is same as that used by 24# Dict of monitoring node BIOS options. Format is same as that used by
25# stackhpc.drac role. 25# stackhpc.drac role.
26#monitoring_bios_config: 26#monitoring_bios_config:
27 27
28# Dict of default monitoring node BIOS options. Format is same as that used by 28# Dict of default monitoring node BIOS options. Format is same as that used by
29# stackhpc.drac role. 29# stackhpc.drac role.
diff --git a/etc/kayobe/overcloud.yml b/etc/kayobe/overcloud.yml
index 96001a6..0764600 100644
--- a/etc/kayobe/overcloud.yml
+++ b/etc/kayobe/overcloud.yml
@@ -34,7 +34,7 @@
34#overcloud_host_image_workaround_cloud_init_enabled: 34#overcloud_host_image_workaround_cloud_init_enabled:
35 35
36# cloud-init repository for overcloud_host_image_workaround_cloud_init_enabled 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# Dummy variable to allow Ansible to accept this file. 40# Dummy variable to allow Ansible to accept this file.