diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml
index 271ebdc..078a6ce 100644
--- a/etc/kayobe/bifrost.yml
+++ b/etc/kayobe/bifrost.yml
@@ -7,7 +7,8 @@
 # URL of Bifrost source code repository.
 #kolla_bifrost_source_url:
 
-# Version (branch, tag, etc.) of Bifrost source code repository.
+# Version (branch, tag, etc.) of Bifrost source code repository. Default is
+# {{ openstack_branch }}.
 #kolla_bifrost_source_version:
 
 ###############################################################################
diff --git a/etc/kayobe/cadvisor.yml b/etc/kayobe/ceph.yml
similarity index 58%
rename from etc/kayobe/cadvisor.yml
rename to etc/kayobe/ceph.yml
index 25e1db4..b54faf3 100644
--- a/etc/kayobe/cadvisor.yml
+++ b/etc/kayobe/ceph.yml
@@ -1,9 +1,10 @@
 ---
 ###############################################################################
-# cAdvisor configuration.
+# OpenStack Ceph configuration.
 
-# Whether cAdvisor is enabled.
-#cadvisor_enabled:
+# Ansible host pattern matching hosts on which Ceph storage services
+# are deployed. The default is to use hosts in the 'storage' group.
+#ceph_hosts:
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
diff --git a/etc/kayobe/compute.yml b/etc/kayobe/compute.yml
index 8d97cec..d66c4d5 100644
--- a/etc/kayobe/compute.yml
+++ b/etc/kayobe/compute.yml
@@ -48,6 +48,12 @@
 # stackhpc.drac role.
 #compute_raid_config_extra:
 
+###############################################################################
+# Compute node software RAID configuration.
+
+# List of software RAID arrays. See mrlesmithjr.mdadm role for format.
+#compute_mdadm_arrays:
+
 ###############################################################################
 # Compute node LVM configuration.
 
diff --git a/etc/kayobe/controllers.yml b/etc/kayobe/controllers.yml
index 03dd957..aa0a6a6 100644
--- a/etc/kayobe/controllers.yml
+++ b/etc/kayobe/controllers.yml
@@ -51,6 +51,12 @@
 # stackhpc.drac role.
 #controller_raid_config_extra:
 
+###############################################################################
+# Controller node software RAID configuration.
+
+# List of software RAID arrays. See mrlesmithjr.mdadm role for format.
+#controller_mdadm_arrays:
+
 ###############################################################################
 # Controller node LVM configuration.
 
diff --git a/etc/kayobe/docker.yml b/etc/kayobe/docker.yml
index 0a7c61b..1697d61 100644
--- a/etc/kayobe/docker.yml
+++ b/etc/kayobe/docker.yml
@@ -2,8 +2,7 @@
 ###############################################################################
 # Docker configuration.
 
-# Name of the docker storage driver. Supported values include 'devicemapper'
-# and 'overlay'.
+# Name of the docker storage driver. Default is 'devicemapper'.
 docker_storage_driver: overlay
 
 # Name of the docker storage LVM volume group.
diff --git a/etc/kayobe/inspector.yml b/etc/kayobe/inspector.yml
index ac83dd3..b99780e 100644
--- a/etc/kayobe/inspector.yml
+++ b/etc/kayobe/inspector.yml
@@ -26,9 +26,6 @@
 ###############################################################################
 # Ironic inspector processing configuration.
 
-# Whether inspector should manage the firewall.
-#inspector_manage_firewall:
-
 # List of of default inspector processing plugins.
 #inspector_processing_hooks_default:
 
diff --git a/etc/kayobe/inventory/group_vars/compute/network-interfaces b/etc/kayobe/inventory/group_vars/compute/network-interfaces
index 421f69d..1aab473 100644
--- a/etc/kayobe/inventory/group_vars/compute/network-interfaces
+++ b/etc/kayobe/inventory/group_vars/compute/network-interfaces
@@ -22,6 +22,11 @@
 # storage_net_bridge_ports:
 # storage_net_bond_slaves:
 
+# Ceph storage network IP information.
+# ceph_storage_net_interface:
+# ceph_storage_net_bridge_ports:
+# ceph_storage_net_bond_slaves:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/inventory/group_vars/storage/network-interfaces b/etc/kayobe/inventory/group_vars/storage/network-interfaces
new file mode 100644
index 0000000..22654ef
--- /dev/null
+++ b/etc/kayobe/inventory/group_vars/storage/network-interfaces
@@ -0,0 +1,47 @@
+---
+###############################################################################
+# Network interface definitions for the storage group.
+
+# Overcloud provisioning network IP information.
+# provision_oc_net_interface:
+# provision_oc_net_bridge_ports:
+# provision_oc_net_bond_slaves:
+
+# External network IP information.
+# external_net_interface:
+# external_net_bridge_ports:
+# external_net_bond_slaves:
+
+# Storage network IP information.
+# storage_net_interface:
+# storage_net_bridge_ports:
+# storage_net_bond_slaves:
+
+# Storage management network IP information.
+# storage_mgmt_net_interface:
+# storage_mgmt_net_bridge_ports:
+# storage_mgmt_net_bond_slaves:
+
+# Ceph storage network IP information.
+# ceph_storage_net_interface:
+# ceph_storage_net_bridge_ports:
+# ceph_storage_net_bond_slaves:
+
+# Ceph storage management network IP information.
+# ceph_storage_mgmt_net_interface:
+# ceph_storage_mgmt_net_bridge_ports:
+# ceph_storage_mgmt_net_bond_slaves:
+
+# Swift storage network IP information.
+# swift_storage_net_interface:
+# swift_storage_net_bridge_ports:
+# swift_storage_net_bond_slaves:
+
+# Swift storage management network IP information.
+# swift_storage_replication_net_interface:
+# swift_storage_replication_net_bridge_ports:
+# swift_storage_replication_net_bond_slaves:
+
+###############################################################################
+# 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 b586c82..6416f5e 100644
--- a/etc/kayobe/ipa.yml
+++ b/etc/kayobe/ipa.yml
@@ -10,7 +10,7 @@
 # URL of IPA source repository.
 #ipa_build_source_url:
 
-# Version of IPA source repository.
+# Version of IPA source repository. Default is {{ openstack_branch }}.
 #ipa_build_source_version:
 
 # URL of IPA upper constraints file.
@@ -50,12 +50,16 @@
 ###############################################################################
 # Ironic Python Agent (IPA) images configuration.
 
+# Suffix of upstream Ironic deployment image files. Default is based on
+# {{ openstack_branch }}.
+#ipa_images_upstream_url_suffix:
+
 # Name of Ironic deployment kernel image to register in Glance.
 #ipa_images_kernel_name:
 
 # URL of Ironic deployment kernel image to download.
 # yamllint disable-line rule:line-length
-ipa_kernel_upstream_url: https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/tinyipa-stable-rocky.vmlinuz
+ipa_kernel_upstream_url: "https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/tinyipa{{ ipa_images_upstream_url_suffix }}.vmlinuz"
 
 # URL of checksum of Ironic deployment kernel image.
 #ipa_kernel_checksum_url:
@@ -68,7 +72,7 @@ ipa_kernel_upstream_url: https://tarballs.openstack.org/ironic-python-agent/tiny
 
 # URL of Ironic deployment ramdisk image to download.
 # yamllint disable-line rule:line-length
-ipa_ramdisk_upstream_url: https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/tinyipa-stable-rocky.gz
+ipa_ramdisk_upstream_url: "https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/tinyipa{{ ipa_images_upstream_url_suffix }}.gz"
 
 # URL of checksum of Ironic deployment ramdisk image.
 #ipa_ramdisk_checksum_url:
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 42eef89..37438ad 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -14,7 +14,7 @@
 #kolla_source_url:
 
 # Version (branch, tag, etc.) of Kolla source code repository if type is
-# 'source'.
+# 'source'. Default is {{ openstack_branch }}.
 #kolla_source_version:
 
 # Path to virtualenv in which to install kolla.
@@ -36,7 +36,7 @@
 #kolla_ansible_source_url:
 
 # Version (branch, tag, etc.) of Kolla Ansible source code repository if type
-# is 'source'.
+# is 'source'. Default is {{ openstack_branch }}.
 #kolla_ansible_source_version:
 
 # Path to virtualenv in which to install kolla-ansible.
@@ -73,6 +73,7 @@
 #kolla_docker_registry_password:
 
 # Kolla OpenStack release version. This should be a Docker image tag.
+# Default is {{ openstack_release }}.
 #kolla_openstack_release:
 
 # Dict mapping names of sources to their definitions for
@@ -170,6 +171,9 @@
 #kolla_enable_ceph_mds:
 #kolla_enable_ceph_nfs:
 #kolla_enable_ceph_rgw:
+# The chrony container is disabled by default because we enable an NTP daemon
+# on the host. Setting this to true will disable NTP on the host.
+#kolla_enable_chrony:
 #kolla_enable_cinder:
 #kolla_enable_cinder_backend_hnas_iscsi:
 #kolla_enable_cinder_backend_hnas_nfs:
@@ -194,6 +198,7 @@
 #kolla_enable_ironic_pxe_uefi:
 #kolla_enable_iscsid:
 #kolla_enable_karbor:
+#kolla_enable_keystone:
 #kolla_enable_kuryr:
 #kolla_enable_magnum:
 #kolla_enable_manila:
@@ -220,6 +225,7 @@
 #kolla_enable_octavia:
 #kolla_enable_osprofiler:
 #kolla_enable_panko:
+#kolla_enable_prometheus:
 #kolla_enable_qdrouterd:
 #kolla_enable_rally:
 #kolla_enable_sahara:
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 15be401..f09b22f 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -1,10 +1,4 @@
 ---
-# 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'
-
 # Most development environments will use nested virtualisation, and we can't
 # guarantee that nested KVM support is available. Use QEMU as a lowest common
 # denominator.
diff --git a/etc/kayobe/monitoring.yml b/etc/kayobe/monitoring.yml
index 0b64855..30690a2 100644
--- a/etc/kayobe/monitoring.yml
+++ b/etc/kayobe/monitoring.yml
@@ -48,6 +48,12 @@
 # by stackhpc.drac role.
 #monitoring_raid_config_extra:
 
+###############################################################################
+# Monitoring node software RAID configuration.
+
+# List of software RAID arrays. See mrlesmithjr.mdadm role for format.
+#monitoring_mdadm_arrays:
+
 ###############################################################################
 # Monitoring node LVM configuration.
 
diff --git a/etc/kayobe/ntp.yml b/etc/kayobe/ntp.yml
index 4c0f0b4..783c3da 100644
--- a/etc/kayobe/ntp.yml
+++ b/etc/kayobe/ntp.yml
@@ -10,6 +10,10 @@
 ###############################################################################
 # Network Time Protocol (NTP).
 
+# Whether to enable the NTP daemon on the host. Default is true unless
+# 'kolla_enable_chrony' has been set to true on overcloud hosts.
+#ntp_service_enabled:
+
 # List of names of NTP servers.
 #ntp_config_server:
 
diff --git a/etc/kayobe/node-exporter.yml b/etc/kayobe/openstack.yml
similarity index 55%
rename from etc/kayobe/node-exporter.yml
rename to etc/kayobe/openstack.yml
index ea1c6b2..f9ef447 100644
--- a/etc/kayobe/node-exporter.yml
+++ b/etc/kayobe/openstack.yml
@@ -1,9 +1,12 @@
 ---
 ###############################################################################
-# Prometheus node exporter configuration.
+# OpenStack release configuration.
 
-# Whether Prometheus node exporter is enabled.
-#nodeexporter_enabled:
+# Name of the current OpenStack release. Default is "stein".
+#openstack_release:
+
+# Name of the current OpenStack branch. Default is "stable/stein".
+#openstack_branch:
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
diff --git a/etc/kayobe/seed-hypervisor.yml b/etc/kayobe/seed-hypervisor.yml
index 978a98c..8f928a7 100644
--- a/etc/kayobe/seed-hypervisor.yml
+++ b/etc/kayobe/seed-hypervisor.yml
@@ -18,6 +18,12 @@
 # List of extra networks to which seed hypervisor nodes are attached.
 #seed_hypervisor_extra_network_interfaces:
 
+###############################################################################
+# Seed hypervisor node software RAID configuration.
+
+# List of software RAID arrays. See mrlesmithjr.mdadm role for format.
+#seed_hypervisor_mdadm_arrays:
+
 ###############################################################################
 # Seed hypervisor node LVM configuration.
 
diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml
index 66ee012..8e68199 100644
--- a/etc/kayobe/seed.yml
+++ b/etc/kayobe/seed.yml
@@ -18,6 +18,12 @@
 # List of extra networks to which seed nodes are attached.
 #seed_extra_network_interfaces:
 
+###############################################################################
+# Seed node software RAID configuration.
+
+# List of software RAID arrays. See mrlesmithjr.mdadm role for format.
+#seed_mdadm_arrays:
+
 ###############################################################################
 # LVM configuration.
 
diff --git a/etc/kayobe/storage.yml b/etc/kayobe/storage.yml
index e1e1795..18e522f 100644
--- a/etc/kayobe/storage.yml
+++ b/etc/kayobe/storage.yml
@@ -18,6 +18,16 @@
 # List of extra networks to which storage nodes are attached.
 #storage_extra_network_interfaces:
 
+# Whether this host requires access to Ceph networks.
+#storage_needs_ceph_network:
+
+#storage_needs_ceph_mgmt_network:
+
+# Whether this host requires access to Swift networks.
+#storage_needs_swift_network:
+
+#storage_needs_swift_replication_network:
+
 ###############################################################################
 # Storage node BIOS configuration.
 
@@ -48,6 +58,12 @@
 # stackhpc.drac role.
 #storage_raid_config_extra:
 
+###############################################################################
+# Storage node software RAID configuration.
+
+# List of software RAID arrays. See mrlesmithjr.mdadm role for format.
+#storage_mdadm_arrays:
+
 ###############################################################################
 # Storage node LVM configuration.
 
diff --git a/etc/kayobe/swift.yml b/etc/kayobe/swift.yml
index 3af868c..c8812b0 100644
--- a/etc/kayobe/swift.yml
+++ b/etc/kayobe/swift.yml
@@ -2,18 +2,63 @@
 ###############################################################################
 # OpenStack Swift configuration.
 
+# Short name of the kolla container image used to build rings. Default is the
+# swift=object image.
+#swift_ring_build_image_name:
+
+# Full name of the kolla container image used to build rings.
+#swift_ring_build_image:
+
+# Ansible host pattern matching hosts on which Swift object storage services
+# are deployed. The default is to use hosts in the 'storage' group.
+#swift_hosts:
+
+# Name of the host used to build Swift rings. Default is the first host of
+# 'swift_hosts'.
+#swift_ring_build_host:
+
+# ID of the Swift region for this host. Default is 1.
+#swift_region:
+
+# ID of the Swift zone. This can be set to different values for different hosts
+# to place them in different zones. Default is 0.
+#swift_zone:
+
 # Base-2 logarithm of the number of partitions.
-# i.e. num_partitions=2^<swift_part_power>.
+# i.e. num_partitions=2^<swift_part_power>. Default is 10.
 #swift_part_power:
 
-# Object replication count.
+# Object replication count. Default is the smaller of the number of Swift
+# hosts, or 3.
 #swift_replication_count:
 
-# Minimum time in hours between moving a given partition.
+# Minimum time in hours between moving a given partition. Default is 1.
 #swift_min_part_hours:
 
-# Number of Swift Zones.
-#swift_num_zones:
+# Ports on which Swift services listen. Default is:
+#  object: 6000
+#  account: 6001
+#  container: 6002
+#swift_service_ports:
+
+# List of block devices to use for Swift. Each item is a dict with the
+# following items:
+# - 'device': Block device path. Required.
+# - 'fs_label': Name of the label used to create the file system on the device.
+#   Optional. Default is to use the basename of the device.
+# - 'services': List of services that will use this block device.  Optional.
+#   Default is 'swift_block_device_default_services'. Allowed items are
+#   'account', 'container', and 'object'.
+# - 'weight': Weight of the block device. Optional. Default is
+#   'swift_block_device_default_weight'.
+#swift_block_devices:
+
+# Default weight to assign to block devices in the ring. Default is 100.
+#swift_block_device_default_weight:
+
+# Default list of services to assign block devices to. Allowed items are
+# 'account', 'container', and 'object'. Default value is all of these.
+#swift_block_device_default_services:
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.