openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Horizon: Enable heat-dashboard configurations" into stable/ussuri

This commit is contained in:
Zuul 2021-12-31 00:26:26 +00:00 committed by Gerrit Code Review
parent e1fefac52e f39d49bdcf
commit 31b27a4809
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/profile/base/horizon.pp
View File

@ -62,6 +62,10 @@
# (Optional) Array of ipv4 or ipv6 addresses for memcache. # (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to undef # Defaults to undef
# #
# [*heat_api_enabled*]
# (Optional) Indicate whether Heat is available in the deployment.
# Defaults to hiera('heat_api_enabled') or false
#
class tripleo::profile::base::horizon ( class tripleo::profile::base::horizon (
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$bootstrap_node = hiera('horizon_short_bootstrap_node_name', undef), $bootstrap_node = hiera('horizon_short_bootstrap_node_name', undef),
@ -70,6 +74,7 @@ class tripleo::profile::base::horizon (
$horizon_network = hiera('horizon_network', undef), $horizon_network = hiera('horizon_network', undef),
$neutron_options = hiera('horizon::neutron_options', {}), $neutron_options = hiera('horizon::neutron_options', {}),
$memcached_hosts = hiera('memcached_node_names', []), $memcached_hosts = hiera('memcached_node_names', []),
$heat_api_enabled = hiera('heat_api_enabled', false),
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$memcached_ips = undef $memcached_ips = undef
) { ) {
@ -109,5 +114,9 @@ class tripleo::profile::base::horizon (
horizon_cert => $tls_certfile, horizon_cert => $tls_certfile,
horizon_key => $tls_keyfile, horizon_key => $tls_keyfile,
} }
if $heat_api_enabled {
include horizon::dashboards::heat
}
} }
} }

19
spec/classes/tripleo_profile_base_horizon_spec.rb
View File

@ -28,6 +28,7 @@ describe 'tripleo::profile::base::horizon' do
it 'should do nothing' do it 'should do nothing' do
is_expected.to contain_class('tripleo::profile::base::horizon') is_expected.to contain_class('tripleo::profile::base::horizon')
is_expected.to_not contain_class('horizon') is_expected.to_not contain_class('horizon')
is_expected.to_not contain_class('horizon::dashboards::heat')
end end
end end
@ -38,6 +39,7 @@ describe 'tripleo::profile::base::horizon' do
it 'should not configure anything' do it 'should not configure anything' do
is_expected.to_not contain_class('horizon') is_expected.to_not contain_class('horizon')
is_expected.to_not contain_class('horizon::dashboards::heat')
is_expected.to_not contain_class('apache::mod::remoteip') is_expected.to_not contain_class('apache::mod::remoteip')
is_expected.to_not contain_class('apache::mod::status') is_expected.to_not contain_class('apache::mod::status')
end end
@ -51,6 +53,7 @@ describe 'tripleo::profile::base::horizon' do
it 'should trigger complete configuration' do it 'should trigger complete configuration' do
is_expected.to contain_class('horizon') is_expected.to contain_class('horizon')
is_expected.to_not contain_class('horizon::dashboards::heat')
is_expected.to contain_class('apache::mod::remoteip') is_expected.to contain_class('apache::mod::remoteip')
is_expected.to contain_class('apache::mod::status') is_expected.to contain_class('apache::mod::status')
end end
@ -64,6 +67,22 @@ describe 'tripleo::profile::base::horizon' do
it 'should trigger complete configuration' do it 'should trigger complete configuration' do
is_expected.to contain_class('horizon') is_expected.to contain_class('horizon')
is_expected.to_not contain_class('horizon::dashboards::heat')
is_expected.to contain_class('apache::mod::remoteip')
is_expected.to contain_class('apache::mod::status')
end
end
context 'with step 4 and heat enabled' do
let(:params) { {
:step => 4,
:bootstrap_node => 'node.example.com',
:heat_api_enabled => true,
} }
it 'should trigger complete configuration with heat dashboard' do
is_expected.to contain_class('horizon')
is_expected.to contain_class('horizon::dashboards::heat')
is_expected.to contain_class('apache::mod::remoteip') is_expected.to contain_class('apache::mod::remoteip')
is_expected.to contain_class('apache::mod::status') is_expected.to contain_class('apache::mod::status')
end end