Browse code

Fix the variable substitution

Prior to that commit if ceph_version was equal to 0.80.5, the variable
substitution ${ceph_version%.*} was returning 0.80 and not 0. Using
${ceph_version%%.*} returns the desired value.
Also refactoring the version output to get a X.X format since only
major and minor are important.

Change-Id: Iab50f3c4b24a01a68acda417eae0501f00038f54
Signed-off-by: Sébastien Han <sebastien.han@enovance.com>

Sébastien Han authored on 2014/11/19 04:10:11
Showing 1 changed files
... ...
@@ -72,7 +72,7 @@ CEPH_REPLICAS_SEQ=$(seq ${CEPH_REPLICAS})
72 72
 # ------------
73 73
 
74 74
 function get_ceph_version {
75
-    local ceph_version_str=$(sudo ceph daemon mon.$(hostname) version | cut -d '"' -f 4)
75
+    local ceph_version_str=$(sudo ceph daemon mon.$(hostname) version | cut -d '"' -f 4 | cut -f 1,2 -d '.')
76 76
     echo $ceph_version_str
77 77
 }
78 78
 
... ...
@@ -162,7 +162,7 @@ EOF
162 162
     # pools data and metadata were removed in the Giant release so depending on the version we apply different commands
163 163
     local ceph_version=$(get_ceph_version)
164 164
     # change pool replica size according to the CEPH_REPLICAS set by the user
165
-    if [[ ${ceph_version%.*} -eq 0 ]] && [[ ${ceph_version##*.} -lt 87 ]]; then
165
+    if [[ ${ceph_version%%.*} -eq 0 ]] && [[ ${ceph_version##*.} -lt 87 ]]; then
166 166
         sudo ceph -c ${CEPH_CONF_FILE} osd pool set rbd size ${CEPH_REPLICAS}
167 167
         sudo ceph -c ${CEPH_CONF_FILE} osd pool set data size ${CEPH_REPLICAS}
168 168
         sudo ceph -c ${CEPH_CONF_FILE} osd pool set metadata size ${CEPH_REPLICAS}