Changing version check from 12.0.0 to 12.0.*

Liberty is off 12.0.1, hence changing version check to work for liberty Partial-Bug: #1547784 Conflicts: contrail_provisioning/compute/scripts/compute-server-setup.sh Conflicts: contrail_provisioning/compute/scripts/compute-server-setup.sh contrail_provisioning/config/scripts/quantum-server-setup.sh contrail_provisioning/openstack/scripts/nova-server-setup.sh Change-Id: If04506633782734bdeb43ad32911100fd6bcf9d4
Juniper · Mar 30, 2016 · 3c68588 · 3c68588
1 parent 8b6d0ca
commit 3c68588
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/contrail_provisioning/compute/scripts/compute-server-setup.sh b/contrail_provisioning/compute/scripts/compute-server-setup.sh
@@ -93,8 +93,8 @@ if [ $CONTROLLER != $COMPUTE ] ; then
         dpkg --compare-versions $nova_compute_version_without_epoch ge 2015
         if [ $? -eq 0 ]; then
             kilo_or_above=1
-        else
-            if [[ $nova_compute_version == *"12.0"* ]]; then
+         else
+            if [[ $nova_compute_version == *"12.0."* ]]; then
                 kilo_or_above=1
             fi
          fi

diff --git a/contrail_provisioning/config/scripts/quantum-server-setup.sh b/contrail_provisioning/config/scripts/quantum-server-setup.sh
@@ -102,7 +102,7 @@ if [ -d /etc/neutron ]; then
     liberty_ubuntu=0
     if [ $is_ubuntu -eq 1 ] ; then
         neutron_server_version=`dpkg -l | grep 'ii' | grep nova-api | awk '{print $3}'` 
-        if [[ $neutron_server_version == *"12.0"* ]]; then
+        if [[ $neutron_server_version == *"12.0."* ]]; then
             liberty_ubuntu=1
         fi
     fi

diff --git a/contrail_provisioning/openstack/scripts/nova-server-setup.sh b/contrail_provisioning/openstack/scripts/nova-server-setup.sh
@@ -217,13 +217,13 @@ openstack-config --set /etc/nova/nova.conf DEFAULT quota_ram 10000000
 
 openstack-config --set /etc/nova/nova.conf DEFAULT auth_strategy keystone
 if [ $is_ubuntu -eq 1 ] ; then
-    if [[ $nova_api_version == *"2013.2"* ]] || [[ $nova_api_version == *"2015"* ]] || [[ $nova_api_version == *"12.0"* ]]; then
+    if [[ $nova_api_version == *"2013.2"* ]] || [[ $nova_api_version == *"2015"* ]] || [[ $nova_api_version == *"12.0."* ]]; then
         openstack-config --set /etc/nova/nova.conf DEFAULT network_api_class nova.network.neutronv2.api.API
     else
         openstack-config --set /etc/nova/nova.conf DEFAULT network_api_class contrail_nova_networkapi.api.API
     fi
     openstack-config --set /etc/nova/nova.conf DEFAULT ec2_private_dns_show_ip False
-    if [[ $nova_api_version == *"2015"* ]] || [[ $nova_api_version == *"12.0"* ]]; then
+    if [[ $nova_api_version == *"2015"* ]] || [[ $nova_api_version == *"12.0."* ]]; then
         openstack-config --set /etc/nova/nova.conf neutron admin_auth_url ${AUTH_PROTOCOL}://$CONTROLLER:35357/v2.0/
         openstack-config --set /etc/nova/nova.conf neutron admin_username $OS_NET
         openstack-config --set /etc/nova/nova.conf neutron admin_password $ADMIN_TOKEN