Skip to content

Commit

Permalink
network_api_class to set to ContrailNetworkAPI if openstack == compute
Browse files Browse the repository at this point in the history
Change-Id: Ic0efc703f0da4a61cf1c923116acd7309ebda3e8
Closes-Bug: 1484320
  • Loading branch information
npchandran committed Aug 20, 2015
1 parent ca1a9bb commit 5f894df
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions contrail_provisioning/compute/scripts/compute-server-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5f894df

Please sign in to comment.