From 3a95cda31874301482bc45ff79f3a8ecb0eed043 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Fri, 30 Nov 2018 11:27:22 +0100 Subject: [PATCH] Change to www_authenticate_uri for those missed Missed for murano and trove. Change-Id: Iaeb05fa31fb66767d0c95d1b081564a30b0502b8 --- manifests/murano.pp | 2 +- manifests/trove.pp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manifests/murano.pp b/manifests/murano.pp index 8b0d21f17..dcb0fdac0 100644 --- a/manifests/murano.pp +++ b/manifests/murano.pp @@ -61,7 +61,7 @@ class openstack_integration::murano { rabbit_own_use_ssl => $::openstack_integration::config::ssl, database_connection => 'mysql+pymysql://murano:a_big_secret@127.0.0.1/murano?charset=utf8', identity_uri => $::openstack_integration::config::keystone_admin_uri, - auth_uri => $::openstack_integration::config::keystone_auth_uri, + www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri, use_ssl => $::openstack_integration::config::ssl, service_host => $::openstack_integration::config::ip_for_url, cert_file => $::openstack_integration::params::cert_path, diff --git a/manifests/trove.pp b/manifests/trove.pp index 668ee6fdf..2b3878d67 100644 --- a/manifests/trove.pp +++ b/manifests/trove.pp @@ -51,12 +51,12 @@ class openstack_integration::trove { admin_url => "${::openstack_integration::config::base_url}:8779/v1.0/%(tenant_id)s", } class { '::trove::keystone::authtoken': - password => 'a_big_secret', - user_domain_name => 'Default', - project_domain_name => 'Default', - auth_url => $::openstack_integration::config::keystone_admin_uri, - auth_uri => $::openstack_integration::config::keystone_auth_uri, - memcached_servers => $::openstack_integration::config::memcached_servers, + password => 'a_big_secret', + user_domain_name => 'Default', + project_domain_name => 'Default', + auth_url => $::openstack_integration::config::keystone_admin_uri, + www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri, + memcached_servers => $::openstack_integration::config::memcached_servers, } class { '::trove::api': bind_host => $::openstack_integration::config::host,