Merge stackhpc/yoga into stackhpc/zed

stackhpc · Sep 28, 2023 · 452c590 · 452c590
2 parents bb82de8 + 4a9a657
commit 452c590
Show file tree

Hide file tree

Showing 11 changed files with 107 additions and 20 deletions.
diff --git a/.automation.conf/tempest/load-lists/default b/.automation.conf/tempest/load-lists/default
@@ -1 +1 @@
-refstack-2019.11-test-list.txt
+platform.2022.11-test-list.txt
diff --git a/...load-lists/refstack-2019.11-test-list.txt → ...load-lists/platform.2022.11-test-list.txt b/...load-lists/refstack-2019.11-test-list.txt → ...load-lists/platform.2022.11-test-list.txt
diff --git a/etc/kayobe/dnf.yml b/etc/kayobe/dnf.yml
@@ -47,7 +47,7 @@
 # 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_el9 | combine(dnf_custom_repos_rocky_9) }}"
+stackhpc_dnf_repos: "{{ dnf_custom_repos_el9 | combine(dnf_custom_repos_rocky_9) | combine(dnf_custom_repos_elrepo_9 if dnf_install_elrepo_9 | bool else {}) }}"
 
 # Custom repositories shared between all RHEL 9 derivatives.
 dnf_custom_repos_el9:
@@ -66,6 +66,16 @@ dnf_custom_repos_el9:
     gpgkey: "{{ dnf_docker_gpg_key_url }}"
     gpgcheck: yes
 
+# ELRepo 9
+dnf_custom_repos_elrepo_9:
+  elrepo:
+    baseurl: "{{ stackhpc_repo_elrepo_9_url }}"
+    description: "ELRepo.org Community Enterprise Linux Repository - el9"
+    enabled: "{{ dnf_enable_elrepo_9 | bool }}"
+    file: elrepo
+    gpgkey: https://www.elrepo.org/RPM-GPG-KEY-elrepo.org
+    gpgcheck: yes
+
 # Rocky 9 specific repositories
 dnf_custom_repos_rocky_9:
   appstream:
@@ -96,6 +106,9 @@ dnf_custom_repos_rocky_9:
 # Whether to enable EPEL repositories. This affects RedHat-based systems only.
 dnf_enable_epel: "{{ dnf_install_epel | bool }}"
 
+# Whether to enable the ELRepo repository. This affects RedHat-based, 9.x release systems only.
+dnf_enable_elrepo_9: "{{ dnf_install_elrepo_9 | bool }}"
+
 # URL of EPEL GPG keys.
 dnf_epel_9_gpg_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9"
 
@@ -105,6 +118,10 @@ rocky_9_gpg_key: "https://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9"
 # systems only. Default value is 'false'.
 #dnf_install_epel:
 
+# Whether to create a repo file for ELRepo. This affects RedHat-based
+# systems only.
+dnf_install_elrepo_9: false
+
 # Whether to enable docker dnf repo in stackhpc_dnf_repos
 dnf_enable_docker: true
 

diff --git a/etc/kayobe/kolla/config/nova.conf b/etc/kayobe/kolla/config/nova.conf
@@ -0,0 +1,2 @@
+[libvirt]
+hw_machine_type = q35
diff --git a/etc/kayobe/kolla/config/prometheus/ceph.rules b/etc/kayobe/kolla/config/prometheus/ceph.rules
@@ -46,6 +46,7 @@ groups:
   rules:
   - alert: 10percentOSDsDown
     expr: count(ceph_osd_up == 0) / count(ceph_osd_up) * 100 >= 10
+    for: 15m
     labels:
       severity: critical
     annotations:

diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
@@ -6,6 +6,7 @@ stackhpc_pulp_repo_centos_stream_9_openstack_zed_version: 20230919T015626
 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20230615T071742
 stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version: 20230712T025152
 stackhpc_pulp_repo_docker_ce_ubuntu_version: 20230921T005001
+stackhpc_pulp_repo_elrepo_9_version: 20230907T075311
 stackhpc_pulp_repo_epel_9_version: 20230921T005001
 stackhpc_pulp_repo_grafana_version: 20230921T005001
 stackhpc_pulp_repo_opensearch_2_x_version: 20230725T013015

diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
@@ -306,6 +306,14 @@ stackhpc_pulp_rpm_repos:
     sync_policy: mirror_content_only
     required: "{{ stackhpc_pulp_sync_el_9 | bool }}"
 
+  # ELRepo 9 repository
+  - name: ELRepo.org Community Enterprise Linux Repository - el9
+    url: "{{ stackhpc_release_pulp_content_url }}/elrepo/elrepo/el9/x86_64/{{ stackhpc_pulp_repo_elrepo_9_version }}"
+    distribution_name: elrepo-el9-x86_64-
+    base_path: elrepo/elrepo/el9/x86_64/
+    sync_policy: mirror_content_only
+    required: "{{ stackhpc_pulp_sync_el_9 | bool }}"
+
   # Third-party repositories
   - name: Docker CE for CentOS 9
     url: "{{ stackhpc_release_pulp_content_url }}/docker-ce/centos/9/x86_64/stable/{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml
@@ -107,6 +107,10 @@ stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_repo_distribution }
 stackhpc_repo_epel_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/epel/9/Everything/x86_64/{{ stackhpc_repo_epel_9_version }}"
 stackhpc_repo_epel_9_version: "{{ stackhpc_repo_distribution }}"
 
+# ELRepo 9
+stackhpc_repo_elrepo_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/elrepo/elrepo/el9/x86_64/{{ stackhpc_repo_elrepo_9_version }}"
+stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
+
 ###############################################################################
 # Sources
 

diff --git a/releasenotes/config.yaml b/releasenotes/config.yaml
@@ -1,3 +1,4 @@
 ---
 # This needs to be updated to the latest release.
 release_tag_re: stackhpc/13\.\d+\.\d+\.\d
+ignore_null_merges: false
diff --git a/releasenotes/notes/elrepo-9-9d88af1dea541155.yaml b/releasenotes/notes/elrepo-9-9d88af1dea541155.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Provide ELRepo 9, which in turn provides packages to support be2net
+    and mpt3sas hardware. Configuration of ELRepo 9 is disabled by default
+    and may be enabled by setting `dnf_install_elrepo_9: true`.
diff --git a/releasenotes/notes/nova-machine-type-q35-ab363c5f7f3f9807.yaml b/releasenotes/notes/nova-machine-type-q35-ab363c5f7f3f9807.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Configure Nova to use more modern 'q35' libvirt machine type rather than
+    'pc' which is considered legacy.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		refstack-2019.11-test-list.txt
		platform.2022.11-test-list.txt