From 5dee1c4879353f8c72ceac90bc103b1288f6e22c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 20 Mar 2017 19:05:26 -0400 Subject: [PATCH] neutron: configure authtoken auth_uri versionless configure neutron authtoken to use auth_uri with versionless endpoint, which is the right way to configure this parameter and move forward with keystone v3. Change-Id: Ief045b4b6aa34c23aafa582561731549bfc54183 --- packstack/puppet/modules/packstack/manifests/neutron/api.pp | 2 +- .../puppet/modules/packstack/manifests/provision/bridge.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packstack/puppet/modules/packstack/manifests/neutron/api.pp b/packstack/puppet/modules/packstack/manifests/neutron/api.pp index f99d43ca9..538a619ff 100644 --- a/packstack/puppet/modules/packstack/manifests/neutron/api.pp +++ b/packstack/puppet/modules/packstack/manifests/neutron/api.pp @@ -15,7 +15,7 @@ class packstack::neutron::api () class { '::neutron::keystone::authtoken': username => 'neutron', password => $neutron_user_password, - auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), + auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'), auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'), project_name => 'services', } diff --git a/packstack/puppet/modules/packstack/manifests/provision/bridge.pp b/packstack/puppet/modules/packstack/manifests/provision/bridge.pp index fb77e0f30..59fb2d453 100644 --- a/packstack/puppet/modules/packstack/manifests/provision/bridge.pp +++ b/packstack/puppet/modules/packstack/manifests/provision/bridge.pp @@ -17,7 +17,7 @@ class packstack::provision::bridge () class { '::neutron::keystone::authtoken': username => 'neutron', password => $neutron_user_password, - auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), + auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'), auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'), project_name => 'services', }