openstack/puppet-octavia
Code Issues Proposed changes

Adding health_worker.pp

Browse Source 
Adding basic health manager support.

Change-Id: I3be10dffd446d0c12e1849b0de58e458858fc75d
This commit is contained in:
Brent Eagles
2016-07-15 15:29:09 -02:30
parent 6ef738f373
commit db34ab261a
4 changed files with 185 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
manifests/health_manager.pp Normal file
View File

@@ -0,0 +1,64 @@
# Installs and configures the octavia health manager service
#
# == Parameters
#
# [*heartbeat_key*]
# Key to validate amphora messages.
#
# [*enabled*]
# (optional) Should the service be enabled.
# Defaults to true
#
# [*manage_service*]
# (optional) Whether the service should be managed by Puppet.
# Defaults to true.
#
# [*package_ensure*]
# (optional) ensure state for package.
# Defaults to 'present'
#
# [*event_streamer_driver*]
# (optional) Driver to use for synchronizing octavia and lbaas databases.
# Defaults to $::os_service_default
#
class octavia::health_manager (
$heartbeat_key,
$manage_service = true,
$enabled = true,
$package_ensure = 'present',
$event_streamer_driver = $::os_service_default,
) inherits octavia::params {
validate_string($heartbeat_key)
Octavia_config<||> ~> Service['octavia-health-manager']
Package['octavia-health-manager'] -> Service['octavia-health-manager']
package { 'octavia-health-manager':
ensure => $package_ensure,
name => $::octavia::params::health_manager_package_name,
tag => ['openstack', 'octavia-package'],
}
if $manage_service {
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
}
service { 'octavia-health-manager':
ensure => $service_ensure,
name => $::octavia::params::health_manager_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
tag => ['octavia-service'],
}
octavia_config {
'health_manager/heartbeat_key' : value => $heartbeat_key;
'health_manager/event_streamer_driver' : value => $event_streamer_driver,
}
}

19
manifests/params.pp
View File

@@ -3,18 +3,21 @@
class octavia::params {
include ::openstacklib::defaults
$api_service_name = 'octavia-api'
$worker_service_name = 'octavia-worker'
$api_service_name = 'octavia-api'
$worker_service_name = 'octavia-worker'
$health_manager_service_name = 'octavia-health-manager'
case $::osfamily {
'RedHat': {
$common_package_name = 'openstack-octavia-common'
$api_package_name = 'openstack-octavia-api'
$worker_package_name = 'openstack-octavia-worker'
$common_package_name = 'openstack-octavia-common'
$api_package_name = 'openstack-octavia-api'
$worker_package_name = 'openstack-octavia-worker'
$health_manager_package_name = 'openstack-octavia-health-manager'
}
'Debian': {
$common_package_name = 'octavia-common'
$api_package_name = 'octavia-api'
$worker_package_name = 'octavia-worker'
$common_package_name = 'octavia-common'
$api_package_name = 'octavia-api'
$worker_package_name = 'octavia-worker'
$health_manager_package_name = 'octavia-health-manager'
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem")

3
spec/acceptance/octavia_spec.rb
View File

@@ -55,6 +55,9 @@ describe 'basic octavia' do
class { '::octavia::worker':
amp_flavor_id => '65',
}
class { '::octavia::health_manager':
heartbeat_key => 'abcdefghijkl',
}
# We create Nova flavor on the same node where Nova runs
Class['::nova::keystone::auth'] -> Nova_flavor<||>

107
spec/classes/octavia_health_manager_spec.rb Normal file
View File

@@ -0,0 +1,107 @@
require 'spec_helper'
describe 'octavia::health_manager' do
let :params do
{ :enabled => true,
:manage_service => true,
:package_ensure => 'latest',
:heartbeat_key => 'default_key'
}
end
shared_examples_for 'octavia-health-manager' do
context 'without a heartbeat key' do
before { params.delete(:heartbeat_key) }
it { expect { is_expected.to raise_error(Puppet::Error) } }
end
context 'with an invalid value for heartbeat key' do
before do
params.merge!({
:heartbeat_key => 0,
})
end
it { expect { is_expected.to raise_error(Puppet::Error) } }
end
context 'with minimal parameters' do
before do
params.merge!({
:heartbeat_key => 'abcdefghi',
})
end
it { is_expected.to contain_octavia_config('health_manager/heartbeat_key').with_value('abcdefghi') }
end
it 'installs octavia-health-manager package' do
is_expected.to contain_package('octavia-health-manager').with(
:ensure => 'latest',
:name => platform_params[:health_manager_package_name],
:tag => ['openstack', 'octavia-package'],
)
end
[{:enabled => true}, {:enabled => false}].each do |param_hash|
context "when service should be #{param_hash[:enabled] ? 'enabled' : 'disabled'}" do
before do
params.merge!(param_hash)
end
it 'configures octavia-health-manager service' do
is_expected.to contain_service('octavia-health-manager').with(
:ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
:name => platform_params[:health_manager_service_name],
:enable => params[:enabled],
:hasstatus => true,
:hasrestart => true,
:tag => ['octavia-service'],
)
end
end
end
context 'with disabled service managing' do
before do
params.merge!({
:manage_service => false,
:enabled => false })
end
it 'configures octavia-health-manager service' do
is_expected.to contain_service('octavia-health-manager').with(
:ensure => nil,
:name => platform_params[:health_manager_service_name],
:enable => false,
:hasstatus => true,
:hasrestart => true,
:tag => ['octavia-service'],
)
end
end
end
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
{ :health_manager_package_name => 'octavia-health-manager',
:health_manager_service_name => 'octavia-health-manager' }
when 'RedHat'
{ :health_manager_package_name => 'openstack-octavia-health-manager',
:health_manager_service_name => 'octavia-health-manager' }
end
end
it_behaves_like 'octavia-health-manager'
end
end
end