openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "nova-conductor: Fix wrong bootstrap node hieradata used"

This commit is contained in:
Zuul 2022-06-07 01:35:53 +00:00 committed by Gerrit Code Review
parent 602e23fce7 e51bf81f33
commit 10d18495c3
3 changed files with 58 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/profile/base/nova/conductor.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('nova_api_short_bootstrap_node_name')
# Defaults to hiera('nova_conductor_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -28,8 +28,8 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::nova::conductor (
$bootstrap_node = hiera('nova_api_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
$bootstrap_node = hiera('nova_conductor_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
include tripleo::profile::base::nova
include nova::db

58
spec/classes/tripleo_profile_base_nova_conductor_spec.rb
View File

@ -27,23 +27,73 @@ describe 'tripleo::profile::base::nova::conductor' do
eos
end
context 'with step less than 4' do
let(:params) { { :step => 1, } }
context 'with step less than 3' do
let(:params) { { :step => 3, } }
it {
is_expected.to contain_class('tripleo::profile::base::nova::conductor')
is_expected.to contain_class('tripleo::profile::base::nova')
is_expected.to_not contain_class('nova::db::sync')
is_expected.to_not contain_class('nova::conductor')
is_expected.to_not contain_class('nova::network::neutron')
}
end
context 'with step 4' do
let(:params) { { :step => 4, } }
context 'with step 3 on bootstap node' do
let(:params) { {
:step => 3,
:bootstrap_node => 'node.example.com',
} }
it {
is_expected.to contain_class('tripleo::profile::base::nova::conductor')
is_expected.to contain_class('tripleo::profile::base::nova')
is_expected.to contain_class('nova::db::sync')
is_expected.to_not contain_class('nova::conductor')
is_expected.to_not contain_class('nova::network::neutron')
}
end
context 'with step 3 not on bootstap node' do
let(:params) { {
:step => 3,
:bootstrap_node => 'other.example.com',
} }
it {
is_expected.to contain_class('tripleo::profile::base::nova::conductor')
is_expected.to contain_class('tripleo::profile::base::nova')
is_expected.to_not contain_class('nova::db::sync')
is_expected.to_not contain_class('nova::conductor')
is_expected.to_not contain_class('nova::network::neutron')
}
end
context 'with step 4 on bootstap node' do
let(:params) { {
:step => 4,
:bootstrap_node => 'node.example.com',
} }
it {
is_expected.to contain_class('tripleo::profile::base::nova::conductor')
is_expected.to contain_class('tripleo::profile::base::nova')
is_expected.to contain_class('nova::db::sync')
is_expected.to contain_class('nova::conductor')
is_expected.to contain_class('nova::network::neutron')
}
end
context 'with step 4 not on bootstap node' do
let(:params) { {
:step => 4,
:bootstrap_node => 'other.example.com',
} }
it {
is_expected.to contain_class('tripleo::profile::base::nova::conductor')
is_expected.to contain_class('tripleo::profile::base::nova')
is_expected.to_not contain_class('nova::db::sync')
is_expected.to contain_class('nova::conductor')
is_expected.to contain_class('nova::network::neutron')
}

1
spec/fixtures/hieradata/default.yaml vendored
View File

@ -117,6 +117,7 @@ manila_share_short_node_names:
manila_api_short_bootstrap_node_name: node
# nova related items
nova_api_short_bootstrap_node_name: node
nova_conductor_short_bootstrap_node_name: node
nova_metadata_short_bootstrap_node_name: node
nova_placement_short_bootstrap_node_name: node
nova::rabbit_password: 'password'