yoga: xena merge

.github/workflows/stackhpc-pull-request.yml

@@ -74,7 +74,9 @@ jobs:
       kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
       os_distribution: rocky
       neutron_plugin: ovs
-      vm_image: Rocky8
+      # NOTE: The current SMS lab Rocky8 image has moved ahead of our release
+      # train snapshots, causing failures installing some packages.
+      vm_image: Rocky8-2022-11-08
       vm_interface: ens3
       OS_CLOUD: sms-lab-release
     secrets: inherit
@@ -89,7 +91,9 @@ jobs:
       kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
       os_distribution: rocky
       neutron_plugin: ovn
-      vm_image: Rocky8
+      # NOTE: The current SMS lab Rocky8 image has moved ahead of our release
+      # train snapshots, causing failures installing some packages.
+      vm_image: Rocky8-2022-11-08
       vm_interface: ens3
       OS_CLOUD: sms-lab-release
     secrets: inherit

etc/kayobe/cephadm.yml

@@ -9,7 +9,7 @@ cephadm_ceph_release: "pacific"
 #cephadm_fsid:
 
 # Ceph container image.
-cephadm_image: "{{ stackhpc_docker_registry }}/ceph/ceph:{{ cephadm_image_tag }}"
+cephadm_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/ceph:{{ cephadm_image_tag }}"
 
 # Ceph container image tag.
 cephadm_image_tag: "v16.2.5"

etc/kayobe/dnf.yml

@@ -41,6 +41,12 @@
 #     file: myrepo
 #     gpgkey: http://gpgkey
 #     gpgcheck: yes
+#dnf_custom_repos:
+
+# A dict of custom repositories that point to the local Pulp server.
+# To use these repos, set dnf_custom_repos to the value of stackhpc_dnf_repos.
+# This is done by default for hosts in the overcloud group via a group_vars
+# file.
 stackhpc_dnf_repos: "{{ dnf_custom_repos_el8 | combine(lookup('vars', 'dnf_custom_repos_' ~ ansible_facts.distribution | lower )) }}"
 
 # Custom repositories shared between all RHEL derivatives.

etc/kayobe/environments/ci-aio/stackhpc-ci.yml

@@ -5,11 +5,6 @@
 # Docker namespace to use for Kolla images. Default is 'kolla'.
 kolla_docker_namespace: stackhpc-dev
 
-# Whether docker should be configured to use an insecure registry for Kolla
-# images. Default is false, unless docker_registry_enabled is true and
-# docker_registry_enable_tls is false.
-kolla_docker_registry_insecure: "{{ 'https' not in stackhpc_repo_mirror_url }}"
-
 ###############################################################################
 # Network configuration.
 

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

@@ -5,11 +5,6 @@
 # Docker namespace to use for Kolla images. Default is 'kolla'.
 kolla_docker_namespace: stackhpc-dev
 
-# Whether docker should be configured to use an insecure registry for Kolla
-# images. Default is false, unless docker_registry_enabled is true and
-# docker_registry_enable_tls is false.
-kolla_docker_registry_insecure: "{{ 'https' not in stackhpc_repo_mirror_url }}"
-
 # Kolla feature flag configuration.
 kolla_enable_barbican: true
 kolla_enable_central_logging: true

etc/kayobe/environments/ci-multinode/cephadm.yml

@@ -2,9 +2,6 @@
 ###############################################################################
 # Cephadm deployment configuration.
 
-# Ceph container image.
-cephadm_image: "quay.io/ceph/ceph:v16.2.5"
-
 # Ceph OSD specification.
 cephadm_osd_spec:
   service_type: osd

etc/kayobe/environments/ci-multinode/stackhpc-ci.yml

@@ -5,11 +5,6 @@
 # Docker namespace to use for Kolla images. Default is 'kolla'.
 kolla_docker_namespace: stackhpc-dev
 
-# Whether docker should be configured to use an insecure registry for Kolla
-# # images. Default is false, unless docker_registry_enabled is true and
-# # docker_registry_enable_tls is false.
-kolla_docker_registry_insecure: "{{ 'https' not in stackhpc_repo_mirror_url }}"
-
 ###############################################################################
 # Network configuration.
 

etc/kayobe/kolla.yml

@@ -84,7 +84,7 @@ kolla_docker_namespace: stackhpc
 # Whether docker should be configured to use an insecure registry for Kolla
 # images. Default is false, unless docker_registry_enabled is true and
 # docker_registry_enable_tls is false.
-#kolla_docker_registry_insecure:
+kolla_docker_registry_insecure: "{{ 'https' not in stackhpc_repo_mirror_url }}"
 
 # Username to use to access a docker registry. Default is not set, in which
 # case the registry will be used without authentication.

etc/kayobe/stackhpc-overcloud-dib.yml

@@ -58,6 +58,8 @@ stackhpc_overcloud_dib_env_vars:
 stackhpc_overcloud_dib_packages:
   - "logrotate"
   - "net-tools"
+  - "{% if os_distribution == 'ubuntu' %}netbase{% endif %}"
+  - "{% if os_distribution == 'ubuntu' %}iputils-ping{% endif %}"
 
 # StackHPC overcloud DIB image block device configuration.
 # This image layout conforms to the CIS partition benchmarks.