Merge pull request #87 from stackhpc/xena

Initial update for Xena

Author: markgoddard

.github/workflows/container-image-build.yml

@@ -35,7 +35,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: stackhpc/kayobe
-          ref: refs/heads/stackhpc/wallaby
+          ref: refs/heads/stackhpc/xena
           path: src/kayobe
 
       # FIXME: Failed in kolla-ansible : Ensure the latest version of pip is installed

.github/workflows/promote.yml

@@ -3,9 +3,8 @@ name: Promote package repositories
 on:
   push:
     branches:
-      # NOTE(mgoddard): Keep this list tightly controlled, since we only want
-      # to promote from release branches.
-      - stackhpc/wallaby
+      # NOTE(mgoddard): Reference only the current release branch here.
+      - stackhpc/xena
 jobs:
   promote:
     name: Trigger package repository promotion

.gitreview

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

README.rst

@@ -2,7 +2,7 @@
 StackHPC Kayobe Configuration
 =============================
 
-This repository provides a base Kayobe configuration for the Wallaby release
+This repository provides a base Kayobe configuration for the Xena release
 of StackHPC OpenStack.
 
 StackHPC release train
@@ -45,7 +45,7 @@ when used with Kayobe's `multiple environments
 feature.
 
 This configuration should be consumed using the `StackHPC Kayobe fork
-<https://github.com/stackhpc/kayobe/tree/stackhpc/wallaby>`__, which includes
+<https://github.com/stackhpc/kayobe/tree/stackhpc/xena>`__, which includes
 backported support for Ansible collections.
 
 New deployments
@@ -56,7 +56,7 @@ your configuration.
 
 .. code-block:: console
 
-   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/wallaby
+   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/xena
 
 Existing deployments
 --------------------
@@ -68,7 +68,7 @@ need to merge the changes in this repository into your repository.
 
    git remote add stackhpc https://github.com/stackhpc/stackhpc-kayobe-config
    git fetch stackhpc
-   git merge stackhpc/stackhpc/wallaby
+   git merge stackhpc/stackhpc/xena
 
 Updating
 --------
@@ -80,7 +80,7 @@ consume these updates by merging in the changes with their local configuration.
 .. code-block:: console
 
    git fetch stackhpc
-   git merge stackhpc/stackhpc/wallaby
+   git merge stackhpc/stackhpc/xena
 
 The intention is to avoid merge conflicts where possible, but there may be
 cases where this is difficult. We are open to discussion on how best to
@@ -125,13 +125,13 @@ Usage
 =====
 
 The local Pulp service will be deployed as a `Seed custom container
-<https://docs.openstack.org/kayobe/wallaby/configuration/reference/seed-custom-containers.html>`__
+<https://docs.openstack.org/kayobe/xena/configuration/reference/seed-custom-containers.html>`__
 on next ``kayobe seed service deploy`` or ``kayobe seed service upgrade``.
 
 The following custom playbooks are provided in ``etc/kayobe/ansible/``:
 
 See the Kayobe `custom playbook documentation
-<https://docs.openstack.org/kayobe/wallaby/custom-ansible-playbooks.html>`__
+<https://docs.openstack.org/kayobe/xena/custom-ansible-playbooks.html>`__
 for information on how to run them.
 
 * ``pulp-repo-sync.yml``: Pull packages from Ark to the local Pulp. This will
@@ -245,8 +245,8 @@ Clone the Kayobe and Kayobe configuration repositories (this one):
    cd
    mkdir -p src
    pushd src
-   git clone https://github.com/stackhpc/kayobe.git -b stackhpc/wallaby
-   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/wallaby
+   git clone https://github.com/stackhpc/kayobe.git -b stackhpc/xena
+   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/xena
    popd
 
 Create a virtual environment and install Kayobe:
@@ -344,8 +344,8 @@ Clone the Kayobe and Kayobe configuration repositories (this one):
    cd
    mkdir -p src
    pushd src
-   git clone https://github.com/stackhpc/kayobe.git -b stackhpc/wallaby
-   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/wallaby
+   git clone https://github.com/stackhpc/kayobe.git -b stackhpc/xena
+   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/xena
    popd
 
 Create a virtual environment and install Kayobe:
@@ -410,7 +410,7 @@ At this point you are ready to build and push some container images.
    kayobe seed container image build --push
    kayobe overcloud container image build --push
 
-The container images are tagged as ``wallaby-<datetime>``. This Kayobe
+The container images are tagged as ``xena-<datetime>``. This Kayobe
 configuration includes a hook that writes the tag to ``~/kolla_tag``, since
 it is not always simple to determine which tag was last applied to built
 images.
@@ -422,7 +422,7 @@ tag as the value of the ``kolla_openstack_release`` variable.
 Resources
 =========
 
-* Kayobe documentation: https://docs.openstack.org/kayobe/wallaby/
+* Kayobe documentation: https://docs.openstack.org/kayobe/xena/
 * Kayobe source: https://opendev.org/openstack/kayobe
 * Kayobe bugs: https://storyboard.openstack.org/#!/project/openstack/kayobe-config
 * IRC: #openstack-kolla

etc/kayobe/apt.yml

@@ -5,6 +5,47 @@
 # 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:
+
+# List of Apt configuration options. Each item is a dict with the following
+# keys:
+# * content: free-form configuration file content
+# * filename: name of a file in /etc/apt/apt.conf.d/ in which to write the
+#   configuration
+# Default is an empty list.
+#apt_config:
+
+# List of apt keys. Each item is a dict containing the following keys:
+# * url: URL of key
+# * filename: Name of a file in which to store the downloaded key. The
+#   extension should be '.asc' for ASCII-armoured keys, or '.gpg' otherwise.
+# Default is an empty list.
+#apt_keys:
+
+# A list of Apt repositories. Each item is a dict with the following keys:
+# * 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
+#   is ansible_facts.distribution_release)
+# * components: whitespace-separated list of components, e.g. main (optional,
+#   default is 'main')
+# * signed_by: whitespace-separated list of names of GPG keyring files in
+#   apt_keys_path (optional, default is unset)
+# * architecture: whitespace-separated list of architectures that will be used
+#   (optional, default is unset)
+# Default is an empty list.
+#apt_repositories:
+
+# Whether to disable repositories in /etc/apt/sources.list. This may be used
+# when replacing the distribution repositories via apt_repositories.
+# Default is false.
+#apt_disable_sources_list:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/bifrost.yml

@@ -11,6 +11,10 @@ kolla_bifrost_source_url: "{{ stackhpc_bifrost_source_url }}"
 # {{ openstack_branch }}.
 kolla_bifrost_source_version: "{{ stackhpc_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:
@@ -39,8 +43,10 @@ kolla_bifrost_source_version: "{{ stackhpc_bifrost_source_version }}"
 # DIB init element. Default is "cloud-init-datasources".
 #kolla_bifrost_dib_init_element:
 
-# DIB default environment variables. Default is {"DIB_CLOUD_INIT_DATASOURCES":
-# "ConfigDrive"}.
+# DIB default environment variables. Default is
+# {DIB_BOOTLOADER_DEFAULT_CMDLINE:
+# "nofb nomodeset gfxpayload=text net.ifnames=1",
+# "DIB_CLOUD_INIT_DATASOURCES": "ConfigDrive"}.
 #kolla_bifrost_dib_env_vars_default:
 
 # DIB additional environment variables. Default is none.
@@ -53,6 +59,18 @@ kolla_bifrost_source_version: "{{ stackhpc_bifrost_source_version }}"
 # List of DIB packages to install. Default is to install no extra packages.
 #kolla_bifrost_dib_packages:
 
+###############################################################################
+# Disk image deployment configuration.
+
+# Name of disk image file to deploy. Default is "deployment_image.qcow2".
+#kolla_bifrost_deploy_image_filename:
+
+# UUID of the root filesystem contained within the deployment image.
+# See below URL for instructions on how to extract it:
+# https://docs.openstack.org/ironic/latest/admin/raid.html#image-requirements
+# Default is none.
+#kolla_bifrost_deploy_image_rootfs:
+
 ###############################################################################
 # Ironic configuration.
 
@@ -74,6 +92,9 @@ kolla_bifrost_source_version: "{{ stackhpc_bifrost_source_version }}"
 #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.

etc/kayobe/compute.yml

@@ -108,13 +108,88 @@
 # Dict of sysctl parameters to set.
 #compute_sysctl_parameters:
 
+###############################################################################
+# Compute node tuned configuration.
+
+# Builtin tuned profile to use. Format is same as that used by giovtorres.tuned
+# role. Default is virtual-host.
+#compute_tuned_active_builtin_profile:
+
 ###############################################################################
 # Compute node user configuration.
 
 # List of users to create. This should be in a format accepted by the
 # singleplatform-eng.users role.
 #compute_users:
 
+###############################################################################
+# Compute node firewalld configuration.
+
+# Whether to install and enable firewalld.
+#compute_firewalld_enabled:
+
+# A list of zones to create. Each item is a dict containing a 'zone' item.
+#compute_firewalld_zones:
+
+# A firewalld zone to set as the default. Default is unset, in which case the
+# default zone will not be changed.
+#compute_firewalld_default_zone:
+
+# A list of firewall rules to apply. Each item is a dict containing arguments
+# to pass to the firewalld module. Arguments are omitted if not provided, with
+# the following exceptions:
+# - offline: true
+# - permanent: true
+# - state: enabled
+#compute_firewalld_rules:
+
+###############################################################################
+# Compute node host libvirt configuration.
+
+# Whether to enable a host libvirt daemon. Default is true if kolla_enable_nova
+# is true and kolla_enable_nova_libvirt_container is false.
+#compute_libvirt_enabled:
+
+# A dict of default configuration options to write to
+# /etc/libvirt/libvirtd.conf.
+#compute_libvirt_conf_default:
+
+# A dict of additional configuration options to write to
+# /etc/libvirt/libvirtd.conf.
+#compute_libvirt_conf_extra:
+
+# A dict of configuration options to write to /etc/libvirt/libvirtd.conf.
+# Default is a combination of compute_libvirt_conf_default and
+# compute_libvirt_conf_extra.
+#compute_libvirt_conf:
+
+# Numerical log level for libvirtd. Default is 3.
+#compute_libvirtd_log_level:
+
+# A dict of default configuration options to write to
+# /etc/libvirt/qemu.conf.
+#compute_qemu_conf_default:
+
+# A dict of additional configuration options to write to
+# /etc/libvirt/qemu.conf.
+#compute_qemu_conf_extra:
+
+# A dict of configuration options to write to /etc/libvirt/qemu.conf.
+# Default is a combination of compute_qemu_conf_default and
+# compute_qemu_conf_extra.
+#compute_qemu_conf:
+
+# Whether to enable a libvirt TLS listener. Default is false.
+#compute_libvirt_enable_tls:
+
+# Whether to install a Ceph package repository on CentOS and Rocky hosts.
+# Default is true.
+#compute_libvirt_ceph_repo_install:
+
+# Ceph package repository release to install on CentOS and Rocky hosts when
+# compute_libvirt_ceph_repo_install is true. Default is 'pacific'.
+#compute_libvirt_ceph_repo_release:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/controllers.yml

@@ -117,13 +117,41 @@
 # Dict of sysctl parameters to set.
 #controller_sysctl_parameters:
 
+###############################################################################
+# Controller node tuned configuration.
+
+# Builtin tuned profile to use. Format is same as that used by giovtorres.tuned
+# role. Default is throughput-performance.
+#controller_tuned_active_builtin_profile:
+
 ###############################################################################
 # Controller node user configuration.
 
 # List of users to create. This should be in a format accepted by the
 # singleplatform-eng.users role.
 #controller_users:
 
+###############################################################################
+# Controller node firewalld configuration.
+
+# Whether to install and enable firewalld.
+#controller_firewalld_enabled:
+
+# A list of zones to create. Each item is a dict containing a 'zone' item.
+#controller_firewalld_zones:
+
+# A firewalld zone to set as the default. Default is unset, in which case the
+# default zone will not be changed.
+#controller_firewalld_default_zone:
+
+# A list of firewall rules to apply. Each item is a dict containing arguments
+# to pass to the firewalld module. Arguments are omitted if not provided, with
+# the following exceptions:
+# - offline: true
+# - permanent: true
+# - state: enabled
+#controller_firewalld_rules:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/dnf.yml

@@ -12,12 +12,18 @@
 # Whether or not to use a local Yum mirror. Default value is 'false'.
 #dnf_use_local_mirror:
 
-# Mirror FQDN for Yum repos. Default value is 'mirror.centos.org'.
+# Mirror FQDN for Yum CentOS repos. Default value is 'mirror.centos.org'.
 #dnf_centos_mirror_host:
 
 # Mirror directory for Yum CentOS repos. Default value is 'centos'.
 #dnf_centos_mirror_directory:
 
+# Mirror FQDN for Yum Rocky repos. Default value is 'dl.rockylinux.org'.
+#dnf_rocky_mirror_host:
+
+# Mirror directory for Yum Rocky repos. Default value is 'pub/rocky'.
+#dnf_rocky_mirror_directory:
+
 # Mirror FQDN for Yum EPEL repos. Default value is
 # 'download.fedoraproject.org'.
 #dnf_epel_mirror_host:

etc/kayobe/environments/ci-aio/inventory/group_vars/controllers/network-interfaces

@@ -5,7 +5,7 @@
 # Controller interface on all-in-one network.
 aio_interface: breth1
 # Use dummy1 if it exists, otherwise the bridge will have no ports.
-aio_bridge_ports: "{{ ['dummy1'] if 'ansible_dummy1' in hostvars[inventory_hostname] else [] }}"
+aio_bridge_ports: "{{ ['dummy1'] if 'dummy1' in hostvars[inventory_hostname].ansible_facts else [] }}"
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.