Magnum: override rather than add secondary driver

Upstream Kolla installs magnum-cluster-api by default. Magnum is likely to pick up that driver, so exclude it from the install list and avoid explicitly disabling it in the config.

Author: cityofships

etc/kayobe/kolla.yml

@@ -344,10 +344,6 @@ kolla_build_blocks:
     ADD additions-archive /
   magnum_base_footer: |
     RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | head -n -1 | bash
-    {% raw %}
-    {% set magnum_capi_packages = ['magnum-capi-helm==1.1.0'] %}
-    RUN {{ macros.install_pip(magnum_capi_packages | customizable("pip_packages")) }}
-    {% endraw %}
 
 # Dict mapping image customization variable names to their values.
 # Each variable takes the form:
@@ -360,6 +356,9 @@ kolla_build_customizations_common:
     - /additions/*
   ironic_inspector_pip_packages_append:
     - /additions/*
+  magnum_base_pip_packages_override:
+    - /magnum[osprofiler]
+    - magnum-capi-helm
   neutron_server_packages_append:
     - python3-libvirt
     - python3-ethtool