diff options
| author | Takashi Kajinami <tkajinam@redhat.com> | 2021-08-15 23:51:42 +0900 |
|---|---|---|
| committer | Takashi Kajinami <tkajinam@redhat.com> | 2021-08-16 08:23:00 +0000 |
| commit | 9366bc8f18a07695aa1af9217307b0a55376a331 (patch) | |
| tree | 1ddd89a0b09b7af09909fda4f055b1583c397190 /devstack | |
| parent | 829cef1aee18d45cfdb3af07bd1e34362efdada8 (diff) | |
| download | ceilometer-9366bc8f18a07695aa1af9217307b0a55376a331.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
Closes-Bug: #1939990
Related-Bug: #1933096
Change-Id: I369a95cf30e91738d10ad2e5a3d5f6988bdd76cb
Diffstat (limited to 'devstack')
| -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 9ffdaea8..616f5725 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' && "$DISTRO" != 'rhel8' ]]; 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 |