From d6e0a77a7f7899d0dcda578cffc799af1cff662e Mon Sep 17 00:00:00 2001 From: George Paraskevopoulos Date: Thu, 2 Feb 2017 17:37:05 +0200 Subject: [PATCH] Bump auth url version Use keystone v3 for authentication instead of v2.0 Change-Id: I5cfb5afb73bedefd15cd02d50862c91701888642 Signed-off-by: George Paraskevopoulos --- deployment_scripts/puppet/manifests/tacker.pp | 2 +- deployment_scripts/puppet/manifests/tacker_rc.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment_scripts/puppet/manifests/tacker.pp b/deployment_scripts/puppet/manifests/tacker.pp index bbd768d..6a1d149 100644 --- a/deployment_scripts/puppet/manifests/tacker.pp +++ b/deployment_scripts/puppet/manifests/tacker.pp @@ -25,7 +25,7 @@ $public_auth_address = get_ssl_property($ssl_hash, {}, 'keystone', 'public', $admin_auth_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'admin', 'protocol', 'http') $admin_auth_address = get_ssl_property($ssl_hash, {}, 'keystone', 'admin', 'hostname', $management_vip) -$auth_uri = "${public_auth_protocol}://${public_auth_address}:5000/v2.0/" +$auth_uri = "${public_auth_protocol}://${public_auth_address}:5000/v3/" $identity_uri = "${admin_auth_protocol}://${admin_auth_address}:35357/" $heat_uri = "${admin_auth_protocol}://${admin_auth_address}:8004/v1" diff --git a/deployment_scripts/puppet/manifests/tacker_rc.pp b/deployment_scripts/puppet/manifests/tacker_rc.pp index f7f67e3..6d42843 100644 --- a/deployment_scripts/puppet/manifests/tacker_rc.pp +++ b/deployment_scripts/puppet/manifests/tacker_rc.pp @@ -11,7 +11,7 @@ $tacker_user_password = $tacker_hash['user_password'] $ssl_hash = hiera_hash('use_ssl', {}) $public_auth_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'public', 'protocol', 'http') $public_auth_address = get_ssl_property($ssl_hash, {}, 'keystone', 'public', 'hostname', $public_vip) -$auth_uri = "${public_auth_protocol}://${public_auth_address}:5000/v2.0/" +$auth_uri = "${public_auth_protocol}://${public_auth_address}:5000/v3/" $tackerc = inline_template(" #!/bin/sh