Merge "network_api_class to set to ContrailNetworkAPI if openstack ==…

… compute" into R2.22-dev

contrail_provisioning/compute/scripts/compute-server-setup.sh

@@ -106,6 +106,17 @@ if [ $CONTROLLER != $COMPUTE ] ; then
     openstack-config --set /etc/nova/nova.conf keystone_authtoken auth_protocol http
     openstack-config --set /etc/nova/nova.conf keystone_authtoken auth_port 35357
     openstack-config --set /etc/nova/nova.conf keystone_authtoken signing_dir /tmp/keystone-signing-nova
+else
+    # For Juno, set network_api_class as nova_contrail_vif.contrailvif.ContrailNetworkAPI even
+    # if controller node is compute node so the VIF_TYPE=vrouter is available
+    if [ $is_redhat -eq 1 ]; then
+        # For Juno, set network_api_class as nova_contrail_vif.contrailvif.ContrailNetworkAPI
+        is_juno=$(python -c "from distutils.version import LooseVersion; \
+                  print LooseVersion('$nova_compute_ver') == LooseVersion('2014.2.2')")
+        if [ "$is_juno" == "True" ]; then
+            openstack-config --set /etc/nova/nova.conf DEFAULT network_api_class nova_contrail_vif.contrailvif.ContrailNetworkAPI
+        fi
+    fi
 fi
 
 if [ $VMWARE_IP ]; then