fix packages we customise

Author: owenjones

etc/kayobe/kolla.yml

@@ -468,11 +468,8 @@ kolla_build_customizations_common:
   # v ethtool still needed?
   neutron_server_packages_append:
     - python3-libvirt
-    - python3-ethtool
-  # v ethtool still needed?
   nova_compute_packages_append:
     - python3-libvirt
-    - python3-ethtool
   neutron_mlnx_agent_pip_packages_override:
     - networking-mlnx@git+https://opendev.org/x/networking-mlnx@master
 
@@ -503,12 +500,16 @@ kolla_build_customizations_rocky:
     neutron_base_packages_append:
       - openvswitch3.3
       - python3-openvswitch3.3
+    neutron_server_packages_append:
+    - python3-ethtool
     nova_base_packages_remove:
       - openvswitch
       - python3-openvswitch
     nova_base_packages_append:
       - openvswitch3.3
       - python3-openvswitch3.3
+    nova_compute_packages_append:
+    - python3-ethtool
     nova_libvirt_packages_remove:
       - openvswitch
     octavia_base_packages_remove:
@@ -531,6 +532,48 @@ kolla_build_customizations_rocky:
       - ovn24.03-central
 
   rocky-10:
+    base_centos_yum_repos_to_disable_remove:
+      - epel
+      - centos10-opstools
+      - centos10-rabbitmq
+      - centos10-storage
+      - centos-nvf-openvswitch
+    kolla_toolbox_packages_remove:
+      - openvswitch3.5
+    kolla_toolbox_packages_append:
+      - openvswitch3.3
+    manila_base_packages_remove:
+      - openvswitch3.5
+    manila_base_packages_append:
+      - openvswitch3.3
+    neutron_base_packages_remove:
+      - openvswitch3.5
+      - python3-openvswitch3.5
+    neutron_base_packages_append:
+      - openvswitch3.3
+      - python3-openvswitch3.3
+    nova_base_packages_remove:
+      - openvswitch3.5
+      - python3-openvswitch3.5
+    nova_base_packages_append:
+      - openvswitch3.3
+      - python3-openvswitch3.3
+    nova_libvirt_packages_remove:
+      - openvswitch3.5
+    nova_libvirt_packages_append:
+      - openvswitch3.3
+    octavia_base_packages_remove:
+      - openvswitch3.5
+      - python3-openvswitch3.5
+    octavia_base_packages_append:
+      - openvswitch3.3
+      - python3-openvswitch3.3
+    openvswitch_base_packages_remove:
+      - openvswitch3.5
+      - python3-openvswitch3.5
+    openvswitch_base_packages_append:
+      - openvswitch3.3
+      - python3-openvswitch3.3
     ovn_base_packages_override:
       - ovn24.03
     ovn_controller_packages_override: