Use memcached for token caching in manila authtoken

Use memcached to cache token in manila authtoken, as in-process
cache, which we currently use, was already deprecated[1].

[1] Ied2b88c8cefe5655a88d0c2f334de04e588fa75a

Change-Id: I9360c689b322ffc21107edb94524374578811d21
This commit is contained in:
Takashi Kajinami 2019-09-21 22:13:28 +09:00
parent 36cbe74aad
commit 781165b84b
4 changed files with 116 additions and 0 deletions

View File

@ -97,6 +97,7 @@ class tripleo::profile::base::manila::api (
} }
include ::tripleo::profile::base::manila include ::tripleo::profile::base::manila
include ::tripleo::profile::base::manila::authtoken
if $enable_internal_tls { if $enable_internal_tls {
if !$manila_api_network { if !$manila_api_network {

View File

@ -0,0 +1,44 @@
# Copyright 2019 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# == Class: tripleo::profile::base::manila::authtoken
#
# Manila authtoken profile for TripleO
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_ips')
#
class tripleo::profile::base::manila::authtoken (
$step = Integer(hiera('step')),
$memcached_ips = hiera('memcached_node_ips'),
) {
if $step >= 3 {
if is_ipv6_address($memcached_ips[0]) {
$memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:')
} else {
$memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
}
class { '::manila::keystone::authtoken':
memcached_servers => $memcache_servers
}
}
}

View File

@ -0,0 +1,70 @@
#
# Copyright (C) 2019 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
require 'spec_helper'
describe 'tripleo::profile::base::manila::authtoken' do
shared_examples_for 'tripleo::profile::base::manila::authtoken' do
context 'with step less than 3' do
let(:params) { {
:step => 1,
} }
it {
is_expected.to contain_class('tripleo::profile::base::manila::authtoken')
is_expected.to_not contain_class('manila::keystone::authtoken')
}
end
context 'with step 3' do
let(:params) { {
:step => 3,
:memcached_ips => '127.0.0.1',
} }
it {
is_expected.to contain_class('tripleo::profile::base::manila::authtoken')
is_expected.to contain_class('manila::keystone::authtoken').with(
:memcached_servers => ['127.0.0.1:11211'])
}
end
context 'with step 3 with ipv6' do
let(:params) { {
:step => 3,
:memcached_ips => '::1',
} }
it {
is_expected.to contain_class('tripleo::profile::base::manila::authtoken')
is_expected.to contain_class('manila::keystone::authtoken').with(
:memcached_servers => ['[::1]:11211'])
}
end
end
on_supported_os.each do |os, facts|
context "on #{os}" do
let(:facts) do
facts.merge({ :hostname => 'node.example.com' })
end
it_behaves_like 'tripleo::profile::base::manila::authtoken'
end
end
end

View File

@ -64,6 +64,7 @@ mysql_short_bootstrap_node_name: node
# manila related items # manila related items
manila::rabbit_password: 'password' manila::rabbit_password: 'password'
manila::backend::cephfs::cephfs_protocol_helper_type: 'NFS' manila::backend::cephfs::cephfs_protocol_helper_type: 'NFS'
manila::keystone::authtoken::password: 'password'
manila_share_short_bootstrap_node_name: 'node.example.com' manila_share_short_bootstrap_node_name: 'node.example.com'
manila_share_short_node_names: manila_share_short_node_names:
- 'manila-1' - 'manila-1'