diff --git a/00_ansible_setup/01_python3/00_libtirpc-0.2.4-0.16.el7.x86_64.rpm b/00_ansible_setup/01_rpm/00_libtirpc-0.2.4-0.16.el7.x86_64.rpm similarity index 100% rename from 00_ansible_setup/01_python3/00_libtirpc-0.2.4-0.16.el7.x86_64.rpm rename to 00_ansible_setup/01_rpm/00_libtirpc-0.2.4-0.16.el7.x86_64.rpm diff --git a/00_ansible_setup/01_python3/01_python3-3.6.8-18.el7.x86_64.rpm b/00_ansible_setup/01_rpm/01_python3-3.6.8-18.el7.x86_64.rpm similarity index 100% rename from 00_ansible_setup/01_python3/01_python3-3.6.8-18.el7.x86_64.rpm rename to 00_ansible_setup/01_rpm/01_python3-3.6.8-18.el7.x86_64.rpm diff --git a/00_ansible_setup/01_python3/02_python3-setuptools-39.2.0-10.el7.noarch.rpm b/00_ansible_setup/01_rpm/02_python3-setuptools-39.2.0-10.el7.noarch.rpm similarity index 100% rename from 00_ansible_setup/01_python3/02_python3-setuptools-39.2.0-10.el7.noarch.rpm rename to 00_ansible_setup/01_rpm/02_python3-setuptools-39.2.0-10.el7.noarch.rpm diff --git a/00_ansible_setup/01_python3/03_python3-libs-3.6.8-18.el7.x86_64.rpm b/00_ansible_setup/01_rpm/03_python3-libs-3.6.8-18.el7.x86_64.rpm similarity index 100% rename from 00_ansible_setup/01_python3/03_python3-libs-3.6.8-18.el7.x86_64.rpm rename to 00_ansible_setup/01_rpm/03_python3-libs-3.6.8-18.el7.x86_64.rpm diff --git a/00_ansible_setup/01_python3/04_python3-pip-9.0.3-8.el7.noarch.rpm b/00_ansible_setup/01_rpm/04_python3-pip-9.0.3-8.el7.noarch.rpm similarity index 100% rename from 00_ansible_setup/01_python3/04_python3-pip-9.0.3-8.el7.noarch.rpm rename to 00_ansible_setup/01_rpm/04_python3-pip-9.0.3-8.el7.noarch.rpm diff --git a/00_ansible_setup/01_rpm/05_tcl-8.5.13-8.el7.x86_64.rpm b/00_ansible_setup/01_rpm/05_tcl-8.5.13-8.el7.x86_64.rpm new file mode 100644 index 0000000..026f5d5 Binary files /dev/null and b/00_ansible_setup/01_rpm/05_tcl-8.5.13-8.el7.x86_64.rpm differ diff --git a/00_ansible_setup/01_rpm/06_expect-5.45-14.el7_1.x86_64.rpm b/00_ansible_setup/01_rpm/06_expect-5.45-14.el7_1.x86_64.rpm new file mode 100644 index 0000000..2de2ca9 Binary files /dev/null and b/00_ansible_setup/01_rpm/06_expect-5.45-14.el7_1.x86_64.rpm differ diff --git a/00_ansible_setup/setup_local.sh b/00_ansible_setup/setup_local.sh index 2aa0191..7f61f57 100755 --- a/00_ansible_setup/setup_local.sh +++ b/00_ansible_setup/setup_local.sh @@ -4,7 +4,7 @@ if [ -z "$BASH_VERSION" ]; then exec bash "$0" "$@"; exit; fi rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-* -rpm_list=`find . -name "*.rpm"` +rpm_list=`find . -name "*.rpm" | sort` for rpm in ${rpm_list} do @@ -17,8 +17,7 @@ do fi done - -pip3 install --upgrade --no-index -f ./02-pip/pip-20.3-py2.py3-none-any.whl pip==20.3 +pip3 install --force-reinstall --upgrade --no-index -f 02_pip/pip-20.3-py2.py3-none-any.whl pip==20.3 pip3 install --no-index -f ./03_ansible ansible pip3 install --no-index -f ./04_kubernetes kubernetes pip3 install --no-index -f ./05_minio Minio