Merge pull request #166 from stackhpc/merge-kayobe-config-dev

Merge kayobe-config-dev master branch

Author: markgoddard

.gitreview

@@ -2,4 +2,3 @@
 host=review.opendev.org
 port=29418
 project=openstack/kayobe-config-dev.git
-defaultbranch=stable/rocky

etc/kayobe/apt.yml

@@ -30,7 +30,7 @@
 # * types: whitespace-separated list of repository types, e.g. deb or deb-src
 #   (optional, default is 'deb')
 # * url: URL of the repository
-# * suites: whitespace-separated list of suites, e.g. focal (optional, default
+# * suites: whitespace-separated list of suites, e.g. jammy (optional, default
 #   is ansible_facts.distribution_release)
 # * components: whitespace-separated list of components, e.g. main (optional,
 #   default is 'main')
@@ -46,6 +46,17 @@
 # Default is false.
 #apt_disable_sources_list:
 
+# List of Apt auth configurations. Each item is a dict with the following keys:
+# * machine: 'machine' entry in the auth file
+# * login: 'login' entry in the auth file
+# * password: 'password' entry in the auth file
+# * filename: Name of a file in which to store the auth configuration. The
+#   extension should be '.conf'.
+# * filename: Name of a file in /etc/apt/auth.conf.d in which to store
+#   the auth configuration. The extension should be ``.conf``.
+# Default is an empty list.
+#apt_auth:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/bifrost.yml

@@ -28,9 +28,7 @@
 # DIB image OS release. Default is {{ os_release }}.
 #kolla_bifrost_dib_os_release:
 
-# List of default DIB elements. Default is ["disable-selinux",
-# "enable-serial-console", "vm"] when os_distribution is "centos", or
-# ["enable-serial-console", "vm"] otherwise.
+# List of default DIB elements. Default is ["enable-serial-console", "vm"].
 #kolla_bifrost_dib_elements_default:
 
 # List of additional DIB elements. Default is none.
@@ -71,6 +69,10 @@
 # Default is none.
 #kolla_bifrost_deploy_image_rootfs:
 
+# Custom cloud-init user-data passed to deploy of the deployment image.
+# Default is an empty string.
+#kolla_bifrost_deploy_image_user_data_content:
+
 ###############################################################################
 # Ironic configuration.
 
@@ -106,6 +108,12 @@
 # Ironic inspector IPMI password to set.
 #kolla_bifrost_inspector_ipmi_password:
 
+# Ironic inspector Redfish username to set.
+#kolla_bifrost_inspector_redfish_username:
+
+# Ironic inspector Redfish password to set.
+#kolla_bifrost_inspector_redfish_password:
+
 # Ironic inspector network interface name on which to check for an LLDP switch
 # port description to use as the node's name.
 #kolla_bifrost_inspector_lldp_switch_port_interface:
@@ -116,6 +124,9 @@
 # Ironic inspector deployment ramdisk location.
 #kolla_bifrost_inspector_deploy_ramdisk:
 
+# Ironic inspector legacy deployment kernel location.
+#kolla_bifrost_inspector_legacy_deploy_kernel:
+
 # Timeout of hardware inspection on overcloud nodes, in seconds. Default is
 # {{ inspector_inspection_timeout }}.
 #kolla_bifrost_inspection_timeout:

etc/kayobe/compute.yml

@@ -63,26 +63,24 @@
 ###############################################################################
 # Compute node LVM configuration.
 
-# List of compute volume groups. See mrlesmithjr.manage-lvm role for
+# List of compute volume groups. See mrlesmithjr.manage_lvm role for
 # format.
 #compute_lvm_groups:
 
-# Default list of compute volume groups. See mrlesmithjr.manage-lvm role for
+# Default list of compute volume groups. See mrlesmithjr.manage_lvm role for
 # format.
 #compute_lvm_groups_default:
 
-# Additional list of compute volume groups. See mrlesmithjr.manage-lvm role
+# Additional list of compute volume groups. See mrlesmithjr.manage_lvm role
 # for format.
 #compute_lvm_groups_extra:
 
 # Whether a 'data' LVM volume group should exist on compute hosts. By default
-# this contains a 'docker-volumes' logical volume for Docker volume storage. It
-# will also be used for Docker container and image storage if
-# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
-# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
+# this contains a 'docker-volumes' logical volume for Docker volume storage.
+# Default is false.
 #compute_lvm_group_data_enabled:
 
-# Compute LVM volume group for data. See mrlesmithjr.manage-lvm role for
+# Compute LVM volume group for data. See mrlesmithjr.manage_lvm role for
 # format.
 #compute_lvm_group_data:
 
@@ -179,6 +177,12 @@
 # compute_qemu_conf_extra.
 #compute_qemu_conf:
 
+# Whether to enable libvirt SASL authentication. Default is true.
+#compute_libvirt_enable_sasl:
+
+# libvirt SASL password. Default is unset.
+#compute_libvirt_sasl_password:
+
 # Whether to enable a libvirt TLS listener. Default is false.
 #compute_libvirt_enable_tls:
 

etc/kayobe/controllers.yml

@@ -6,6 +6,25 @@
 # to setup the Kayobe user account. Default is {{ os_distribution }}.
 #controller_bootstrap_user:
 
+###############################################################################
+# Controller groups.
+
+# Ansible inventory group in which Ironic conductor services are deployed.
+# Default is 'controllers'.
+#controller_ironic_conductor_group:
+
+# Ansible inventory group in which Ironic inspector services are deployed.
+# Default is 'controllers'.
+#controller_ironic_inspector_group:
+
+# Ansible inventory group in which control plane load balancer services are
+# deployed. Default is 'network'.
+#controller_loadbalancer_group:
+
+# Ansible inventory group in which network data plane services are deployed.
+# Default is 'network'.
+#controller_network_group:
+
 ###############################################################################
 # Controller network interface configuration.
 
@@ -72,26 +91,25 @@
 ###############################################################################
 # Controller node LVM configuration.
 
-# List of controller volume groups. See mrlesmithjr.manage-lvm role for
+# List of controller volume groups. See mrlesmithjr.manage_lvm role for
 # format.
 #controller_lvm_groups:
 
-# Default list of controller volume groups. See mrlesmithjr.manage-lvm role for
+# Default list of controller volume groups. See mrlesmithjr.manage_lvm role for
 # format.
 #controller_lvm_groups_default:
 
-# Additional list of controller volume groups. See mrlesmithjr.manage-lvm role
+# Additional list of controller volume groups. See mrlesmithjr.manage_lvm role
 # for format.
 #controller_lvm_groups_extra:
 
 # Whether a 'data' LVM volume group should exist on controller hosts. By
 # default this contains a 'docker-volumes' logical volume for Docker volume
-# storage. It will also be used for Docker container and image storage if
-# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
-# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
+# storage.
+# Default is false.
 #controller_lvm_group_data_enabled:
 
-# Controller LVM volume group for data. See mrlesmithjr.manage-lvm role for
+# Controller LVM volume group for data. See mrlesmithjr.manage_lvm role for
 # format.
 #controller_lvm_group_data:
 

etc/kayobe/docker.yml

@@ -25,6 +25,11 @@
 # Use a docker registry on the seed.
 docker_registry: 192.168.33.5:4000
 
+# Whether docker should be configured to use an insecure registry.
+# Default is false, unless docker_registry_enabled is true and
+# docker_registry_enable_tls is false.
+#docker_registry_insecure:
+
 # CA of docker registry
 #docker_registry_ca:
 

etc/kayobe/globals.yml

@@ -4,8 +4,7 @@
 ###############################################################################
 # Local path configuration (Ansible control host).
 
-# Path to Kayobe configuration directory on Ansible control host, with an
-# environment path appended if kayobe_environment is set.
+# Path to Kayobe configuration directory on Ansible control host.
 #kayobe_config_path:
 
 # Name of Kayobe environment to use. Default is $KAYOBE_ENVIRONMENT, or an
@@ -46,11 +45,11 @@
 # OS distribution.
 
 # OS distribution name. Valid options are "centos", "rocky", "ubuntu". Default
-# is "centos".
+# is "rocky".
 os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
 
-# OS release. Valid options are "8-stream" when os_distribution is "centos", or
-# "8" when os_distribution is "rocky", or "focal" when os_distribution is
+# OS release. Valid options are "9-stream" when os_distribution is "centos", or
+# "9" when os_distribution is "rocky", or "jammy" when os_distribution is
 # "ubuntu".
 #os_release:
 
@@ -65,6 +64,10 @@ os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
 # to not specify a gather subset.
 #kayobe_ansible_setup_gather_subset:
 
+# Global maximum failure percentage. By default this is undefined, which is
+# equivalent to a value of 100.
+#kayobe_max_fail_percentage:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/grafana.yml

@@ -2,46 +2,9 @@
 ###############################################################################
 # Grafana configuration.
 
-# Grafana local admin user name. If you are deploying Monasca Grafana this
-# should not conflict with an OpenStack user name.
+# Grafana local admin user name.
 #grafana_local_admin_user_name:
 
-# Path to git repo containing Grafana dashboards. Eg.
-# https://github.com/stackhpc/grafana-reference-dashboards.git
-#grafana_monitoring_node_dashboard_repo:
-
-# Dashboard repo version. Optional, defaults to 'HEAD'.
-#grafana_monitoring_node_dashboard_repo_version:
-
-# Path to which Grafana dashboards will be cloned to a monitoring node
-#grafana_monitoring_node_dashboard_repo_checkout_path:
-
-# The path, relative to the grafana_monitoring_node_dashboard_repo_checkout_path
-# containing the dashboards. Eg. /prometheus/control_plane
-#grafana_monitoring_node_dashboard_repo_path:
-
-# The Grafana organisation for the control plane. Note that for Monasca
-# Grafana with domain support the format is:
-# organisation_name@openstack_domain
-#grafana_control_plane_organisation:
-
-# A dict of datasources to configure. See the stackhpc.grafana-conf role
-# for all supported datasources. Example:
-#
-# grafana_datasources:
-#   monasca_api:
-#     port: 8082
-#     host: monasca-api
-#   monasca_log_api:
-#     port: 5607
-#     host: monasca-log-api
-#   elasticsearch:
-#     port: 9200
-#     host: monasca-elasticsearch
-#     project_id: "some_id"
-#
-#grafana_datasources:
-
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/infra-vms.yml

@@ -30,12 +30,12 @@
 #infra_vm_root_format:
 
 # Base image for the infra VM root volume. Default is
-# "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
+# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu", or
-# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 
@@ -92,26 +92,24 @@
 ###############################################################################
 # Infrastructure VM node LVM configuration.
 
-# List of infrastructure vm volume groups. See mrlesmithjr.manage-lvm role for
+# List of infrastructure vm volume groups. See mrlesmithjr.manage_lvm role for
 # format.
 #infra_vm_lvm_groups:
 
-# Default list of infrastructure vm volume groups. See mrlesmithjr.manage-lvm
+# Default list of infrastructure vm volume groups. See mrlesmithjr.manage_lvm
 # role for format.
 #infra_vm_lvm_groups_default:
 
-# Additional list of infrastructure vm volume groups. See mrlesmithjr.manage-lvm
+# Additional list of infrastructure vm volume groups. See mrlesmithjr.manage_lvm
 # role for format.
 #infra_vm_lvm_groups_extra:
 
 # Whether a 'data' LVM volume group should exist on the infrastructure vm. By
 # default this contains a 'docker-volumes' logical volume for Docker volume
-# storage. It will also be used for Docker container and image storage if
-# 'docker_storage_driver' is set to 'devicemapper'. Default is true if
-# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
+# storage. Default is false.
 #infra_vm_lvm_group_data_enabled:
 
-# Infrastructure VM LVM volume group for data. See mrlesmithjr.manage-lvm role
+# Infrastructure VM LVM volume group for data. See mrlesmithjr.manage_lvm role
 # for format.
 #infra_vm_lvm_group_data:
 

etc/kayobe/inspector.yml

@@ -58,6 +58,9 @@
 ###############################################################################
 # Ironic inspector configuration.
 
+# Ironic inspector option to enable IPMI rules. Set to 'True' by default.
+#inspector_rules_ipmi_enabled:
+
 # Ironic inspector IPMI username to set.
 #inspector_ipmi_username:
 
@@ -72,6 +75,21 @@
 # check for an LLDP switch port description to use as the node's name.
 #inspector_lldp_switch_port_interface_map:
 
+# Ironic inspector uses IPMI by default enroll the baremetal nodes, however it
+# is possible to use Redfish instead. To do that enable Redfish and make sure
+# all of the necessary variables below have been properly set.
+# Enable inspector Redfish rules. Set to 'False' by default.
+#inspector_rules_redfish_enabled:
+
+# Ironic inspector Redfish username to set.
+#inspector_redfish_username:
+
+# Ironic inspector Redfish password to set.
+#inspector_redfish_password:
+
+# Redfish CA setting. Set to 'True' by default
+#inspector_rule_var_redfish_verify_ca:
+
 ###############################################################################
 # Ironic inspector introspection rules configuration.
 
@@ -84,9 +102,6 @@
 # Ironic inspector rule to set deployment ramdisk.
 #inspector_rule_deploy_ramdisk:
 
-# Ironic inspector rule to set local boot capability
-#inspector_rule_local_boot:
-
 # Ironic inspector rule to initialise root device hints.
 #inspector_rule_root_hint_init: