openstack/openstack-ansible
Code Issues Proposed changes

Install rsync for CentOS bootstrap

Browse Source 
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
This commit is contained in:
Dmitriy Rabotyagov 2021-01-26 12:39:27 +02:00 committed by Dmitriy Rabotyagov
parent 174b29da95
commit 7293771b72
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/bootstrap-ansible.sh
View File

@ -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

3
scripts/scripts-library.sh
View File

@ -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
}