Skip to content

Commit e8d596c

Browse files
Alex-Welshseunghun1ee
Alex-Welsh
and
seunghun1ee
authored
Update Kolla config (#1243)
* Remove stackhpc/neutron source for 2024.1 * Add downstream upper-constraints ENV variable Bifrost and Kolla-toolbox needs override as their build process is different to other Kolla images. * Update pulp repo version for Caracal * Update Openstack RPM repo to Caracal * Set koll_build_args as empty dict to avoid build error * Update StackHPC Openstack rpm repo target to Caracal * Re-add omitted rhel9 influxdb repo * Update centos9 caracal repo version * define openstack-base from kolla_sources * Use upstream requirements for testing * bring back stackhpc requirements * Remove antelope prometheus version override * Bump Ceph to Reef * Remove horizon stackhpc fork source * Fix broken package repo versions * Update version of RL9 third-party repos Update threasuredata from 4 to 5 Update mariadb from 10.6 to 10.11 * Explicitly set version of prometheus version * Add missing requirements option * Update rpm repos to match Caracal * Fix RabbitMQ repo naming * Fixup Caracal Kolla config * Bump pulp repo versions * Build OVN Octavia provider from upstream * Revert "Explicitly set version of prometheus version" This reverts commit 901f67f. * Pulp repo versions eof newline --------- Co-authored-by: Seunghun Lee <[email protected]>
1 parent 3a1c2a3 commit e8d596c

File tree

7 files changed

+102
-191
lines changed

7 files changed

+102
-191
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ stackhpc_repo_mirror_password: !vault |
2323
2424
# Build against released Pulp repository versions.
2525
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
26-
stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"
27-
stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rabbitmq_server_version }}"
26+
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version }}"
27+
stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
2828
stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
2929
stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"
3030
stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
3131
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
3232
stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version }}"
3333
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
34-
stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}"
34+
stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
3535
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
36-
stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}"
36+
stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
3737
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
38-
stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
39-
stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
38+
stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
39+
stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
4040
stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_version }}"
4141
stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
4242
stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,20 @@ stackhpc_repo_mirror_password: !vault |
4747
4848
# Build against released Pulp repository versions.
4949
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
50-
stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"
51-
stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rabbitmq_server_version }}"
50+
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version }}"
51+
stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
5252
stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
5353
stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"
5454
stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
5555
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
5656
stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version }}"
5757
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
58-
stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}"
58+
stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
5959
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
60-
stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}"
60+
stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
6161
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
62-
stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
63-
stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
62+
stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
63+
stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
6464
stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_version }}"
6565
stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
6666
stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ stackhpc_repo_mirror_password: !vault |
2323
2424
# Build and deploy released Pulp repository versions.
2525
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
26-
stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"
27-
stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rabbitmq_server_version }}"
26+
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version }}"
27+
stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
2828
stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
2929
stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"
3030
stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
3131
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
3232
stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version }}"
3333
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
34-
stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}"
34+
stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
3535
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
36-
stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}"
36+
stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
3737
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
38-
stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_4_version }}"
39-
stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}"
38+
stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
39+
stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
4040
stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_version }}"
4141
stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
4242
stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}"

‎etc/kayobe/kolla.yml

Lines changed: 11 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,6 @@ kolla_sources:
121121
type: git
122122
location: https://github.com/stackhpc/cloudkitty.git
123123
reference: stackhpc/{{ openstack_release }}
124-
horizon:
125-
type: git
126-
location: https://github.com/stackhpc/horizon.git
127-
reference: stackhpc/{{ openstack_release }}
128124
horizon-plugin-cloudkitty-dashboard:
129125
type: git
130126
location: https://github.com/stackhpc/cloudkitty-dashboard.git
@@ -134,15 +130,10 @@ kolla_sources:
134130
type: git
135131
location: https://github.com/stackhpc/stackhpc-inspector-plugins.git
136132
reference: 1.3.0
137-
# Not yet merged: https://github.com/stackhpc/magnum/pull/139
138133
magnum-base:
139134
type: git
140135
location: https://github.com/stackhpc/magnum.git
141136
reference: stackhpc/{{ openstack_release }}
142-
neutron-base:
143-
type: git
144-
location: https://github.com/stackhpc/neutron.git
145-
reference: stackhpc/{{ openstack_release }}
146137
neutron-base-plugin-networking-generic-switch:
147138
type: git
148139
location: https://github.com/stackhpc/networking-generic-switch.git
@@ -168,9 +159,9 @@ stackhpc_rocky_9_additional_repos:
168159
- url: "{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_url }}"
169160
file: "CentOS-NFV-OpenvSwitch.repo"
170161
tag: "centos-nfv-openvswitch"
171-
- url: "{{ stackhpc_repo_centos_stream_9_openstack_antelope_url }}"
172-
file: "CentOS-OpenStack-antelope.repo"
173-
tag: "centos-openstack-antelope"
162+
- url: "{{ stackhpc_repo_centos_stream_9_openstack_caracal_url }}"
163+
file: "CentOS-OpenStack-caracal.repo"
164+
tag: "centos-openstack-caracal"
174165
- url: "{{ stackhpc_repo_centos_stream_9_opstools_url }}"
175166
file: "CentOS-OpsTools.repo"
176167
tag: "centos-opstools"
@@ -186,22 +177,22 @@ stackhpc_rocky_9_third_party_repos:
186177
- url: "{{ stackhpc_repo_grafana_url }}"
187178
file: "grafana.repo"
188179
tag: "grafana"
189-
- url: "{{ stackhpc_repo_rhel_9_treasuredata_4_url }}"
180+
- url: "{{ stackhpc_repo_rhel_9_treasuredata_5_url }}"
190181
file: "td.repo"
191182
tag: "treasuredata"
192-
- url: "{{ stackhpc_repo_rhel_9_mariadb_10_6_url }}"
183+
- url: "{{ stackhpc_repo_rhel_9_mariadb_10_11_url }}"
193184
file: "mariadb.repo"
194185
tag: "mariadb"
195186
- url: "{{ stackhpc_repo_rhel_9_influxdb_url }}"
196187
file: "influxdb.repo"
197188
tag: "influxdb"
198-
- url: "{{ stackhpc_repo_centos_stream_9_storage_ceph_quincy_url }}"
199-
file: "CentOS-Ceph-Quincy.repo"
200-
tag: "centos-ceph-quincy"
201-
- url: "{{ stackhpc_repo_rabbitmq_erlang_url }}"
189+
- url: "{{ stackhpc_repo_centos_stream_9_storage_ceph_reef_url }}"
190+
file: "CentOS-Ceph-Reef.repo"
191+
tag: "centos-ceph-reef"
192+
- url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_url }}"
202193
file: "rabbitmq_rabbitmq-erlang.repo"
203194
tag: "rabbitmq_rabbitmq-erlang"
204-
- url: "{{ stackhpc_repo_rabbitmq_server_url }}"
195+
- url: "{{ stackhpc_repo_rhel9_rabbitmq_server_url }}"
205196
file: "rabbitmq_rabbitmq-server.repo"
206197
tag: "rabbitmq_rabbitmq-server"
207198
- url: "{{ stackhpc_repo_opensearch_2_x_url }}"
@@ -324,7 +315,6 @@ kolla_build_blocks:
324315
ENV UPPER_CONSTRAINTS_FILE=https://raw.githubusercontent.com/stackhpc/requirements/stackhpc/{{ openstack_release }}/upper-constraints.txt
325316
bifrost_base_header: |
326317
ADD additions-archive /
327-
ENV ANSIBLE_PIP_VERSION='>=8,<9'
328318
ENV TOX_CONSTRAINTS_FILE=/requirements/upper-constraints.txt
329319
grafana_plugins_install: |
330320
RUN grafana-cli plugins install vonage-status-panel \
@@ -339,86 +329,6 @@ kolla_build_blocks:
339329
{% set magnum_capi_packages = ['magnum-capi-helm==1.1.0'] %}
340330
RUN {{ macros.install_pip(magnum_capi_packages | customizable("pip_packages")) }}
341331
{% endraw %}
342-
prometheus_alertmanager_repository_version: | # 2023.1 kolla has 0.24.0
343-
{% raw %}
344-
ARG prometheus_alertmanager_version=0.26.0
345-
ARG prometheus_alertmanager_archive=alertmanager-${prometheus_alertmanager_version}.linux-{{debian_arch}}.tar.gz
346-
ARG prometheus_alertmanager_sha256sums_url=https://github.com/prometheus/alertmanager/releases/download/v${prometheus_alertmanager_version}/sha256sums.txt
347-
ARG prometheus_alertmanager_download_url=https://github.com/prometheus/alertmanager/releases/download/v${prometheus_alertmanager_version}/${prometheus_alertmanager_archive}
348-
{% endraw %}
349-
prometheus_blackbox_exporter_repository_version: | # 2023.1 kolla has 0.23.0
350-
{% raw %}
351-
ARG blackbox_exporter_version=0.25.0
352-
ARG blackbox_exporter_url=https://github.com/prometheus/blackbox_exporter/releases/download/v${blackbox_exporter_version}/blackbox_exporter-${blackbox_exporter_version}.linux-{{debian_arch}}.tar.gz
353-
{% endraw %}
354-
prometheus_cadvisor_repository_version: | # 2023.1 kolla has 0.48.0
355-
{% raw %}
356-
ARG prometheus_cadvisor_version=0.49.1
357-
{% if debian_arch == 'arm64' %}
358-
ARG prometheus_cadvisor_sha256sum=c535f46d789599f25c7c680af193d4402da27a98d9828eb2ec916af6256e0c0c
359-
{% else %}
360-
ARG prometheus_cadvisor_sha256sum=1d5cc701a3fcdf1e8ed1c86da5304b896a6997d9e6673139e78a6f87812495b0
361-
{% endif %}
362-
ARG prometheus_cadvisor_url=https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor-v${prometheus_cadvisor_version}-linux-{{debian_arch}}
363-
{% endraw %}
364-
haproxy_exporter_repository_version: | # 2023.1 kolla has 0.13.0
365-
{% raw %}
366-
ARG haproxy_exporter_version=0.15.0
367-
ARG haproxy_exporter_url=https://github.com/prometheus/haproxy_exporter/releases/download/v${haproxy_exporter_version}/haproxy_exporter-${haproxy_exporter_version}.linux-{{debian_arch}}.tar.gz
368-
{% endraw %}
369-
prometheus_memcached_exporter_repository_version: | # 2023.1 kolla has 0.10.0
370-
{% raw %}
371-
ARG memcached_exporter_version=0.14.3
372-
ARG memcached_exporter_url=https://github.com/prometheus/memcached_exporter/releases/download/v${memcached_exporter_version}/memcached_exporter-${memcached_exporter_version}.linux-{{debian_arch}}.tar.gz
373-
{% endraw %}
374-
prometheus_msteams_repository_version: | # 2023.1 kolla has 1.5.1
375-
{% raw %}
376-
ARG prometheus_msteams_version=1.5.2
377-
ARG prometheus_msteams_sha256sum=0f4df9ee31e655d1ec876ea2c53ab5ae5b07143ef21b9190e61b4d52839e135c
378-
ARG prometheus_msteams_url=https://github.com/prometheus-msteams/prometheus-msteams/releases/download/v${prometheus_msteams_version}/prometheus-msteams-linux-{{debian_arch}}
379-
{% endraw %}
380-
prometheus_mtail_version: | # 2023.1 kolla has 3.0.0-rc50
381-
{% raw %}
382-
ARG prometheus_mtail_version=3.0.0-rc53
383-
ARG prometheus_mtail_url=https://github.com/google/mtail/releases/download/v${prometheus_mtail_version}/mtail_${prometheus_mtail_version}_linux_{{debian_arch}}.tar.gz
384-
{% endraw %}
385-
mysqld_exporter_repository_version: | # 2023.1 kolla has 0.15.0
386-
{% raw %}
387-
ARG mysqld_exporter_version=0.15.1
388-
ARG mysqld_exporter_url=https://github.com/prometheus/mysqld_exporter/releases/download/v${mysqld_exporter_version}/mysqld_exporter-${mysqld_exporter_version}.linux-{{debian_arch}}.tar.gz
389-
{% endraw %}
390-
node_exporter_repository_version: | # 2023.1 kolla has 1.4.0
391-
{% raw %}
392-
ARG node_exporter_version=1.7.0
393-
{% if debian_arch == 'arm64' %}
394-
ARG node_exporter_sha256sum=e386c7b53bc130eaf5e74da28efc6b444857b77df8070537be52678aefd34d96
395-
{% else %}
396-
ARG node_exporter_sha256sum=a550cd5c05f760b7934a2d0afad66d2e92e681482f5f57a917465b1fba3b02a6
397-
{% endif %}
398-
ARG node_exporter_url=https://github.com/prometheus/node_exporter/releases/download/v{$node_exporter_version}/node_exporter-${node_exporter_version}.linux-{{debian_arch}}.tar.gz
399-
{% endraw %}
400-
prometheus_openstack_exporter_repository_version: | # 2023.1 kolla has 1.6.0
401-
{% raw %}
402-
ARG prometheus_openstack_exporter_version=1.7.0
403-
ARG prometheus_openstack_exporter_url=https://github.com/openstack-exporter/openstack-exporter/releases/download/v${prometheus_openstack_exporter_version}/openstack-exporter_${prometheus_openstack_exporter_version}_linux_{{debian_arch}}.tar.gz
404-
{% endraw %}
405-
prometheus_ovn_exporter_repository_version: | # 2023.1 kolla has 1.0.6
406-
{% raw %}
407-
{% if base_arch == 'x86_64' %}
408-
ARG ovn_arch=amd64
409-
{% elif base_arch == 'aarch64' %}
410-
ARG ovn_arch=arm64
411-
{% endif %}
412-
ARG prometheus_ovn_version=1.0.7
413-
ARG prometheus_ovn_cksum_url=https://github.com/greenpau/ovn_exporter/releases/download/v${prometheus_ovn_version}/checksums.txt
414-
ARG ovn_exporter_tgz=ovn-exporter_${prometheus_ovn_version}_linux_${ovn_arch}.tar.gz
415-
ARG prometheus_ovn_url=https://github.com/greenpau/ovn_exporter/releases/download/v${prometheus_ovn_version}/${ovn_exporter_tgz}
416-
{% endraw %}
417-
prometheus_v2_server_repository_version: | # 2023.1 kolla has 2.38.0
418-
{% raw %}
419-
ARG prometheus_version=2.51.1
420-
ARG prometheus_url=https://github.com/prometheus/prometheus/releases/download/v${prometheus_version}/prometheus-${prometheus_version}.linux-{{debian_arch}}.tar.gz
421-
{% endraw %}
422332
423333
# Dict mapping image customization variable names to their values.
424334
# Each variable takes the form:
@@ -483,7 +393,7 @@ kolla_build_customizations_ubuntu: {}
483393
kolla_build_customizations: "{{ kolla_build_customizations_common | combine(kolla_build_customizations_rocky if kolla_base_distro == 'rocky' else kolla_build_customizations_ubuntu) }}"
484394

485395
# Dict mapping Kolla Dockerfile ARG names to their values.
486-
#kolla_build_args:
396+
kolla_build_args: {}
487397

488398
###############################################################################
489399
# Kolla-ansible inventory configuration.

0 commit comments

Comments
 (0)