Skip to content

Commit 6222d3d

Browse files
assumptionsandgmarkgoddard
authored andcommitted
Remove kolla_build_customizations_rocky defaults
1 parent c50e479 commit 6222d3d

File tree

1 file changed

+1
-41
lines changed

1 file changed

+1
-41
lines changed

etc/kayobe/kolla.yml

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -307,47 +307,7 @@ kolla_build_customizations_common:
307307
ironic_inspector_pip_packages_append:
308308
- /additions/*
309309

310-
kolla_build_customizations_rocky: # TODO: Check whether this is actually correct. It seems that it was previously being skipped for rocky
311-
base_yum_repo_files_remove:
312-
- proxysql.repo
313-
neutron_base_packages_remove:
314-
- openvswitch
315-
- python3-openvswitch
316-
neutron_base_packages_append:
317-
- openvswitch2.17
318-
- python3-openvswitch2.17
319-
nova_base_packages_remove:
320-
- openvswitch
321-
- python3-openvswitch
322-
nova_base_packages_append:
323-
- openvswitch2.17
324-
- python3-openvswitch2.17
325-
nova_compute_packages_remove:
326-
- openvswitch
327-
nova_compute_packages_append:
328-
- openvswitch2.17
329-
octavia_base_packages_remove:
330-
- openvswitch
331-
- python3-openvswitch
332-
octavia_base_packages_append:
333-
- openvswitch2.17
334-
- python3-openvswitch2.17
335-
ovn_base_packages_override:
336-
- ovn22.09
337-
ovn_controller_packages_override:
338-
- ovn22.09-host
339-
ovn_nb_db_server_packages_override:
340-
- ovn22.09-central
341-
ovn_northd_packages_override:
342-
- ovn22.09-central
343-
ovn_sb_db_server_packages_override:
344-
- ovn22.09-central
345-
openvswitch_base_packages_remove:
346-
- openvswitch
347-
- python3-openvswitch
348-
openvswitch_base_packages_append:
349-
- openvswitch2.17
350-
- python3-openvswitch2.17
310+
kolla_build_customizations_rocky: {}
351311

352312
kolla_build_customizations_ubuntu: {}
353313

0 commit comments

Comments
 (0)