From 5f894df587dfaf5af5d5c634a0003776d7c6e7e6 Mon Sep 17 00:00:00 2001 From: Nagendra Chandran Date: Wed, 12 Aug 2015 18:54:23 -0700 Subject: [PATCH] network_api_class to set to ContrailNetworkAPI if openstack == compute Change-Id: Ic0efc703f0da4a61cf1c923116acd7309ebda3e8 Closes-Bug: 1484320 --- .../compute/scripts/compute-server-setup.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/contrail_provisioning/compute/scripts/compute-server-setup.sh b/contrail_provisioning/compute/scripts/compute-server-setup.sh index e2a0f8f3..cd038cd6 100755 --- a/contrail_provisioning/compute/scripts/compute-server-setup.sh +++ b/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