diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index ace7eeb5a8..0094c9b459 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -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 diff --git a/tests/roles/bootstrap-host/vars/redhat-8.yml b/tests/roles/bootstrap-host/vars/redhat-8.yml deleted file mode 100644 index c9e9b8afda..0000000000 --- a/tests/roles/bootstrap-host/vars/redhat-8.yml +++ /dev/null @@ -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 diff --git a/tests/roles/bootstrap-host/vars/redhat-9.yml b/tests/roles/bootstrap-host/vars/redhat-9.yml deleted file mode 100644 index a3e7686196..0000000000 --- a/tests/roles/bootstrap-host/vars/redhat-9.yml +++ /dev/null @@ -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 diff --git a/tests/roles/bootstrap-host/vars/redhat.yml b/tests/roles/bootstrap-host/vars/redhat.yml index f2c60e6e06..7e996d6e14 100644 --- a/tests/roles/bootstrap-host/vars/redhat.yml +++ b/tests/roles/bootstrap-host/vars/redhat.yml @@ -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