From a1efe2ce275e220bd0ccbda3940afb013d99a28b Mon Sep 17 00:00:00 2001 From: Kamil Sambor Date: Fri, 19 Apr 2019 11:38:46 +0200 Subject: [PATCH] Unified agent section of ini files In all files we use agent written in lower cases but for few cases we use capitalise letters. This is confusing for users to see two different sections one 'agent', second 'AGENT'. This patch unify spelling. Change-Id: Iccfc0b805d54e3763ce494970c78f5a894a2709d --- manifests/agents/dhcp.pp | 2 +- manifests/agents/l3.pp | 4 ++-- spec/classes/neutron_agents_dhcp_spec.rb | 4 ++-- spec/classes/neutron_agents_l3_spec.rb | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp index 6888b1c54..4b33e1579 100644 --- a/manifests/agents/dhcp.pp +++ b/manifests/agents/dhcp.pp @@ -157,7 +157,7 @@ class neutron::agents::dhcp ( 'DEFAULT/dnsmasq_dns_servers': value => join(any2array($dnsmasq_dns_servers), ','); 'DEFAULT/dnsmasq_local_resolv': value => $dnsmasq_local_resolv; 'DEFAULT/ovs_integration_bridge': value => $ovs_integration_bridge; - 'AGENT/availability_zone': value => $availability_zone; + 'agent/availability_zone': value => $availability_zone; } if $ovsdb_connection =~ /^ssl:/ { diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp index c2c477413..04915f292 100644 --- a/manifests/agents/l3.pp +++ b/manifests/agents/l3.pp @@ -134,8 +134,8 @@ class neutron::agents::l3 ( 'DEFAULT/periodic_fuzzy_delay': value => $periodic_fuzzy_delay; 'DEFAULT/enable_metadata_proxy': value => $enable_metadata_proxy; 'DEFAULT/agent_mode': value => $agent_mode; - 'AGENT/availability_zone': value => $availability_zone; - 'AGENT/extensions': value => $extensions; + 'agent/availability_zone': value => $availability_zone; + 'agent/extensions': value => $extensions; } if $::neutron::params::l3_agent_package { diff --git a/spec/classes/neutron_agents_dhcp_spec.rb b/spec/classes/neutron_agents_dhcp_spec.rb index 3b01f3471..9704b9662 100644 --- a/spec/classes/neutron_agents_dhcp_spec.rb +++ b/spec/classes/neutron_agents_dhcp_spec.rb @@ -43,7 +43,7 @@ describe 'neutron::agents::dhcp' do should contain_neutron_dhcp_agent_config('DEFAULT/dhcp_broadcast_reply').with_value(''); should contain_neutron_dhcp_agent_config('DEFAULT/ovs_integration_bridge').with_value(''); should contain_neutron_dhcp_agent_config('DEFAULT/dnsmasq_local_resolv').with_value(''); - should contain_neutron_dhcp_agent_config('AGENT/availability_zone').with_value(''); + should contain_neutron_dhcp_agent_config('agent/availability_zone').with_value(''); should contain_neutron_dhcp_agent_config('OVS/ovsdb_connection').with_value(''); should contain_neutron_dhcp_agent_config('OVS/ssl_key_file').with_value(''); should contain_neutron_dhcp_agent_config('OVS/ssl_cert_file').with_value(''); @@ -146,7 +146,7 @@ describe 'neutron::agents::dhcp' do params.merge!(:availability_zone => 'zone1') end it 'should configure availability zone' do - should contain_neutron_dhcp_agent_config('AGENT/availability_zone').with_value(p[:availability_zone]); + should contain_neutron_dhcp_agent_config('agent/availability_zone').with_value(p[:availability_zone]); end end diff --git a/spec/classes/neutron_agents_l3_spec.rb b/spec/classes/neutron_agents_l3_spec.rb index 43735f9bb..67adeb350 100644 --- a/spec/classes/neutron_agents_l3_spec.rb +++ b/spec/classes/neutron_agents_l3_spec.rb @@ -38,8 +38,8 @@ describe 'neutron::agents::l3' do should contain_neutron_l3_agent_config('DEFAULT/periodic_interval').with_value('') should contain_neutron_l3_agent_config('DEFAULT/periodic_fuzzy_delay').with_value('') should contain_neutron_l3_agent_config('DEFAULT/enable_metadata_proxy').with_value('') - should contain_neutron_l3_agent_config('AGENT/availability_zone').with_value('') - should contain_neutron_l3_agent_config('AGENT/extensions').with_value('') + should contain_neutron_l3_agent_config('agent/availability_zone').with_value('') + should contain_neutron_l3_agent_config('agent/extensions').with_value('') end it 'passes purge to resource' do @@ -106,7 +106,7 @@ describe 'neutron::agents::l3' do end it 'configures availability zone' do - should contain_neutron_l3_agent_config('AGENT/availability_zone').with_value(p[:availability_zone]) + should contain_neutron_l3_agent_config('agent/availability_zone').with_value(p[:availability_zone]) end end end