Skip to content

Commit b7c0457

Browse files
committed
Merge remote-tracking branch 'origin/stackhpc/2024.1' into cross-arch-builds-2024.1
Change-Id: I27ced2bd7356602983ee7005e61b518fa4e7ca4b
2 parents 9eefac1 + d668463 commit b7c0457

14 files changed

+193
-30
lines changed

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ jobs:
139139
- generate-tag
140140
- runner-selection
141141
steps:
142+
- name: Purge workspace (Arm runner only)
143+
if: runner.arch == 'ARM64'
144+
run: sudo rm -rf "$GITHUB_WORKSPACE"/*
145+
142146
- name: Install package dependencies
143147
run: |
144148
sudo apt update
@@ -152,10 +156,6 @@ jobs:
152156
sudo apt update
153157
sudo apt install gh -y
154158
155-
- name: Purge workspace (Arm runner only)
156-
if: runner.arch == 'ARM64'
157-
run: sudo rm -rf "$GITHUB_WORKSPACE"/*
158-
159159
- name: Checkout
160160
uses: actions/checkout@v4
161161
with:
@@ -232,6 +232,8 @@ jobs:
232232
args="$args -e kolla_tag=${{ steps.write-kolla-tag.outputs.kolla-tag }}"
233233
fi
234234
args="$args -e stackhpc_repo_mirror_auth_proxy_enabled=true"
235+
args="$args -e kolla_build_log_path=/var/log/kolla-build-${{ steps.write-kolla-tag.outputs.kolla-tag }}.log"
236+
args="$args -e base_path=$GITHUB_WORKSPACE/opt/kayobe"
235237
source venvs/kayobe/bin/activate &&
236238
source src/kayobe-config/kayobe-env --environment ci-builder &&
237239
kayobe overcloud container image build $args
@@ -240,11 +242,13 @@ jobs:
240242
if: inputs.overcloud
241243

242244
- name: Copy overcloud container image build logs to output directory
243-
run: sudo mv /var/log/kolla-build.log image-build-logs/kolla-build-overcloud.log
245+
run: |
246+
sudo mv /var/log/kolla-build-${{ steps.write-kolla-tag.outputs.kolla-tag }}.log \
247+
image-build-logs/kolla-build-overcloud.log
244248
if: inputs.overcloud
245249

246250
- name: Copy build configs to output directory
247-
run: sudo cp -rnL /opt/kayobe/etc/kolla/* image-build-logs/
251+
run: sudo cp -rnL "$GITHUB_WORKSPACE/opt/kayobe/etc/kolla/"* image-build-logs/
248252
if: inputs.overcloud
249253

250254
- name: Build kolla seed images
@@ -355,9 +359,9 @@ jobs:
355359
- name: Remove locally built images for this run
356360
if: always() && runner.arch == 'ARM64'
357361
run: |
358-
docker images --quiet \
362+
docker images --format '{{.Repository}}:{{.Tag}}' \
359363
--filter "reference=ark.stackhpc.com/stackhpc-dev/*:${{ steps.write-kolla-tag.outputs.kolla-tag }}*" \
360-
| xargs -r docker rmi -f
364+
| xargs -r -n1 docker rmi -f
361365
362366
create-manifests:
363367
# Only for Rocky Linux for now

etc/kayobe/ansible/check-kayobe-version.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,28 @@
2929
register: kayobe_git_commit
3030
failed_when: kayobe_git_commit.stdout == ""
3131

32+
- name: Create a temporary directory to clone Kayobe into
33+
ansible.builtin.tempfile:
34+
state: directory
35+
register: kayobe_temp_dir
36+
3237
- name: Clone Kayobe
3338
ansible.builtin.git:
3439
repo: https://github.com/stackhpc/kayobe.git
35-
dest: /tmp/kayobe-git
40+
dest: "{{ kayobe_temp_dir.path }}/kayobe-git"
3641
version: stackhpc/{{ openstack_release }}
3742

3843
- name: Get tag from Kayobe commit
3944
ansible.builtin.command:
4045
cmd: git describe --tags {{ kayobe_git_commit.stdout }}
41-
chdir: /tmp/kayobe-git
46+
chdir: "{{ kayobe_temp_dir.path }}/kayobe-git"
4247
register: kayobe_current_version
4348

49+
- name: Clean up temporary directory
50+
ansible.builtin.file:
51+
state: absent
52+
path: "{{ kayobe_temp_dir.path }}"
53+
4454
- name: Get latest Kayobe version
4555
ansible.builtin.shell:
4656
cmd: set -o pipefail && grep -o kayobe@stackhpc\/.*$ {{ requirements_path }} | cut -d @ -f 2
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
---
2+
- name: Gather Cloud Facts
3+
hosts: localhost
4+
gather_facts: true
5+
tasks:
6+
- name: Write facts to file
7+
vars:
8+
cloud_facts:
9+
ansible_control_host_distribution: "{{ ansible_facts.distribution }}"
10+
ansible_control_host_distribution_release: "{{ ansible_facts.distribution_release }}"
11+
openstack_release: "{{ openstack_release }}"
12+
openstack_release_name: "{{ openstack_release_codename }}"
13+
ansible_control_host_is_vm: "{{ ansible_facts.virtualization_role == 'guest' }}"
14+
controller_count: "{{ groups['controllers'] | length }}"
15+
hypervisor_count: "{{ groups['hypervisors'] | length }}"
16+
monitoring_count: "{{ groups['monitoring'] | length }}"
17+
osd_count: "{{ groups['osds'] | length }}"
18+
compute_count: "{{ groups['compute'] | length }}"
19+
baremetal_count: "{{ groups['baremetal-compute'] | length }}"
20+
ceph_deployed: "{{ groups['ceph'] | length > 0 | bool }}"
21+
ceph_count: "{{ groups['ceph'] | length }}"
22+
ceph_release: "{{ cephadm_ceph_release }}"
23+
storage_hyperconverged: "{{ groups['controllers'] | intersect(groups['osds']) | length > 0 | bool }}"
24+
wazuh_enabled: "{{ groups['wazuh-agent'] | length > 0 | bool }}"
25+
kayobe_managed_switches: "{{ groups['switches'] | length > 0 | bool }}"
26+
proxy_configured: "{{ http_proxy | bool or https_proxy | bool }}"
27+
bifrost_version: "{{ kolla_bifrost_source_version }}"
28+
barbican_enabled: "{{ kolla_enable_barbican }}"
29+
nova_enabled: "{{ kolla_enable_nova }}"
30+
neutron_enabled: "{{ kolla_enable_neutron }}"
31+
ovs_enabled: "{{ kolla_enable_openvswitch }}"
32+
ovn_enabled: "{{ kolla_enable_ovn }}"
33+
glance_enabled: "{{ kolla_enable_glance }}"
34+
cinder_enabled: "{{ kolla_enable_cinder }}"
35+
keystone_enabled: "{{ kolla_enable_keystone }}"
36+
horizon_enabled: "{{ kolla_enable_horizon }}"
37+
fluentd_enabled: "{{ kolla_enable_fluentd }}"
38+
rabbitmq_enabled: "{{ kolla_enable_rabbitmq }}"
39+
mariadb_enabled: "{{ kolla_enable_mariadb }}"
40+
mariabackup_enabled: "{{ kolla_enable_mariabackup }}"
41+
memcached_enabled: "{{ kolla_enable_memcached }}"
42+
haproxy_enabled: "{{ kolla_enable_haproxy }}"
43+
keepalived_enabled: "{{ kolla_enable_keepalived }}"
44+
octavia_enabled: "{{ kolla_enable_octavia }}"
45+
designate_enabled: "{{ kolla_enable_designate }}"
46+
manila_enabled: "{{ kolla_enable_manila }}"
47+
magnum_enabled: "{{ kolla_enable_magnum }}"
48+
heat_enabled: "{{ kolla_enable_heat }}"
49+
ironic_enabled: "{{ kolla_enable_ironic }}"
50+
skyline_enabled: "{{ kolla_enable_skyline }}"
51+
blazar_enabled: "{{ kolla_enable_blazar }}"
52+
pulp_enabled: "{{ seed_pulp_container_enabled }}"
53+
opensearch_enabled: "{{ kolla_enable_opensearch }}"
54+
opensearch_dashboards_enabled: "{{ kolla_enable_opensearch_dashboards }}"
55+
influxdb_enabled: "{{ kolla_enable_influxdb }}"
56+
grafana_enabled: "{{ kolla_enable_grafana }}"
57+
prometheus_enabled: "{{ kolla_enable_prometheus }}"
58+
cloudkitty_enabled: "{{ kolla_enable_cloudkitty }}"
59+
telegraf_enabled: "{{ kolla_enable_telegraf }}"
60+
internal_tls_enabled: "{{ kolla_enable_tls_internal }}"
61+
external_tls_enabled: "{{ kolla_enable_tls_external }}"
62+
firewalld_enabled_all: >-
63+
{{
64+
controller_firewalld_enabled and
65+
compute_firewalld_enabled and
66+
storage_firewalld_enabled and
67+
monitoring_firewalld_enabled and
68+
infra_vm_firewalld_enabled and
69+
seed_firewalld_enabled and
70+
seed_hypervisor_firewalld_enabled
71+
}}
72+
firewalld_enabled_any: >-
73+
{{
74+
controller_firewalld_enabled or
75+
compute_firewalld_enabled or
76+
storage_firewalld_enabled or
77+
monitoring_firewalld_enabled or
78+
infra_vm_firewalld_enabled or
79+
seed_firewalld_enabled or
80+
seed_hypervisor_firewalld_enabled
81+
}}
82+
stackhpc_package_repos_enabled: "{{ stackhpc_repos_enabled }}"
83+
pulp_tls_enabled: "{{ pulp_enable_tls }}"
84+
kolla_image_tags: "{{ kolla_image_tags }}"
85+
ansible.builtin.copy:
86+
content: "{{ cloud_facts | to_nice_json(sort_keys=false) }}"
87+
dest: ~/cloud-facts.json

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ kolla_enable_octavia: true
2929
kolla_enable_opensearch: true
3030
kolla_enable_prometheus: true
3131
kolla_enable_redis: true
32-
kolla_enable_skyline: true
3332
kolla_build_neutron_ovs: true
3433

3534
###############################################################################

etc/kayobe/kolla/inventory/group_vars/prometheus-blackbox-exporter

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ prometheus_blackbox_exporter_endpoints_default:
111111
enabled: "{{ enable_etcd | bool }}"
112112
- endpoints:
113113
- "grafana:http_2xx:{{ grafana_public_endpoint }}"
114+
enabled: "{{ enable_grafana_external | bool }}"
115+
- endpoints:
114116
- "{{ ('grafana_internal:http_2xx:' + grafana_internal_endpoint) if not kolla_same_external_internal_vip | bool }}"
115117
enabled: "{{ enable_grafana | bool }}"
116118
- endpoints:

etc/kayobe/kolla/kolla-build.conf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,11 @@ build_args = {{ (kolla_build_args | default({})).items() | map('join', ':') | jo
1616
type = git
1717
location = https://github.com/stackhpc/requirements
1818
reference = stackhpc/{{ openstack_release }}
19+
20+
[etcd]
21+
version = 3.5.21
22+
sha256 = amd64:adddda4b06718e68671ffabff2f8cee48488ba61ad82900e639d108f2148501c,arm64:95bf6918623a097c0385b96f139d90248614485e781ec9bee4768dbb6c79c53f
23+
24+
[letsencrypt-lego]
25+
version = v4.23.1
26+
sha256 = amd64:1fd60b1fd59c239bed22719a5de402cb745d1f933540cb1ec196e2c03e6e8882,arm64:1114745108343286d4bff189b4bdee3cba9d07ebcacc673860d91ab951d31e0d

etc/kayobe/pulp-repo-versions.yml

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_aarch64_version: 20240927T0
1414
stackhpc_pulp_repo_ceph_reef_debian_version: 20240925T152022
1515
stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version: 20241218T154614
1616
stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20250401T001425
17-
stackhpc_pulp_repo_elrepo_9_version: 20241129T235743
18-
stackhpc_pulp_repo_elrepo_9_aarch64_version: 20240927T073838
19-
stackhpc_pulp_repo_epel_9_version: 20241216T235733
20-
stackhpc_pulp_repo_epel_9_aarch64_version: 20241217T012754
21-
stackhpc_pulp_repo_grafana_version: 20241216T002739
22-
stackhpc_pulp_repo_opensearch_2_x_version: 20241106T010702
23-
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20241106T010702
17+
stackhpc_pulp_repo_elrepo_9_version: 20250610T235426
18+
stackhpc_pulp_repo_elrepo_9_aarch64_version: 20250408T030629
19+
stackhpc_pulp_repo_epel_9_version: 20250615T000221
20+
stackhpc_pulp_repo_epel_9_aarch64_version: 20250615T015805
21+
stackhpc_pulp_repo_grafana_version: 20250615T005738
22+
stackhpc_pulp_repo_opensearch_2_x_version: 20250430T014638
23+
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20250430T014638
2424
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20241217T002152
2525
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_aarch64_version: 20241213T015928
2626
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20241217T002152
@@ -50,20 +50,30 @@ stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20240510T001129
5050
stackhpc_pulp_repo_rocky_9_4_appstream_version: 20240816T002610
5151
stackhpc_pulp_repo_rocky_9_4_baseos_version: 20240816T002610
5252
stackhpc_pulp_repo_rocky_9_4_crb_version: 20240816T002610
53-
stackhpc_pulp_repo_rocky_9_5_crb_aarch64_version: 20241217T012754
5453
stackhpc_pulp_repo_rocky_9_4_extras_version: 20240816T002610
5554
stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240816T002610
5655
stackhpc_pulp_repo_rocky_9_5_appstream_version: 20241217T005008
5756
stackhpc_pulp_repo_rocky_9_5_appstream_aarch64_version: 20241217T012754
5857
stackhpc_pulp_repo_rocky_9_5_baseos_version: 20241216T013503
5958
stackhpc_pulp_repo_rocky_9_5_baseos_aarch64_version: 20241216T011954
6059
stackhpc_pulp_repo_rocky_9_5_crb_version: 20241217T005008
60+
stackhpc_pulp_repo_rocky_9_5_crb_aarch64_version: 20241217T012754
6161
stackhpc_pulp_repo_rocky_9_5_extras_version: 20241216T004230
6262
stackhpc_pulp_repo_rocky_9_5_extras_aarch64_version: 20241216T011954
6363
stackhpc_pulp_repo_rocky_9_5_highavailability_version: 20241202T003154
6464
stackhpc_pulp_repo_rocky_9_5_highavailability_aarch64_version: 20241203T010516
6565
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20241127T003858
6666
stackhpc_pulp_repo_rocky_9_sig_security_common_aarch64_version: 20241127T011228
67+
stackhpc_pulp_repo_rocky_9_6_appstream_version: 20250614T015933
68+
stackhpc_pulp_repo_rocky_9_6_appstream_aarch64_version: 20250614T024523
69+
stackhpc_pulp_repo_rocky_9_6_baseos_version: 20250614T030644
70+
stackhpc_pulp_repo_rocky_9_6_baseos_aarch64_version: 20250614T024523
71+
stackhpc_pulp_repo_rocky_9_6_crb_version: 20250614T015933
72+
stackhpc_pulp_repo_rocky_9_6_crb_aarch64_version: 20250614T024523
73+
stackhpc_pulp_repo_rocky_9_6_extras_version: 20250605T150141
74+
stackhpc_pulp_repo_rocky_9_6_extras_aarch64_version: 20250605T150141
75+
stackhpc_pulp_repo_rocky_9_6_highavailability_version: 20250605T150141
76+
stackhpc_pulp_repo_rocky_9_6_highavailability_aarch64_version: 20250605T150141
6777
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20250416T042645
6878
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20250417T070229
6979
stackhpc_pulp_repo_ubuntu_jammy_version: 20250417T070229
@@ -73,3 +83,7 @@ stackhpc_pulp_repo_rhel_9_4_doca_version: 20241211T153620
7383
stackhpc_pulp_repo_rhel_9_4_doca_modules_version: 20241213T112245
7484
stackhpc_pulp_repo_rhel_9_5_doca_version: 20241211T171301
7585
stackhpc_pulp_repo_rhel_9_5_doca_modules_version: 20250115T150314
86+
##### NOTE: Dummy variables, currently no RL9.6 DOCA
87+
stackhpc_pulp_repo_rhel_9_6_doca_modules_version: 00000000T000000
88+
stackhpc_pulp_repo_rhel_9_6_doca_version: 00000000T000000
89+
######

etc/kayobe/pulp.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ stackhpc_pulp_distribution_deb_production: >-
242242

243243
# Whether to sync Rocky Linux 9 packages.
244244
stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' }}"
245-
# Rocky 9 minor version number. Supported values: 1, 2, 3, 4, 5. Default is 5
246-
stackhpc_pulp_repo_rocky_9_minor_version: 5
245+
# Rocky 9 minor version number. Supported values: 1, 2, 3, 4, 5, 6. Default is 6
246+
stackhpc_pulp_repo_rocky_9_minor_version: 6
247247
# Rocky 9 Snapshot versions. The defaults use the appropriate version from
248248
# pulp-repo-versions.yml for the selected minor release.
249249

@@ -603,8 +603,6 @@ stackhpc_pulp_images_kolla:
603603
- rabbitmq
604604
- redis
605605
- redis-sentinel
606-
- skyline-apiserver
607-
- skyline-console
608606

609607
# List of images for each base distribution which should not/cannot be built.
610608
stackhpc_kolla_unbuildable_images:

etc/kayobe/trivy/allowed-vulnerabilities.yml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,31 @@ fluentd_allowed_vulnerabilities:
1616
- CVE-2024-27280
1717
grafana_allowed_vulnerabilities:
1818
- CVE-2024-8986
19-
skyline_apiserver_allowed_vulnerabilities:
20-
- CVE-2024-33663
19+
influxdb_allowed_vulnerabilities:
20+
- CVE-2024-45337
21+
magnum_conductor_allowed_vulnerabilities:
22+
- CVE-2024-45337
23+
prometheus_blackbox_exporter_allowed_vulnerabilities:
24+
- CVE-2024-45337
25+
prometheus_memcached_exporter_allowed_vulnerabilities:
26+
- CVE-2024-45337
27+
prometheus_mysqld_exporter_allowed_vulnerabilities:
28+
- CVE-2024-45337
29+
prometheus_elasticsearch_exporter_allowed_vulnerabilities:
30+
- CVE-2024-45337
31+
prometheus_node_exporter_allowed_vulnerabilities:
32+
- CVE-2024-45337
33+
prometheus_openstack_exporter_allowed_vulnerabilities:
34+
- CVE-2024-45337
35+
prometheus_libvirt_exporter_allowed_vulnerabilities:
36+
- CVE-2024-45337
37+
prometheus_cadvisor_allowed_vulnerabilities:
38+
- CVE-2024-41110
39+
- CVE-2024-45337
40+
prometheus_msteams_allowed_vulnerabilities:
41+
- CVE-2024-45337
42+
prometheus_v2_server_allowed_vulnerabilities:
43+
- CVE-2024-45337
2144

2245
###############################################################################
2346
# Dummy variable to allow Ansible to accept this file.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
deprecations:
3+
- |
4+
Disabled building of Kolla container images for Skyline

0 commit comments

Comments
 (0)