From f87db0d3369cd81313256e5d9b599a620b4a6c52 Mon Sep 17 00:00:00 2001 From: sairamp Date: Thu, 8 Feb 2018 21:56:29 -0500 Subject: [PATCH] Optionally set device_driver to $::os_service_default This commit will give users to optionally set device_driver value in lbaas_agent.ini to $::os_service_default Change-Id: I1a9d8094816c684bfb769617dce895f122323fb9 --- manifests/agents/lbaas.pp | 1 + ...ce-driver-to-os-service-default-a5820845f828296c.yaml | 3 +++ spec/classes/neutron_agents_lbaas_spec.rb | 9 +++++++++ 3 files changed, 13 insertions(+) create mode 100644 releasenotes/notes/option-to-set-device-driver-to-os-service-default-a5820845f828296c.yaml diff --git a/manifests/agents/lbaas.pp b/manifests/agents/lbaas.pp index d6ab36cc0..1881a23e4 100644 --- a/manifests/agents/lbaas.pp +++ b/manifests/agents/lbaas.pp @@ -64,6 +64,7 @@ class neutron::agents::lbaas ( ensure_packages([$::neutron::params::haproxy_package]) } } + $::os_service_default: {} default: { fail("Unsupported device_driver ${device_driver}") } diff --git a/releasenotes/notes/option-to-set-device-driver-to-os-service-default-a5820845f828296c.yaml b/releasenotes/notes/option-to-set-device-driver-to-os-service-default-a5820845f828296c.yaml new file mode 100644 index 000000000..8c6685b5b --- /dev/null +++ b/releasenotes/notes/option-to-set-device-driver-to-os-service-default-a5820845f828296c.yaml @@ -0,0 +1,3 @@ +--- +features: + - Optionally users can set device_driver value in lbaas_agent.ini to $::os_service_default diff --git a/spec/classes/neutron_agents_lbaas_spec.rb b/spec/classes/neutron_agents_lbaas_spec.rb index 0170b6d11..5f2888cd5 100644 --- a/spec/classes/neutron_agents_lbaas_spec.rb +++ b/spec/classes/neutron_agents_lbaas_spec.rb @@ -90,6 +90,15 @@ describe 'neutron::agents::lbaas' do is_expected.to contain_neutron_lbaas_agent_config('DEFAULT/ovs_use_veth').with_value(false); end end + + context 'with device_driver as $::os_service_default' do + before :each do + params.merge!(:device_driver => '') + end + it 'should have devcie_driver set to $::os_service_default' do + is_expected.to contain_neutron_lbaas_agent_config('DEFAULT/device_driver').with_value(''); + end + end end shared_examples_for 'haproxy lbaas_driver' do