From d8e07d4582b40a0bb9ed357e0ed82857d08c2a67 Mon Sep 17 00:00:00 2001 From: Dheeraj Gautam Date: Fri, 16 Dec 2016 11:59:58 -0800 Subject: [PATCH] SM-Heat: auth_uri for liberty/mitaka should contain version info Closes-Bug: #1650525 Change-Id: I1139c35574a3b9a2f3aad4abe4d6117a0d67ddc6 --- .../modules/contrail/manifests/profile/openstack/heat.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrail/environment/modules/contrail/manifests/profile/openstack/heat.pp b/contrail/environment/modules/contrail/manifests/profile/openstack/heat.pp index 959ec217..2efc839a 100644 --- a/contrail/environment/modules/contrail/manifests/profile/openstack/heat.pp +++ b/contrail/environment/modules/contrail/manifests/profile/openstack/heat.pp @@ -25,6 +25,7 @@ $kombu_ssl_ca_certs = $::contrail::params::kombu_ssl_ca_certs, $kombu_ssl_certfile = $::contrail::params::kombu_ssl_certfile, $kombu_ssl_keyfile = $::contrail::params::kombu_ssl_keyfile, + $keystone_version = $::contrail::params::keystone_version ) { if ($internal_vip != '' and $internal_vip != undef) { @@ -45,7 +46,7 @@ $mysql_ip_address = $host_control_ip } - $auth_uri = "http://${keystone_ip_to_use}:5000/" + $auth_uri = "http://${keystone_ip_to_use}:5000/${keystone_version}" $database_credentials = join([$service_password, "@", $mysql_ip_address],'') $keystone_db_conn = join(["mysql://heat:",$database_credentials,$mysql_port_url],'')