From d2a9586a59576e366bf204655f2d877b19981048 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Thu, 30 Aug 2018 11:52:57 +0200 Subject: [PATCH] Add octavia::neutron to configure nova section Adds new class octavia::neutron that can be used to configure the neutron section in octavia.conf Change-Id: I124a1a02afaf9f937b1e57d0362db53eeb026954 --- manifests/neutron.pp | 38 ++++++++++++++++ .../octavia-neutron-7d3d9cc0e95ecb11.yaml | 5 +++ spec/classes/octavia_neutron_spec.rb | 45 +++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 manifests/neutron.pp create mode 100644 releasenotes/notes/octavia-neutron-7d3d9cc0e95ecb11.yaml create mode 100644 spec/classes/octavia_neutron_spec.rb diff --git a/manifests/neutron.pp b/manifests/neutron.pp new file mode 100644 index 00000000..44bab801 --- /dev/null +++ b/manifests/neutron.pp @@ -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; + } +} diff --git a/releasenotes/notes/octavia-neutron-7d3d9cc0e95ecb11.yaml b/releasenotes/notes/octavia-neutron-7d3d9cc0e95ecb11.yaml new file mode 100644 index 00000000..d64d5292 --- /dev/null +++ b/releasenotes/notes/octavia-neutron-7d3d9cc0e95ecb11.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Added new octavia::neutron class that can be used to configure the neutron section + in octavia.conf diff --git a/spec/classes/octavia_neutron_spec.rb b/spec/classes/octavia_neutron_spec.rb new file mode 100644 index 00000000..d69fe601 --- /dev/null +++ b/spec/classes/octavia_neutron_spec.rb @@ -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('') + should contain_octavia_config('neutron/endpoint').with_value('') + should contain_octavia_config('neutron/region_name').with_value('') + should contain_octavia_config('neutron/endpoint_type').with_value('') + } + 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