Skip to content

Commit a3c9dbd

Browse files
Remove kolla_build_customizations_rocky defaults
1 parent fe5d26e commit a3c9dbd

File tree

2 files changed

+4
-41
lines changed

2 files changed

+4
-41
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,6 @@ stackhpc_docker_registry_password: !vault |
8989
# Username and password of the overcloud host image repository.
9090
stackhpc_image_repository_username: "{{ stackhpc_docker_registry_username }}"
9191
stackhpc_image_repository_password: "{{ stackhpc_docker_registry_password }}"
92+
93+
# SELinux set to disabled mode.
94+
selinux_state: disabled

etc/kayobe/kolla.yml

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -277,47 +277,7 @@ kolla_build_customizations_common:
277277
ironic_inspector_pip_packages_append:
278278
- /additions/*
279279

280-
kolla_build_customizations_rocky: # TODO: Check whether this is actually correct. It seems that it was previously being skipped for rocky
281-
base_yum_repo_files_remove:
282-
- proxysql.repo
283-
neutron_base_packages_remove:
284-
- openvswitch
285-
- python3-openvswitch
286-
neutron_base_packages_append:
287-
- openvswitch2.17
288-
- python3-openvswitch2.17
289-
nova_base_packages_remove:
290-
- openvswitch
291-
- python3-openvswitch
292-
nova_base_packages_append:
293-
- openvswitch2.17
294-
- python3-openvswitch2.17
295-
nova_compute_packages_remove:
296-
- openvswitch
297-
nova_compute_packages_append:
298-
- openvswitch2.17
299-
octavia_base_packages_remove:
300-
- openvswitch
301-
- python3-openvswitch
302-
octavia_base_packages_append:
303-
- openvswitch2.17
304-
- python3-openvswitch2.17
305-
ovn_base_packages_override:
306-
- ovn22.09
307-
ovn_controller_packages_override:
308-
- ovn22.09-host
309-
ovn_nb_db_server_packages_override:
310-
- ovn22.09-central
311-
ovn_northd_packages_override:
312-
- ovn22.09-central
313-
ovn_sb_db_server_packages_override:
314-
- ovn22.09-central
315-
openvswitch_base_packages_remove:
316-
- openvswitch
317-
- python3-openvswitch
318-
openvswitch_base_packages_append:
319-
- openvswitch2.17
320-
- python3-openvswitch2.17
280+
kolla_build_customizations_rocky: {} # TODO: Check whether this is actually correct. It seems that it was previously being skipped for rocky
321281

322282
kolla_build_customizations_ubuntu: {}
323283

0 commit comments

Comments
 (0)