commit c13b8a1f33a3ea78388794896a3e7f3256c89ec9
author Sean Dague <sean@dague.net> Thu Apr 20 06:54:51 2017 -0400
committer Sean Dague <sean@dague.net> Mon May 01 09:12:20 2017 -0400
tree f3fc1552ba1c968eadb0e047152115a21d442fb1
parent bb4431126b80be4805f1072442676797e6019576

try to use unversioned keystone endpoints everywhere

Change-Id: Iad2a3654d8ba181a7ad452d8aba872a8313d4ece

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index 492a0ee..c7f62ed 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -226,7 +226,7 @@
         iniset $NEUTRON_META_CONF agent root_helper_daemon "$NEUTRON_ROOTWRAP_DAEMON_CMD"
 
         # TODO(dtroyer): remove the v2.0 hard code below
-        iniset $NEUTRON_META_CONF DEFAULT auth_url $KEYSTONE_SERVICE_URI/v2.0
+        iniset $NEUTRON_META_CONF DEFAULT auth_url $KEYSTONE_SERVICE_URI
         configure_auth_token_middleware $NEUTRON_META_CONF neutron $NEUTRON_AUTH_CACHE_DIR DEFAULT
     fi
 
@@ -284,7 +284,7 @@
 function configure_neutron_nova_new {
     iniset $NOVA_CONF DEFAULT use_neutron True
     iniset $NOVA_CONF neutron auth_type "password"
-    iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_URI/v3"
+    iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_URI"
     iniset $NOVA_CONF neutron username neutron
     iniset $NOVA_CONF neutron password "$SERVICE_PASSWORD"
     iniset $NOVA_CONF neutron user_domain_name "Default"