From 241e74a08df21645c87ad7191fe0e333265858bc Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 31 Aug 2022 00:44:50 +0900 Subject: [PATCH] Globally enable memcache backend for authtoken middleware This change enables memcache backend for authtoken middleware for all services currently supported by this module. In-process token cache was deprecated and memcache backend is currently recommended. Change-Id: I3599fd0318d617641bebcc4b990698d62f364289 --- manifests/barbican.pp | 1 + manifests/ec2api.pp | 3 +++ manifests/mistral.pp | 7 +++++-- manifests/murano.pp | 5 ++++- manifests/zaqar.pp | 5 ++++- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/manifests/barbican.pp b/manifests/barbican.pp index 0641e4ede..aab313921 100644 --- a/manifests/barbican.pp +++ b/manifests/barbican.pp @@ -44,6 +44,7 @@ class openstack_integration::barbican { www_authenticate_uri => "${::openstack_integration::config::keystone_auth_uri}/v3", user_domain_name => 'Default', project_domain_name => 'Default', + memcached_servers => $::openstack_integration::config::memcached_servers, } class { 'barbican::api': default_transport_url => os_transport_url({ diff --git a/manifests/ec2api.pp b/manifests/ec2api.pp index 0dc1e18cc..3d2a143d1 100644 --- a/manifests/ec2api.pp +++ b/manifests/ec2api.pp @@ -28,8 +28,11 @@ class openstack_integration::ec2api { class { 'ec2api': } class { 'ec2api::keystone::authtoken': 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 { 'ec2api::api': keystone_ec2_tokens_url => "${::openstack_integration::config::keystone_auth_uri}/v3/ec2tokens", diff --git a/manifests/mistral.pp b/manifests/mistral.pp index f65dc0ea8..7bc8618ec 100644 --- a/manifests/mistral.pp +++ b/manifests/mistral.pp @@ -16,8 +16,11 @@ class openstack_integration::mistral { } class { 'mistral::keystone::authtoken': password => 'a_big_secret', - www_authenticate_uri => "${::openstack_integration::config::keystone_auth_uri}/v3", - auth_url => $::openstack_integration::config::keystone_auth_uri, + 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 { 'mistral::logging': debug => true, diff --git a/manifests/murano.pp b/manifests/murano.pp index 77d062ce3..90e6dea5a 100644 --- a/manifests/murano.pp +++ b/manifests/murano.pp @@ -51,9 +51,12 @@ class openstack_integration::murano { database_connection => 'mysql+pymysql://murano:a_big_secret@127.0.0.1/murano?charset=utf8', } class { 'murano::keystone::authtoken': + 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, - password => 'a_big_secret' + memcached_servers => $::openstack_integration::config::memcached_servers, } class { 'murano': default_transport_url => os_transport_url({ diff --git a/manifests/zaqar.pp b/manifests/zaqar.pp index c84ba5cb0..6ff0c3df9 100644 --- a/manifests/zaqar.pp +++ b/manifests/zaqar.pp @@ -37,9 +37,12 @@ class openstack_integration::zaqar { uri => 'swift://zaqar:a_big_secret@/services', } class {'zaqar::keystone::authtoken': + 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, - password => 'a_big_secret', + memcached_servers => $::openstack_integration::config::memcached_servers, } class {'zaqar': unreliable => true,