From 1628d33d39502a7c60abbf32775e82d88cefa67a Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 22 Jun 2020 20:23:41 +0800 Subject: [PATCH] s/chacractl>=0.0.4/chacractl>=0.0.21/ chacractl v0.0.21 is python3 compatible, let's use chacractl>=0.0.21, so no need to install python2 just for using chacractl! Signed-off-by: Kefu Chai --- calamari-clients-build/build/setup | 2 +- calamari/build/setup | 2 +- ceph-ansible-rpm/build/build | 2 +- ceph-build/build/setup_deb | 2 +- ceph-build/build/setup_rpm | 4 +--- ceph-deploy-build/build/setup | 2 +- ceph-dev-build/build/setup_deb | 2 +- ceph-dev-build/build/setup_osc | 2 +- ceph-dev-build/build/setup_rpm | 4 +--- ceph-dev-new-build/build/setup_deb | 2 +- ceph-dev-new-build/build/setup_rpm | 4 +--- ceph-iscsi-cli/build/setup | 2 +- ceph-iscsi-config/build/setup | 2 +- ceph-iscsi-stable/build/setup | 2 +- ceph-iscsi-tools/build/setup | 2 +- ceph-iscsi/build/setup | 2 +- ceph-medic-release/build/build_rpm | 2 +- ceph-medic-rpm/build/build | 2 +- ceph-release-rpm/build/build | 2 +- cephmetrics-release/build/setup | 2 +- cephmetrics/build/setup | 2 +- configshell-fb/build/setup | 2 +- diamond-build/build/setup | 2 +- kernel/build/setup | 2 +- nfs-ganesha-stable/build/setup | 2 +- nfs-ganesha/build/setup | 2 +- radosgw-agent/build/build | 2 +- rtslib-fb/build/setup | 2 +- samba/build/setup | 2 +- scripts/build_utils.sh | 12 ++++++------ tcmu-runner/build/setup | 2 +- 31 files changed, 36 insertions(+), 42 deletions(-) diff --git a/calamari-clients-build/build/setup b/calamari-clients-build/build/setup index bccd321c..c97d4718 100644 --- a/calamari-clients-build/build/setup +++ b/calamari-clients-build/build/setup @@ -53,7 +53,7 @@ CentOS|Fedora|SUSE*|RedHatEnterpriseServer) ;; esac -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/calamari/build/setup b/calamari/build/setup index c1cee1d0..e014d1ff 100644 --- a/calamari/build/setup +++ b/calamari/build/setup @@ -35,7 +35,7 @@ echo "*****" export LC_ALL=C # the following is vulnerable to i18n -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/ceph-ansible-rpm/build/build b/ceph-ansible-rpm/build/build index 907c2042..08ecaf30 100644 --- a/ceph-ansible-rpm/build/build +++ b/ceph-ansible-rpm/build/build @@ -17,7 +17,7 @@ make rpm || ( tail -n +1 {root,build}.log && exit 1 ) # Chacra time -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/ceph-build/build/setup_deb b/ceph-build/build/setup_deb index f4176262..5405b48a 100644 --- a/ceph-build/build/setup_deb +++ b/ceph-build/build/setup_deb @@ -104,7 +104,7 @@ NORMAL_ARCH=$ARCH # create build status in shaman create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" make_chacractl_config diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm index 493ad8e0..2f32c1e8 100644 --- a/ceph-build/build/setup_rpm +++ b/ceph-build/build/setup_rpm @@ -88,8 +88,6 @@ if [ "$RELEASE" = 7 ]; then fi elif [ "$RELEASE" = 8 ]; then $SUDO dnf config-manager --set-enabled PowerTools - # chacractl is not python3 compatible yet - $SUDO dnf -y install python2 fi sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec @@ -122,7 +120,7 @@ NORMAL_ARCH=$ARCH # create build status in shaman create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # create the .chacractl config file using global variables diff --git a/ceph-deploy-build/build/setup b/ceph-deploy-build/build/setup index 87e1aa00..4fc8b565 100644 --- a/ceph-deploy-build/build/setup +++ b/ceph-deploy-build/build/setup @@ -17,7 +17,7 @@ if test -f /etc/redhat-release ; then sudo yum install -y $rpm_deps fi -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # create the .chacractl config file using global variables diff --git a/ceph-dev-build/build/setup_deb b/ceph-dev-build/build/setup_deb index 9881a5ca..7277c99c 100644 --- a/ceph-dev-build/build/setup_deb +++ b/ceph-dev-build/build/setup_deb @@ -100,7 +100,7 @@ NORMAL_ARCH=$ARCH # create build status in shaman create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/ceph-dev-build/build/setup_osc b/ceph-dev-build/build/setup_osc index 847826e5..3bcea1d0 100644 --- a/ceph-dev-build/build/setup_osc +++ b/ceph-dev-build/build/setup_osc @@ -73,7 +73,7 @@ NORMAL_ARCH=$ARCH # create build status in shaman create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm index f7a8168c..0d7550b4 100644 --- a/ceph-dev-build/build/setup_rpm +++ b/ceph-dev-build/build/setup_rpm @@ -89,8 +89,6 @@ if [ "$RELEASE" = 7 ]; then fi elif [ "$RELEASE" = 8 ]; then $SUDO dnf config-manager --set-enabled PowerTools - # chacractl is not python3 compatible yet - $SUDO dnf -y install python2 fi sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec @@ -122,7 +120,7 @@ NORMAL_ARCH=$ARCH # create build status in shaman create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/ceph-dev-new-build/build/setup_deb b/ceph-dev-new-build/build/setup_deb index 9881a5ca..7277c99c 100644 --- a/ceph-dev-new-build/build/setup_deb +++ b/ceph-dev-new-build/build/setup_deb @@ -100,7 +100,7 @@ NORMAL_ARCH=$ARCH # create build status in shaman create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm index f7a8168c..0d7550b4 100644 --- a/ceph-dev-new-build/build/setup_rpm +++ b/ceph-dev-new-build/build/setup_rpm @@ -89,8 +89,6 @@ if [ "$RELEASE" = 7 ]; then fi elif [ "$RELEASE" = 8 ]; then $SUDO dnf config-manager --set-enabled PowerTools - # chacractl is not python3 compatible yet - $SUDO dnf -y install python2 fi sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec @@ -122,7 +120,7 @@ NORMAL_ARCH=$ARCH # create build status in shaman create_build_status "started" "ceph" $NORMAL_DISTRO $NORMAL_DISTRO_VERSION $NORMAL_ARCH -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/ceph-iscsi-cli/build/setup b/ceph-iscsi-cli/build/setup index 41939805..08578033 100644 --- a/ceph-iscsi-cli/build/setup +++ b/ceph-iscsi-cli/build/setup @@ -35,7 +35,7 @@ echo "*****" export LC_ALL=C # the following is vulnerable to i18n -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/ceph-iscsi-config/build/setup b/ceph-iscsi-config/build/setup index 41939805..08578033 100644 --- a/ceph-iscsi-config/build/setup +++ b/ceph-iscsi-config/build/setup @@ -35,7 +35,7 @@ echo "*****" export LC_ALL=C # the following is vulnerable to i18n -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/ceph-iscsi-stable/build/setup b/ceph-iscsi-stable/build/setup index a9d593df..3989aced 100644 --- a/ceph-iscsi-stable/build/setup +++ b/ceph-iscsi-stable/build/setup @@ -44,7 +44,7 @@ echo "*****" export LC_ALL=C # the following is vulnerable to i18n -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" chacra_url="https://chacra.ceph.com/" diff --git a/ceph-iscsi-tools/build/setup b/ceph-iscsi-tools/build/setup index 41939805..08578033 100644 --- a/ceph-iscsi-tools/build/setup +++ b/ceph-iscsi-tools/build/setup @@ -35,7 +35,7 @@ echo "*****" export LC_ALL=C # the following is vulnerable to i18n -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/ceph-iscsi/build/setup b/ceph-iscsi/build/setup index 41939805..08578033 100644 --- a/ceph-iscsi/build/setup +++ b/ceph-iscsi/build/setup @@ -35,7 +35,7 @@ echo "*****" export LC_ALL=C # the following is vulnerable to i18n -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/ceph-medic-release/build/build_rpm b/ceph-medic-release/build/build_rpm index 1d87ebea..125bb4fa 100644 --- a/ceph-medic-release/build/build_rpm +++ b/ceph-medic-release/build/build_rpm @@ -15,7 +15,7 @@ make rpm || ( tail -n +1 {root,build}.log && exit 1 ) # Chacra time -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" make_chacractl_config diff --git a/ceph-medic-rpm/build/build b/ceph-medic-rpm/build/build index 907c2042..08ecaf30 100644 --- a/ceph-medic-rpm/build/build +++ b/ceph-medic-rpm/build/build @@ -17,7 +17,7 @@ make rpm || ( tail -n +1 {root,build}.log && exit 1 ) # Chacra time -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/ceph-release-rpm/build/build b/ceph-release-rpm/build/build index d8e579dc..dab33f19 100644 --- a/ceph-release-rpm/build/build +++ b/ceph-release-rpm/build/build @@ -12,7 +12,7 @@ echo "Building on Host: $(hostname)" rm -rf dist rm -rf RPMBUILD -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # create the .chacractl config file using global variables diff --git a/cephmetrics-release/build/setup b/cephmetrics-release/build/setup index ae4b7e17..e4477e08 100644 --- a/cephmetrics-release/build/setup +++ b/cephmetrics-release/build/setup @@ -35,7 +35,7 @@ echo "*****" export LC_ALL=C # the following is vulnerable to i18n -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # create the .chacractl config file using global variables diff --git a/cephmetrics/build/setup b/cephmetrics/build/setup index 6c797574..04867736 100644 --- a/cephmetrics/build/setup +++ b/cephmetrics/build/setup @@ -35,7 +35,7 @@ echo "*****" export LC_ALL=C # the following is vulnerable to i18n -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/configshell-fb/build/setup b/configshell-fb/build/setup index 41939805..08578033 100644 --- a/configshell-fb/build/setup +++ b/configshell-fb/build/setup @@ -35,7 +35,7 @@ echo "*****" export LC_ALL=C # the following is vulnerable to i18n -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/diamond-build/build/setup b/diamond-build/build/setup index bccd321c..c97d4718 100644 --- a/diamond-build/build/setup +++ b/diamond-build/build/setup @@ -53,7 +53,7 @@ CentOS|Fedora|SUSE*|RedHatEnterpriseServer) ;; esac -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/kernel/build/setup b/kernel/build/setup index 98720685..13570b77 100644 --- a/kernel/build/setup +++ b/kernel/build/setup @@ -67,7 +67,7 @@ CentOS|Fedora|SUSE*|RedHatEnterpriseServer) ;; esac -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/nfs-ganesha-stable/build/setup b/nfs-ganesha-stable/build/setup index cf78e570..43c019ed 100644 --- a/nfs-ganesha-stable/build/setup +++ b/nfs-ganesha-stable/build/setup @@ -44,7 +44,7 @@ echo "*****" export LC_ALL=C # the following is vulnerable to i18n -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" NFS_GANESHA_BRANCH=`branch_slash_filter $NFS_GANESHA_BRANCH` diff --git a/nfs-ganesha/build/setup b/nfs-ganesha/build/setup index 39f1a63d..4146be77 100644 --- a/nfs-ganesha/build/setup +++ b/nfs-ganesha/build/setup @@ -41,7 +41,7 @@ echo "*****" export LC_ALL=C # the following is vulnerable to i18n -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" NFS_GANESHA_BRANCH=`branch_slash_filter $NFS_GANESHA_BRANCH` diff --git a/radosgw-agent/build/build b/radosgw-agent/build/build index ab3d4a43..e9b935cb 100644 --- a/radosgw-agent/build/build +++ b/radosgw-agent/build/build @@ -14,7 +14,7 @@ ls -l # the following two methods exist in scripts/build_utils.sh -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # create the .chacractl config file using global variables diff --git a/rtslib-fb/build/setup b/rtslib-fb/build/setup index 41939805..08578033 100644 --- a/rtslib-fb/build/setup +++ b/rtslib-fb/build/setup @@ -35,7 +35,7 @@ echo "*****" export LC_ALL=C # the following is vulnerable to i18n -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use diff --git a/samba/build/setup b/samba/build/setup index 1449e3de..426b73ff 100644 --- a/samba/build/setup +++ b/samba/build/setup @@ -35,7 +35,7 @@ echo "*****" export LC_ALL=C # the following is vulnerable to i18n -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" SAMBA_BRANCH=$(branch_slash_filter $SAMBA_BRANCH) diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index c124ef3e..b2f5298e 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -109,17 +109,17 @@ install_python_packages_no_binary () { # # Usage (with pip 10.0.0 [the default]): # - # to_install=( "ansible" "chacractl>=0.0.4" ) + # to_install=( "ansible" "chacractl>=0.0.21" ) # install_python_packages_no_binary "to_install[@]" # # Usage (with pip=0.0.4" ) + # to_install=( "ansible" "chacractl>=0.0.21" ) # install_python_packages_no_binary "to_install[@]" "pip=0.0.4" ) + # to_install=( "ansible" "chacractl>=0.0.21" ) # install_python_packages_no_binary "to_install[@]" latest create_virtualenv $TEMPVENV @@ -164,17 +164,17 @@ install_python_packages () { # # Usage (with pip 10.0.0 [the default]): # - # to_install=( "ansible" "chacractl>=0.0.4" ) + # to_install=( "ansible" "chacractl>=0.0.21" ) # install_python_packages "to_install[@]" # # Usage (with pip=0.0.4" ) + # to_install=( "ansible" "chacractl>=0.0.21" ) # install_python_packages_no_binary "to_install[@]" "pip=0.0.4" ) + # to_install=( "ansible" "chacractl>=0.0.21" ) # install_python_packages "to_install[@]" latest create_virtualenv $TEMPVENV diff --git a/tcmu-runner/build/setup b/tcmu-runner/build/setup index 41939805..08578033 100644 --- a/tcmu-runner/build/setup +++ b/tcmu-runner/build/setup @@ -35,7 +35,7 @@ echo "*****" export LC_ALL=C # the following is vulnerable to i18n -pkgs=( "chacractl>=0.0.4" ) +pkgs=( "chacractl>=0.0.21" ) install_python_packages "pkgs[@]" # ask shaman which chacra instance to use -- 2.39.5