Browse Source

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

changes/87/824987/1
Zuul 5 months ago committed by Gerrit Code Review
parent
commit
6f44d2c6db
  1. 9
      manifests/profile/base/horizon.pp
  2. 21
      spec/classes/tripleo_profile_base_horizon_spec.rb

9
manifests/profile/base/horizon.pp

@ -66,6 +66,10 @@
# (Optional) Indicate whether Heat is available in the deployment.
# Defaults to hiera('heat_api_enabled') or false
#
# [*octavia_api_enabled*]
# (Optional) Indicate whether Octavia is available in the deployment.
# Defaults to hiera('octavia_api_enabled') or false
#
class tripleo::profile::base::horizon (
$step = Integer(hiera('step')),
$bootstrap_node = hiera('horizon_short_bootstrap_node_name', undef),
@ -75,6 +79,7 @@ class tripleo::profile::base::horizon (
$neutron_options = hiera('horizon::neutron_options', {}),
$memcached_hosts = hiera('memcached_node_names', []),
$heat_api_enabled = hiera('heat_api_enabled', false),
$octavia_api_enabled = hiera('octavia_api_enabled', false),
# DEPRECATED PARAMETERS
$memcached_ips = undef
) {
@ -118,5 +123,9 @@ class tripleo::profile::base::horizon (
if $heat_api_enabled {
include horizon::dashboards::heat
}
if $octavia_api_enabled {
include horizon::dashboards::octavia
}
}
}

21
spec/classes/tripleo_profile_base_horizon_spec.rb

@ -29,6 +29,7 @@ describe 'tripleo::profile::base::horizon' do
is_expected.to contain_class('tripleo::profile::base::horizon')
is_expected.to_not contain_class('horizon')
is_expected.to_not contain_class('horizon::dashboards::heat')
is_expected.to_not contain_class('horizon::dashboards::octavia')
end
end
@ -40,6 +41,7 @@ describe 'tripleo::profile::base::horizon' do
it 'should not configure anything' do
is_expected.to_not contain_class('horizon')
is_expected.to_not contain_class('horizon::dashboards::heat')
is_expected.to_not contain_class('horizon::dashboards::octavia')
is_expected.to_not contain_class('apache::mod::remoteip')
is_expected.to_not contain_class('apache::mod::status')
end
@ -54,6 +56,7 @@ describe 'tripleo::profile::base::horizon' do
it 'should trigger complete configuration' do
is_expected.to contain_class('horizon')
is_expected.to_not contain_class('horizon::dashboards::heat')
is_expected.to_not contain_class('horizon::dashboards::octavia')
is_expected.to contain_class('apache::mod::remoteip')
is_expected.to contain_class('apache::mod::status')
end
@ -68,6 +71,7 @@ describe 'tripleo::profile::base::horizon' do
it 'should trigger complete configuration' do
is_expected.to contain_class('horizon')
is_expected.to_not contain_class('horizon::dashboards::heat')
is_expected.to_not contain_class('horizon::dashboards::octavia')
is_expected.to contain_class('apache::mod::remoteip')
is_expected.to contain_class('apache::mod::status')
end
@ -83,6 +87,23 @@ describe 'tripleo::profile::base::horizon' do
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_not contain_class('horizon::dashboards::octavia')
is_expected.to contain_class('apache::mod::remoteip')
is_expected.to contain_class('apache::mod::status')
end
end
context 'with step 4 and octavia enabled' do
let(:params) { {
:step => 4,
:bootstrap_node => 'node.example.com',
:octavia_api_enabled => true,
} }
it 'should trigger complete configuration with heat dashboard' do
is_expected.to contain_class('horizon')
is_expected.to_not contain_class('horizon::dashboards::heat')
is_expected.to contain_class('horizon::dashboards::octavia')
is_expected.to contain_class('apache::mod::remoteip')
is_expected.to contain_class('apache::mod::status')
end

Loading…
Cancel
Save