From 7d3e1a6838b50eae74904912d7e29095b9461c75 Mon Sep 17 00:00:00 2001 From: Ranjeet R Date: Tue, 8 Nov 2016 11:37:22 -0800 Subject: [PATCH] Fixes: VM Spawn fails in Mitaka in a HA setup In Mitaka, the neutron section should auth_url specified as against admin_auth_url Change-Id: I9e11ec61280dc933ff4758f84cc623a244ce48a7 Closes-Bug: 1611566 --- .../openstack/scripts/nova-server-setup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrail_provisioning/openstack/scripts/nova-server-setup.sh b/contrail_provisioning/openstack/scripts/nova-server-setup.sh index c99c14b0..f8d9dd92 100755 --- a/contrail_provisioning/openstack/scripts/nova-server-setup.sh +++ b/contrail_provisioning/openstack/scripts/nova-server-setup.sh @@ -310,16 +310,16 @@ if [ $is_ubuntu -eq 1 ] ; then if [ "$CONTRAIL_INTERNAL_VIP" != "none" ]; then openstack-config --set /etc/nova/nova.conf neutron url ${QUANTUM_PROTOCOL}://$CONTRAIL_INTERNAL_VIP:9696/ if [ "$INTERNAL_VIP" != "none" ]; then - openstack-config --set /etc/nova/nova.conf neutron admin_auth_url ${AUTH_PROTOCOL}://$INTERNAL_VIP:35357/$KEYSTONE_VERSION/ + openstack-config --set /etc/nova/nova.conf neutron auth_url ${AUTH_PROTOCOL}://$INTERNAL_VIP:35357/$KEYSTONE_VERSION/ else - openstack-config --set /etc/nova/nova.conf neutron admin_auth_url ${AUTH_PROTOCOL}://$CONTROLLER:35357/$KEYSTONE_VERSION/ + openstack-config --set /etc/nova/nova.conf neutron auth_url ${AUTH_PROTOCOL}://$CONTROLLER:35357/$KEYSTONE_VERSION/ fi elif [ "$INTERNAL_VIP" != "none" ]; then openstack-config --set /etc/nova/nova.conf neutron url ${QUANTUM_PROTOCOL}://$INTERNAL_VIP:9696/ - openstack-config --set /etc/nova/nova.conf neutron admin_auth_url ${AUTH_PROTOCOL}://$INTERNAL_VIP:35357/$KEYSTONE_VERSION/ + openstack-config --set /etc/nova/nova.conf neutron auth_url ${AUTH_PROTOCOL}://$INTERNAL_VIP:35357/$KEYSTONE_VERSION/ else openstack-config --set /etc/nova/nova.conf neutron url ${QUANTUM_PROTOCOL}://$QUANTUM:9696/ - openstack-config --set /etc/nova/nova.conf neutron admin_auth_url ${AUTH_PROTOCOL}://$CONTROLLER:35357/$KEYSTONE_VERSION/ + openstack-config --set /etc/nova/nova.conf neutron auth_url ${AUTH_PROTOCOL}://$CONTROLLER:35357/$KEYSTONE_VERSION/ fi openstack-config --set /etc/nova/nova.conf neutron admin_username $OS_NET