Fix provisioning of Liberty after nova update

This fix is necessary after moving to own-built nova packages instead of using deb packages from ubuntu cloud archive. We need to build the nova packages by ourself, as we need additional patches for DPDK vRouter. Change-Id: I75140adfd8cb89a5709f93c326771736b3a82012 Partial-Bug: #1561163
Juniper · Mar 23, 2016 · 88025a3 · 88025a3
1 parent 59ac45e
commit 88025a3
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.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.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.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.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