Merge "Cinder provision issue fix in liberty" into R3.0

Juniper · Mar 8, 2016 · 0879c5e · 0879c5e
2 parents 2df7c0a + 0ab179c
commit 0879c5e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/contrail_provisioning/openstack/ha/scripts/contrail-ha-keystone-setup.sh b/contrail_provisioning/openstack/ha/scripts/contrail-ha-keystone-setup.sh
@@ -250,12 +250,14 @@ CINDER_SERVICE_TYPE=v1
 # If cinder is Kilo based, volumev2 services are required
 if [ -f /etc/redhat-release ]; then
     os_cinder=$(rpm -q --queryformat="%{VERSION}" openstack-cinder)
+    is_kilo_or_above=$(python -c "from distutils.version import LooseVersion; \
+              print LooseVersion('$os_cinder') >= LooseVersion('2015.1.1')")
 fi
 if [ -f /etc/lsb-release ] && egrep -q 'DISTRIB_ID.*Ubuntu' /etc/lsb-release; then
-    os_cinder=$(dpkg-query -W -f='${Version}' cinder-api | cut -d ':' -f 2)
+    os_cinder=$(dpkg-query -W -f='${Version}' cinder-api)
+    is_kilo_or_above=$(python -c "from distutils.version import LooseVersion; \
+              print LooseVersion('$os_cinder') >= LooseVersion('1:2015.1.1')")
 fi
-is_kilo_or_above=$(python -c "from distutils.version import LooseVersion; \
-              print LooseVersion('$os_cinder') >= LooseVersion('2015.1.1')")
 if [ "$is_kilo_or_above" == "True" ]; then
     CINDER_SERVICE=$(get_service "cinderv2" volumev2 "Cinder V2 Service")
     CINDER_USER=$(get_service_user cinderv2)

diff --git a/contrail_provisioning/openstack/scripts/contrail-keystone-setup.sh b/contrail_provisioning/openstack/scripts/contrail-keystone-setup.sh
@@ -250,12 +250,14 @@ CINDER_SERVICE_TYPE=v1
 # If cinder is Kilo based, volumev2 services are required
 if [ -f /etc/redhat-release ]; then
     os_cinder=$(rpm -q --queryformat="%{VERSION}" openstack-cinder)
+    is_kilo_or_above=$(python -c "from distutils.version import LooseVersion; \
+              print LooseVersion('$os_cinder') >= LooseVersion('2015.1.1')")
 fi
 if [ -f /etc/lsb-release ] && egrep -q 'DISTRIB_ID.*Ubuntu' /etc/lsb-release; then
-    os_cinder=$(dpkg-query -W -f='${Version}' cinder-api | cut -d ':' -f 2)
+    os_cinder=$(dpkg-query -W -f='${Version}' cinder-api)
+    is_kilo_or_above=$(python -c "from distutils.version import LooseVersion; \
+              print LooseVersion('$os_cinder') >= LooseVersion('1:2015.1.1')")
 fi
-is_kilo_or_above=$(python -c "from distutils.version import LooseVersion; \
-              print LooseVersion('$os_cinder') >= LooseVersion('2015.1.1')")
 if [ "$is_kilo_or_above" == "True" ]; then
     CINDER_SERVICE=$(get_service "cinderv2" volumev2 "Cinder V2 Service")
     CINDER_USER=$(get_service_user cinderv2)