diff options
| author | Takashi Kajinami <tkajinam@redhat.com> | 2021-08-15 23:51:42 +0900 |
|---|---|---|
| committer | Takashi Kajinami <tkajinam@redhat.com> | 2021-08-16 22:42:38 +0900 |
| commit | 1b97560c97d8b06ca5568b909ae69eb07d0415fc (patch) | |
| tree | 12bbf602d2f4e2af158fd010beed2cb3282381b1 | |
| parent | 6026253883fac20cffdd22f6d5feb4ca0800c806 (diff) | |
| download | ceilometer-1b97560c97d8b06ca5568b909ae69eb07d0415fc.tar.gz | |
Do not install libvirt python bindings from pip
Since [1] was merged, devstack no longer installs libvirt python
bindings from pip but use distro packages. This change removes
the logic to install the python bindings using pip to follow that
change in devstack, otherwise installation fails because of conflict
between packages available in pip and one installed by distro packages.
[1] https://review.opendev.org/c/openstack/devstack/+/798514
Conflicts:
devstack/plugin.sh
Resolved conflicts caused by f57a51e43ca7a8903763cc24b1c510fa50a16b2c
which is not backported to stable branches.
Closes-Bug: #1939990
Related-Bug: #1933096
Change-Id: I369a95cf30e91738d10ad2e5a3d5f6988bdd76cb
(cherry picked from commit 9366bc8f18a07695aa1af9217307b0a55376a331)
| -rw-r--r-- | devstack/plugin.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index dd5a15e2..c4407836 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -97,9 +97,8 @@ function _ceilometer_prepare_coordination { function _ceilometer_prepare_virt_drivers { # Only install virt drivers if we're running nova compute if is_service_enabled n-cpu ; then - if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then - pip_install_gr libvirt-python - fi + # NOTE(tkajinam): pythonN-libvirt is installed using distro + # packages in devstack if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then pip_install_gr oslo.vmware |