Merge "Horizon: Enable octavia-dashboard configurations" into stable/ussuri
This commit is contained in:
commit
6f44d2c6db
|
@ -66,6 +66,10 @@
|
||||||
# (Optional) Indicate whether Heat is available in the deployment.
|
# (Optional) Indicate whether Heat is available in the deployment.
|
||||||
# Defaults to hiera('heat_api_enabled') or false
|
# 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 (
|
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),
|
||||||
|
@ -75,6 +79,7 @@ class tripleo::profile::base::horizon (
|
||||||
$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),
|
$heat_api_enabled = hiera('heat_api_enabled', false),
|
||||||
|
$octavia_api_enabled = hiera('octavia_api_enabled', false),
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$memcached_ips = undef
|
$memcached_ips = undef
|
||||||
) {
|
) {
|
||||||
|
@ -118,5 +123,9 @@ class tripleo::profile::base::horizon (
|
||||||
if $heat_api_enabled {
|
if $heat_api_enabled {
|
||||||
include horizon::dashboards::heat
|
include horizon::dashboards::heat
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $octavia_api_enabled {
|
||||||
|
include horizon::dashboards::octavia
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,7 @@ describe 'tripleo::profile::base::horizon' 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')
|
is_expected.to_not contain_class('horizon::dashboards::heat')
|
||||||
|
is_expected.to_not contain_class('horizon::dashboards::octavia')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -40,6 +41,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('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::remoteip')
|
||||||
is_expected.to_not contain_class('apache::mod::status')
|
is_expected.to_not contain_class('apache::mod::status')
|
||||||
end
|
end
|
||||||
|
@ -54,6 +56,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_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::remoteip')
|
||||||
is_expected.to contain_class('apache::mod::status')
|
is_expected.to contain_class('apache::mod::status')
|
||||||
end
|
end
|
||||||
|
@ -68,6 +71,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_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::remoteip')
|
||||||
is_expected.to contain_class('apache::mod::status')
|
is_expected.to contain_class('apache::mod::status')
|
||||||
end
|
end
|
||||||
|
@ -83,6 +87,23 @@ describe 'tripleo::profile::base::horizon' do
|
||||||
it 'should trigger complete configuration with heat dashboard' do
|
it 'should trigger complete configuration with heat dashboard' do
|
||||||
is_expected.to contain_class('horizon')
|
is_expected.to contain_class('horizon')
|
||||||
is_expected.to contain_class('horizon::dashboards::heat')
|
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::remoteip')
|
||||||
is_expected.to contain_class('apache::mod::status')
|
is_expected.to contain_class('apache::mod::status')
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue