Fix redis when hostname has capital letters
The bootstrap_nodeid comparison should be case insensitive. Change-Id: I1e6672bb0219c1cf56ab21dd911c6f33e2436cc3 Closes-Bug: #1698190
This commit is contained in:
parent
5e91493f7a
commit
62dffeb9da
@ -37,7 +37,7 @@ class tripleo::profile::base::database::redis (
|
||||
$step = hiera('step'),
|
||||
) {
|
||||
if $step >= 2 {
|
||||
if $bootstrap_nodeid == $::hostname {
|
||||
if downcase($bootstrap_nodeid) == $::hostname {
|
||||
$slaveof = undef
|
||||
} else {
|
||||
$slaveof = "${bootstrap_nodeid} 6379"
|
||||
|
106
spec/classes/tripleo_profile_base_database_redis_spec.rb
Normal file
106
spec/classes/tripleo_profile_base_database_redis_spec.rb
Normal file
@ -0,0 +1,106 @@
|
||||
#
|
||||
# Copyright (C) 2017 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::database::redis' do
|
||||
shared_examples_for 'tripleo::profile::base::database::redis' do
|
||||
|
||||
context 'with step less than 2' do
|
||||
let(:params) { {
|
||||
:step => 1,
|
||||
:bootstrap_nodeid => 'node.example.com',
|
||||
:redis_node_ips => []
|
||||
} }
|
||||
|
||||
it 'should do nothing' do
|
||||
is_expected.to contain_class('tripleo::profile::base::database::redis')
|
||||
is_expected.to_not contain_class('redis')
|
||||
is_expected.to_not contain_class('redis::sentinel')
|
||||
is_expected.to_not contain_class('tripleo::redis_notification')
|
||||
end
|
||||
end
|
||||
|
||||
context 'with step 2 on bootstrap node' do
|
||||
let(:params) { {
|
||||
:step => 2,
|
||||
:bootstrap_nodeid => 'node.example.com',
|
||||
:redis_node_ips => ['10.0.0.1']
|
||||
} }
|
||||
|
||||
it 'should configure redis' do
|
||||
is_expected.to contain_class('tripleo::profile::base::database::redis')
|
||||
is_expected.to contain_class('redis')
|
||||
is_expected.to_not contain_class('redis::sentinel')
|
||||
is_expected.to_not contain_class('tripleo::redis_notification')
|
||||
end
|
||||
end
|
||||
|
||||
context 'with step 2 on bootstrap node with capital letters' do
|
||||
let(:params) { {
|
||||
:step => 2,
|
||||
:bootstrap_nodeid => 'NODE.example.com',
|
||||
:redis_node_ips => ['10.0.0.1']
|
||||
} }
|
||||
|
||||
it 'should configure redis' do
|
||||
is_expected.to contain_class('tripleo::profile::base::database::redis')
|
||||
is_expected.to contain_class('redis').with(:slaveof => nil)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with step 2 not on bootstrap node' do
|
||||
let(:params) { {
|
||||
:step => 2,
|
||||
:bootstrap_nodeid => 'othernode.example.com',
|
||||
:redis_node_ips => ['10.0.0.1']
|
||||
} }
|
||||
|
||||
it 'should configure redis' do
|
||||
is_expected.to contain_class('tripleo::profile::base::database::redis')
|
||||
is_expected.to contain_class('redis').with(:slaveof => "#{params[:bootstrap_nodeid]} 6379")
|
||||
is_expected.to_not contain_class('redis::sentinel')
|
||||
is_expected.to_not contain_class('tripleo::redis_notification')
|
||||
end
|
||||
end
|
||||
|
||||
context 'with step 2 with multiple nodes' do
|
||||
let(:params) { {
|
||||
:step => 2,
|
||||
:bootstrap_nodeid => 'othernode.example.com',
|
||||
:redis_node_ips => ['10.0.0.1', '10.0.0.2']
|
||||
} }
|
||||
|
||||
it 'should configure redis' do
|
||||
is_expected.to contain_class('tripleo::profile::base::database::redis')
|
||||
is_expected.to contain_class('redis').with(:slaveof => "#{params[:bootstrap_nodeid]} 6379")
|
||||
is_expected.to contain_class('redis::sentinel')
|
||||
is_expected.to contain_class('tripleo::redis_notification')
|
||||
end
|
||||
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::database::redis'
|
||||
end
|
||||
end
|
||||
end
|
1
spec/fixtures/hieradata/default.yaml
vendored
1
spec/fixtures/hieradata/default.yaml
vendored
@ -6,6 +6,7 @@ not_hash: string
|
||||
aodh::rabbit_password: 'password'
|
||||
aodh_redis_password: 'password'
|
||||
redis_vip: '127.0.0.1'
|
||||
redis::bind: '10.0.0.1'
|
||||
aodh::auth::auth_password: 'password'
|
||||
aodh::db::mysql::password: 'password'
|
||||
aodh::keystone::authtoken::password: 'password'
|
||||
|
Loading…
x
Reference in New Issue
Block a user