Install curl by defining binary that is provided

Currently, curl conflicts with curl-minimal package on Rocky:
package curl-minimal-7.76.1-19.el9_1.1.x86_64 conflicts with curl
provided by curl-7.76.1-19.el9_1.1.x86_64

To avoid complex logic between curl/curl-minimal we just install
package by providing a path to the binary it should provide.

Based on the distro this will result in instalation of either
curl or curl-minimal.

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-openstack_hosts/+/872973
Change-Id: Ia1b657ae6a21d9c3be499e7ecf6b36c11c9f08d9
This commit is contained in:
Damian Dabrowski 2023-02-07 12:04:59 +01:00 committed by Dmitriy Rabotyagov
parent 168febc03a
commit 68cb6f950a
4 changed files with 2 additions and 76 deletions

View File

@ -96,7 +96,7 @@ esac
case ${DISTRO_ID} in
rocky|centos|rhel)
dnf -y install \
git curl autoconf gcc gcc-c++ nc \
git /usr/bin/curl autoconf gcc gcc-c++ nc \
systemd-devel pkgconf \
openssl-devel libffi-devel \
rsync wget

View File

@ -1,37 +0,0 @@
---
# Copyright 2017, Rackspace US, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
packages_install:
# - bridge-utils bridge-utils is not available in 8
# - btrfs-progs BTRFS is not available in 8
- curl
- dbus
- ethtool
- git
- iputils
- lvm2
- python3
- python3-devel
# - sshpass sshpass is not available in 8
#- systemd-networkd networkd is not available in 8
- vim
- xfsprogs
packages_remove: []
rc_local: /etc/rc.d/rc.local
rc_local_insert_before: "^touch /var/lock/subsys/local$"
nfs_package: nfs-utils

View File

@ -1,33 +0,0 @@
---
# Copyright 2017, Rackspace US, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
packages_install:
- curl
- dbus
- ethtool
- git
- iputils
- lvm2
- python3
- python3-devel
- vim
- xfsprogs
packages_remove: []
rc_local: /etc/rc.d/rc.local
rc_local_insert_before: "^touch /var/lock/subsys/local$"
nfs_package: nfs-utils

View File

@ -14,9 +14,7 @@
# limitations under the License.
packages_install:
- bridge-utils
- btrfs-progs
- curl
- /usr/bin/curl
- dbus
- ethtool
- git
@ -24,8 +22,6 @@ packages_install:
- lvm2
- python3
- python3-devel
- sshpass
- systemd-networkd
- vim
- xfsprogs