Remove kolla_build_customizations_rocky defaults

stackhpc · Sep 13, 2023 · 166adf1 · 166adf1
1 parent fe5d26e
commit 166adf1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 41 deletions.
diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -89,3 +89,6 @@ stackhpc_docker_registry_password: !vault |
 # Username and password of the overcloud host image repository.
 stackhpc_image_repository_username: "{{ stackhpc_docker_registry_username }}"
 stackhpc_image_repository_password: "{{ stackhpc_docker_registry_password }}"
+
+# SELinux set to permissive mode.
+selinux_state: permissive
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
@@ -277,47 +277,7 @@ kolla_build_customizations_common:
   ironic_inspector_pip_packages_append:
     - /additions/*
 
-kolla_build_customizations_rocky: # TODO: Check whether this is actually correct. It seems that it was previously being skipped for rocky
-  base_yum_repo_files_remove:
-    - proxysql.repo
-  neutron_base_packages_remove:
-    - openvswitch
-    - python3-openvswitch
-  neutron_base_packages_append:
-    - openvswitch2.17
-    - python3-openvswitch2.17
-  nova_base_packages_remove:
-    - openvswitch
-    - python3-openvswitch
-  nova_base_packages_append:
-    - openvswitch2.17
-    - python3-openvswitch2.17
-  nova_compute_packages_remove:
-    - openvswitch
-  nova_compute_packages_append:
-    - openvswitch2.17
-  octavia_base_packages_remove:
-    - openvswitch
-    - python3-openvswitch
-  octavia_base_packages_append:
-    - openvswitch2.17
-    - python3-openvswitch2.17
-  ovn_base_packages_override:
-    - ovn22.09
-  ovn_controller_packages_override:
-    - ovn22.09-host
-  ovn_nb_db_server_packages_override:
-    - ovn22.09-central
-  ovn_northd_packages_override:
-    - ovn22.09-central
-  ovn_sb_db_server_packages_override:
-    - ovn22.09-central
-  openvswitch_base_packages_remove:
-    - openvswitch
-    - python3-openvswitch
-  openvswitch_base_packages_append:
-    - openvswitch2.17
-    - python3-openvswitch2.17
+kolla_build_customizations_rocky: {} # TODO: Check whether this is actually correct. It seems that it was previously being skipped for rocky
 
 kolla_build_customizations_ubuntu: {}