Merge "Use memcached for token caching in heat authtoken"

This commit is contained in:
Zuul 2019-09-10 22:08:59 +00:00 committed by Gerrit Code Review
commit aa4417017d
4 changed files with 120 additions and 2 deletions

View File

@ -96,6 +96,9 @@ class tripleo::profile::base::heat (
$oslomsg_notify_username = hiera('oslo_messaging_notify_user_name', 'guest'),
$oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'),
) {
include ::tripleo::profile::base::heat::authtoken
# Domain resources will be created at step5 on the node running keystone.pp
# configure heat.conf at step3 and 4 but actually create the domain later.
if $step >= 3 {
@ -136,4 +139,3 @@ class tripleo::profile::base::heat (
}
}
}

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::heat::authtoken
#
# Heat 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::heat::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 { '::heat::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::heat::authtoken' do
shared_examples_for 'tripleo::profile::base::heat::authtoken' do
context 'with step less than 3' do
let(:params) { {
:step => 1,
} }
it {
is_expected.to contain_class('tripleo::profile::base::heat::authtoken')
is_expected.to_not contain_class('heat::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::heat::authtoken')
is_expected.to contain_class('heat::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::heat::authtoken')
is_expected.to contain_class('heat::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::heat::authtoken'
end
end
end

View File

@ -47,7 +47,9 @@ gnocchi::storage::ceph::ceph_secret: 'password'
# haproxy related items
mysql_enabled: true
controller_node_ips: '10.1.0.1,10.1.0.2'
# mysql related
# heat related items
heat::keystone::authtoken::password: 'password'
# mysql related items
mysql_short_bootstrap_node_name: node
# manila related items
manila::rabbit_password: 'password'