openstack
/
puppet-octavia
Code Issues Proposed changes

Merge "Add octavia::neutron to configure nova section" into stable/rocky

This commit is contained in:
Zuul 2018-08-31 12:12:12 +00:00 committed by Gerrit Code Review
parent ab0ee24337 593f49a5d8
commit 8e47326a0b
3 changed files with 88 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
manifests/neutron.pp Normal file
View File

@ -0,0 +1,38 @@
# == Class: octavia::neutron
#
# Setup and configure octavia.conf neutron section.
#
# === Parameters:
#
# [*service_name*]
# (Optional) The name of the neutron service in the keystone catalog.
# Defaults to $::os_service_default
#
# [*endpoint*]
# (Optional) Custom neutron endpoint if override is necessary.
# Defaults to $::os_service_default
#
# [*region_name*]
# (Optional) Region in catalog to use for neutron.
# Defaults to $::os_service_default
#
# [*endpoint_type*]
# (Optional) Endpoint type in catalog to use for neutron.
# Defaults to $::os_service_default
#
class octavia::neutron (
$service_name = $::os_service_default,
$endpoint = $::os_service_default,
$region_name = $::os_service_default,
$endpoint_type = $::os_service_default,
) {
include ::octavia::deps
octavia_config {
'neutron/service_name': value => $service_name;
'neutron/endpoint': value => $endpoint;
'neutron/region_name': value => $region_name;
'neutron/endpoint_type': value => $endpoint_type;
}
}

5
releasenotes/notes/octavia-neutron-7d3d9cc0e95ecb11.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Added new octavia::neutron class that can be used to configure the neutron section
in octavia.conf

45
spec/classes/octavia_neutron_spec.rb Normal file
View File

@ -0,0 +1,45 @@
require 'spec_helper'
describe 'octavia::neutron' do
shared_examples 'octavia::neutron' do
context 'with default parameters' do
it {
should contain_octavia_config('neutron/service_name').with_value('<SERVICE DEFAULT>')
should contain_octavia_config('neutron/endpoint').with_value('<SERVICE DEFAULT>')
should contain_octavia_config('neutron/region_name').with_value('<SERVICE DEFAULT>')
should contain_octavia_config('neutron/endpoint_type').with_value('<SERVICE DEFAULT>')
}
end
context 'with specified parameters' do
let :params do
{
:service_name => 'networking',
:endpoint => 'http://127.0.0.1:9696',
:region_name => 'RegionOne',
:endpoint_type => 'internalURL',
}
end
it {
should contain_octavia_config('neutron/service_name').with_value('networking')
should contain_octavia_config('neutron/endpoint').with_value('http://127.0.0.1:9696')
should contain_octavia_config('neutron/region_name').with_value('RegionOne')
should contain_octavia_config('neutron/endpoint_type').with_value('internalURL')
}
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
it_behaves_like 'octavia::neutron'
end
end
end