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 <kchai@redhat.com>

diff --git a/calamari-clients-build/build/setup b/calamari-clients-build/build/setup
index bccd321c0a0a6dfef44e854ffea68bb8fa95bb45..c97d4718f2939d2bec9a55f83ee15bd03833ec94 100644 (file)
--- 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 c1cee1d038d1a908228da0b9f15a6d2116878fe8..e014d1ff138b2fb083352c3b4ee1b081fab21ada 100644 (file)
--- 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 907c20422332f80d31aa6883a62349e3a3215df7..08ecaf30628ad2f21b3bc595aca81df530a639fe 100644 (file)
--- 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 f4176262db95acd902d9095a3e9f3ed649fbc67c..5405b48a470bbf3570daf3f71a1a18c730d884e7 100644 (file)
--- 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 493ad8e090941fd5ec7ecc70c767079cc76bde2f..2f32c1e8721666eb64951f97306c9540cc36d97d 100644 (file)
--- 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 87e1aa004a02c677f51ff66458b9684cd0923f05..4fc8b565c9c193354457475f7355797f3e4777ea 100644 (file)
--- 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 9881a5ca92bad676b6b5c6b80da24cf4cd295244..7277c99c22951a9ece322b1f84720cd9a6116035 100644 (file)
--- 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 847826e50d37421787c0d41eb50c02d8a13e9be8..3bcea1d05314d94482197dc31bc95f30431add6b 100644 (file)
--- 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 f7a8168c83f411d7292ea8f82e9b4dbb66926dc5..0d7550b452b4bc88ca248d8788e3e29416207b31 100644 (file)
--- 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 9881a5ca92bad676b6b5c6b80da24cf4cd295244..7277c99c22951a9ece322b1f84720cd9a6116035 100644 (file)
--- 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 f7a8168c83f411d7292ea8f82e9b4dbb66926dc5..0d7550b452b4bc88ca248d8788e3e29416207b31 100644 (file)
--- 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 41939805af3c6bb7e1ae7953ee9fec535907bb01..085780331730376573a2bfa32e55c7dd417f3fbe 100644 (file)
--- 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 41939805af3c6bb7e1ae7953ee9fec535907bb01..085780331730376573a2bfa32e55c7dd417f3fbe 100644 (file)
--- 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 a9d593df48f62147c900959049b1b2e20e6ef8ce..3989aced835e7d99c173aa43e81c2516341c374d 100644 (file)
--- 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 41939805af3c6bb7e1ae7953ee9fec535907bb01..085780331730376573a2bfa32e55c7dd417f3fbe 100644 (file)
--- 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 41939805af3c6bb7e1ae7953ee9fec535907bb01..085780331730376573a2bfa32e55c7dd417f3fbe 100644 (file)
--- 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 1d87ebea43ff37d3d2394ea77e2c3cfa8b36a955..125bb4fa21ad13b5fe05526b887a14014204627c 100644 (file)
--- 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 907c20422332f80d31aa6883a62349e3a3215df7..08ecaf30628ad2f21b3bc595aca81df530a639fe 100644 (file)
--- 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 d8e579dce18dfcd9f4cde78f115e0a9ec5ec2e68..dab33f195fc8d9240a885efc7032da877dc2b357 100644 (file)
--- 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 ae4b7e17b6870713011678225c49f937c5661b59..e4477e088313a7bbba04a56253f5711bdaab3042 100644 (file)
--- 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 6c7975746eaa457115c4552c2e36ac8d6e97f8f9..04867736f0f7b647d2a43d62f2fe9c9eeabc3764 100644 (file)
--- 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 41939805af3c6bb7e1ae7953ee9fec535907bb01..085780331730376573a2bfa32e55c7dd417f3fbe 100644 (file)
--- 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 bccd321c0a0a6dfef44e854ffea68bb8fa95bb45..c97d4718f2939d2bec9a55f83ee15bd03833ec94 100644 (file)
--- 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 987206859b86688e94c5e58c352cd54b84fd51a3..13570b7708c551bcbe440e2080361604aec0c938 100644 (file)
--- 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 cf78e57061ab808a1726904c9b98554eb4afbe17..43c019ed56b20fb428b90f677144cd9deafefe61 100644 (file)
--- 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 39f1a63db3f3a11c63b62d7b3ce73a6b992e74e7..4146be77f1b46895ea1676ed4b92b9c935fba892 100644 (file)
--- 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 ab3d4a43fc346a45f80845002c639e6863a422f3..e9b935cb52ce65bf957b0af7d9226f0e479cfc88 100644 (file)
--- 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 41939805af3c6bb7e1ae7953ee9fec535907bb01..085780331730376573a2bfa32e55c7dd417f3fbe 100644 (file)
--- 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 1449e3de98883c1f6bc7169deaa1892ce5407ae5..426b73ff24f49ad71a2f1fbd23e12e04d29a8359 100644 (file)
--- 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 c124ef3e89f6450ddcc629b40441a01c27ab3254..b2f5298ef33a79b7e97376aaf6e2060180c179b9 100644 (file)
--- 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<X.X.X [can also do ==X.X.X or !=X.X.X]):
     #
-    #   to_install=( "ansible" "chacractl>=0.0.4" )
+    #   to_install=( "ansible" "chacractl>=0.0.21" )
     #   install_python_packages_no_binary "to_install[@]" "pip<X.X.X"
     #
     # Usage (with latest pip):
     #
-    #   to_install=( "ansible" "chacractl>=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<X.X.X [can also do ==X.X.X or !=X.X.X]):
     #
-    #   to_install=( "ansible" "chacractl>=0.0.4" )
+    #   to_install=( "ansible" "chacractl>=0.0.21" )
     #   install_python_packages_no_binary "to_install[@]" "pip<X.X.X"
     #
     # Usage (with latest pip):
     #
-    #   to_install=( "ansible" "chacractl>=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 41939805af3c6bb7e1ae7953ee9fec535907bb01..085780331730376573a2bfa32e55c7dd417f3fbe 100644 (file)
--- 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