From bcae6dc7b8850869c685429cc388c063661a8bdf Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Mon, 31 Jan 2022 12:49:43 +0100
Subject: [PATCH] Sync kayobe-config with kayobe changes

Change-Id: I39113b819473e3b4a3819e2e03a69e59f3c13c46
---
 etc/kayobe/apt.yml     |  6 ++++++
 etc/kayobe/bifrost.yml |  9 ++++++++-
 etc/kayobe/globals.yml | 11 +++++++++++
 etc/kayobe/ipa.yml     |  4 ++--
 etc/kayobe/kolla.yml   |  1 -
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/etc/kayobe/apt.yml b/etc/kayobe/apt.yml
index 552a116cf..5f278e322 100644
--- a/etc/kayobe/apt.yml
+++ b/etc/kayobe/apt.yml
@@ -5,6 +5,12 @@
 # Apt cache TTL in seconds. Default is 3600.
 #apt_cache_valid_time:
 
+# Apt proxy URL for HTTP. Default is empty (no proxy).
+#apt_proxy_http:
+
+# Apt proxy URL for HTTPS. Default is {{ apt_proxy_http }}.
+#apt_proxy_https:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml
index 91c8bcc56..192195205 100644
--- a/etc/kayobe/bifrost.yml
+++ b/etc/kayobe/bifrost.yml
@@ -11,6 +11,10 @@
 # {{ openstack_branch }}.
 #kolla_bifrost_source_version:
 
+# Whether Bifrost uses firewalld. Default value is false to avoid conflicting
+# with iptables rules configured on the seed host by Kayobe.
+#kolla_bifrost_use_firewalld:
+
 # Firewalld zone used by Bifrost. Default is "trusted", to avoid blocking other
 # services running on the seed host.
 #kolla_bifrost_firewalld_internal_zone:
@@ -40,7 +44,7 @@
 #kolla_bifrost_dib_init_element:
 
 # DIB default environment variables. Default is {"DIB_CLOUD_INIT_DATASOURCES":
-# "ConfigDrive", "DIB_DISABLE_KERNEL_CLEANUP": 1}.
+# "ConfigDrive"}.
 #kolla_bifrost_dib_env_vars_default:
 
 # DIB additional environment variables. Default is none.
@@ -74,6 +78,9 @@
 #kolla_bifrost_inspector_port_addition:
 
 # List of extra kernel parameters for the inspector default PXE configuration.
+# Default is {{ inspector_extra_kernel_options }}, defined in inspector.yml.
+# When customising this variable, the default extra kernel parameters should be
+# kept to retain full node inspection capabilities.
 #kolla_bifrost_inspector_extra_kernel_options:
 
 # List of introspection rules for Bifrost's Ironic Inspector service.
diff --git a/etc/kayobe/globals.yml b/etc/kayobe/globals.yml
index 9efc114f6..a4150d8ec 100644
--- a/etc/kayobe/globals.yml
+++ b/etc/kayobe/globals.yml
@@ -53,6 +53,17 @@
 # "focal" when os_distribution is "ubuntu".
 #os_release:
 
+###############################################################################
+# Ansible configuration.
+
+# Filter to apply to the setup module when gathering facts. Default is to not
+# specify a filter.
+#kayobe_ansible_setup_filter:
+
+# Gather subset to apply to the setup module when gathering facts. Default is
+# to not specify a gather subset.
+#kayobe_ansible_setup_gather_subset:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/ipa.yml b/etc/kayobe/ipa.yml
index 49236d13a..519ca2a59 100644
--- a/etc/kayobe/ipa.yml
+++ b/etc/kayobe/ipa.yml
@@ -16,8 +16,8 @@
 # URL of IPA builder source repository.
 #ipa_builder_source_url:
 
-# Version of IPA builder source repository. Default is master.
-#ipa_build_source_version:
+# Version of IPA builder source repository. Default is {{ openstack_branch }}.
+#ipa_builder_source_version:
 
 # List of default Diskimage Builder (DIB) elements to use when building IPA
 # images. Default is ["centos", "enable-serial-console",
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index b43a3b907..0843df106 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -265,7 +265,6 @@
 #kolla_enable_cinder_backend_lvm:
 #kolla_enable_cinder_backend_nfs:
 #kolla_enable_cinder_backend_quobyte:
-#kolla_enable_cinder_backend_zfssa_iscsi:
 #kolla_enable_cinder_backup:
 #kolla_enable_cinder_horizon_policy_file:
 #kolla_enable_cloudkitty: