Merge "Use memcached for token caching in cinder authtoken"
This commit is contained in:
commit
5d8a30825f
|
@ -76,6 +76,7 @@ class tripleo::profile::base::cinder::api (
|
||||||
}
|
}
|
||||||
|
|
||||||
include ::tripleo::profile::base::cinder
|
include ::tripleo::profile::base::cinder
|
||||||
|
include ::tripleo::profile::base::cinder::authtoken
|
||||||
|
|
||||||
if $enable_internal_tls {
|
if $enable_internal_tls {
|
||||||
if !$cinder_api_network {
|
if !$cinder_api_network {
|
||||||
|
|
|
@ -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::cinder::authtoken
|
||||||
|
#
|
||||||
|
# Cinder 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::cinder::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 { '::cinder::keystone::authtoken':
|
||||||
|
memcached_servers => $memcache_servers
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -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::cinder::authtoken' do
|
||||||
|
shared_examples_for 'tripleo::profile::base::cinder::authtoken' do
|
||||||
|
context 'with step less than 3' do
|
||||||
|
let(:params) { {
|
||||||
|
:step => 1,
|
||||||
|
} }
|
||||||
|
|
||||||
|
it {
|
||||||
|
is_expected.to contain_class('tripleo::profile::base::cinder::authtoken')
|
||||||
|
is_expected.to_not contain_class('cinder::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::cinder::authtoken')
|
||||||
|
is_expected.to contain_class('cinder::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::cinder::authtoken')
|
||||||
|
is_expected.to contain_class('cinder::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::cinder::authtoken'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue