In Liberty, the neutron auth_url should be mentined as admin_auth_url.

It is changed to auth_url in mitaka and later releases. Because of this, the auth_url is poitning to the default value localhost:5000. Fix is to set the neutron auth_url based on the release. Change-Id: I9cdbc725197c73138be98658480771fbfa763c28 Closes-Bug: 1642005
Juniper · Nov 18, 2016 · c082adc · c082adc
1 parent 8d4d353
commit c082adc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/contrail_provisioning/compute/scripts/compute-server-setup.sh b/contrail_provisioning/compute/scripts/compute-server-setup.sh
@@ -131,7 +131,7 @@ if [ $CONTROLLER != $COMPUTE ] ; then
         fi
 
         if [ $kilo_or_above -eq 1 ] ; then
-            if [ $liberty_or_above -eq 1 ] ; then
+            if [ $mitaka_or_above -eq 1 ] ; then
                 NEUTRON_AUTH_URL_FIELD=auth_url
             else
                 NEUTRON_AUTH_URL_FIELD=admin_auth_url
@@ -182,7 +182,7 @@ if [ $CONTROLLER != $COMPUTE ] ; then
                 openstack-config --set /etc/nova/nova.conf DEFAULT network_api_class nova_contrail_vif.contrailvif.ContrailNetworkAPI
             fi
 
-            if [ $rpm_liberty_or_higher -eq 1 ] ; then
+            if [ $rpm_mitaka_or_higher -eq 1 ] ; then
                 NEUTRON_AUTH_URL_FIELD=auth_url
             else
                 NEUTRON_AUTH_URL_FIELD=admin_auth_url

diff --git a/contrail_provisioning/openstack/scripts/nova-server-setup.sh b/contrail_provisioning/openstack/scripts/nova-server-setup.sh
@@ -310,7 +310,7 @@ if [ $is_ubuntu -eq 1 ] ; then
     if [[ $nova_api_version == *"2015"* ]] || [[ $is_liberty_or_above -eq 1 ]]; then
         # In Kilo, the neutron auth URL should be configured as admin_auth_url.
         # In releases > Kilo, it is changed to auth_url.
-        if [ $is_liberty_or_above -eq 1 ]; then
+        if [ $is_mitaka_or_above -eq 1 ]; then
             NEUTRON_AUTH_URL_FIELD=auth_url
         else
             NEUTRON_AUTH_URL_FIELD=admin_auth_url
@@ -370,7 +370,7 @@ else
     if [[ $rpm_kilo_or_higher -eq 1 ]]; then
         openstack-config --set /etc/nova/nova.conf DEFAULT network_api_class nova.network.neutronv2.api.API
 
-        if [[ $rpm_liberty_or_higher -eq 1 ]]; then
+        if [[ $rpm_mitaka_or_higher -eq 1 ]]; then
             NEUTRON_AUTH_URL_FIELD=auth_url
         else
             NEUTRON_AUTH_URL_FIELD=admin_auth_url