openstack/devstack-plugin-ceph
Code Issues Proposed changes

Use vercmp

Browse Source 
Use devstack's vercmp function instead of
bc for version comparisons.

Change-Id: I6436a6f836ad1ab9594858986bfdb8d6d6dbc392
This commit is contained in:
Eric Harney
2019-08-08 09:57:32 -04:00
parent 1413355064
commit 874e54abeb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/lib/ceph
View File

@@ -250,7 +250,7 @@ function _get_ceph_version {
function _run_as_ceph_or_root {
local ceph_version
ceph_version=$(_get_ceph_version cli)
if [[ $(echo $ceph_version '>=' 9.2 | bc -l) == 1 ]] ; then
if vercmp "$ceph_version" ">=" "9.2"; then
echo ceph
else
echo root
@@ -469,13 +469,13 @@ function configure_ceph {
local ceph_version
ceph_version=$(_get_ceph_version mon)
if [[ $(echo $ceph_version '>=' 14.0 | bc -l) == 1 ]] ; then
if vercmp "$ceph_version" ">=" "14.0"; then
for key in bootstrap-{mds,osd,rgw}; do
sudo ceph auth get client.$key -o ${CEPH_DATA_DIR}/$key/ceph.keyring
done
fi
if [[ $(echo $ceph_version '>=' 12.1 | bc -l) == 1 ]] ; then
if vercmp "$ceph_version" ">=" "12.1"; then
sudo mkdir -p ${CEPH_DATA_DIR}/mgr/ceph-${MGR_ID}
sudo ceph -c ${CEPH_CONF_FILE} auth get-or-create mgr.${MGR_ID} \
mon 'allow profile mgr' mds 'allow *' osd 'allow *' \
@@ -1220,7 +1220,7 @@ function start_ceph {
sudo systemctl start ceph-mon@$(hostname)
local ceph_version
ceph_version=$(_get_ceph_version mon)
if [[ $(echo $ceph_version '>=' 12.1 | bc -l) == 1 ]] ; then
if vercmp "$ceph_version" ">=" "12.1"; then
sudo systemctl start ceph-mgr@${MGR_ID}
# use `tell mgr` as the mgr might not have been activated
# yet to register the python module commands.
@@ -1275,7 +1275,7 @@ function stop_ceph {
done
local ceph_version
ceph_version=$(_get_ceph_version cli)
if [[ $(echo $ceph_version '>=' 12.1 | bc -l) == 1 ]] ; then
if vercmp "$ceph_version" ">=" "12.1"; then
sudo systemctl stop ceph-mgr@${MGR_ID}
fi
sudo systemctl stop ceph-mon@$(hostname)