From 7293771b72b4b5afa0b16cc9a89bda5f8c1e6320 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 26 Jan 2021 12:39:27 +0200 Subject: [PATCH] Install rsync for CentOS bootstrap We use rsync to copy selinux modules into ansible venv, but never care about installing rsync for that. We also drop hook made for compatability with CentOS 7 Closes-Bug: #1913204 Change-Id: I02aa3b85582301a93ccb5ad7c921bd3c10a787db --- scripts/bootstrap-ansible.sh | 2 +- scripts/scripts-library.sh | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index c7b10af474..73620e970e 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -71,7 +71,7 @@ case ${DISTRO_ID} in git curl autoconf gcc gcc-c++ nc \ python3 python3-devel libselinux-python3 \ openssl-devel libffi-devel \ - python3-virtualenv + python3-virtualenv rsync ;; ubuntu|debian) # NOTE(mgariepy) remove this on ansible 2.10 if debian is in the config/base.yml file diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh index 9a36f1e5a4..66f4e20f20 100755 --- a/scripts/scripts-library.sh +++ b/scripts/scripts-library.sh @@ -88,9 +88,6 @@ function build_ansible_runtime_venv { # Add SELinux support to the venv if [ -d "/usr/lib64/python3.6/site-packages/selinux/" ]; then rsync -avX /usr/lib64/python3.6/site-packages/selinux/ /opt/ansible-runtime/lib64/python3.6/site-packages/selinux/ - fi - # NOTE(noonedeadpunk) Conditional is here for compatability with CentOS 7 - if [ -f "/usr/lib64/python3.6/site-packages/_selinux.cpython-36m-x86_64-linux-gnu.so" ]; then rsync -avX /usr/lib64/python3.6/site-packages/_selinux.cpython-36m-x86_64-linux-gnu.so /opt/ansible-runtime/lib64/python3.6/site-packages/ fi }