Merge "Use lower case characters for section name"
This commit is contained in:
commit
0aea7bb56d
|
@ -219,11 +219,11 @@ class neutron::agents::dhcp (
|
|||
}
|
||||
|
||||
neutron_dhcp_agent_config {
|
||||
'OVS/ovsdb_connection': value => $ovsdb_connection;
|
||||
'OVS/integration_bridge': value => $ovs_integration_bridge;
|
||||
'OVS/ssl_key_file': value => $ovsdb_agent_ssl_key_file;
|
||||
'OVS/ssl_cert_file': value => $ovsdb_agent_ssl_cert_file;
|
||||
'OVS/ssl_ca_cert_file': value => $ovsdb_agent_ssl_ca_file;
|
||||
'ovs/ovsdb_connection': value => $ovsdb_connection;
|
||||
'ovs/integration_bridge': value => $ovs_integration_bridge;
|
||||
'ovs/ssl_key_file': value => $ovsdb_agent_ssl_key_file;
|
||||
'ovs/ssl_cert_file': value => $ovsdb_agent_ssl_cert_file;
|
||||
'ovs/ssl_ca_cert_file': value => $ovsdb_agent_ssl_ca_file;
|
||||
}
|
||||
|
||||
if $::neutron::params::dhcp_agent_package {
|
||||
|
|
|
@ -46,11 +46,11 @@ describe 'neutron::agents::dhcp' do
|
|||
should contain_neutron_dhcp_agent_config('agent/availability_zone').with_value('<SERVICE DEFAULT>');
|
||||
should contain_neutron_dhcp_agent_config('agent/report_interval').with_value('<SERVICE DEFAULT>');
|
||||
should contain_neutron_dhcp_agent_config('DEFAULT/rpc_response_max_timeout').with_value('<SERVICE DEFAULT>');
|
||||
should contain_neutron_dhcp_agent_config('OVS/ovsdb_connection').with_value('<SERVICE DEFAULT>');
|
||||
should contain_neutron_dhcp_agent_config('OVS/integration_bridge').with_value('<SERVICE DEFAULT>');
|
||||
should contain_neutron_dhcp_agent_config('OVS/ssl_key_file').with_value('<SERVICE DEFAULT>');
|
||||
should contain_neutron_dhcp_agent_config('OVS/ssl_cert_file').with_value('<SERVICE DEFAULT>');
|
||||
should contain_neutron_dhcp_agent_config('OVS/ssl_ca_cert_file').with_value('<SERVICE DEFAULT>');
|
||||
should contain_neutron_dhcp_agent_config('ovs/ovsdb_connection').with_value('<SERVICE DEFAULT>');
|
||||
should contain_neutron_dhcp_agent_config('ovs/integration_bridge').with_value('<SERVICE DEFAULT>');
|
||||
should contain_neutron_dhcp_agent_config('ovs/ssl_key_file').with_value('<SERVICE DEFAULT>');
|
||||
should contain_neutron_dhcp_agent_config('ovs/ssl_cert_file').with_value('<SERVICE DEFAULT>');
|
||||
should contain_neutron_dhcp_agent_config('ovs/ssl_ca_cert_file').with_value('<SERVICE DEFAULT>');
|
||||
end
|
||||
|
||||
it 'installs neutron-dhcp-agent package' do
|
||||
|
@ -172,10 +172,10 @@ describe 'neutron::agents::dhcp' do
|
|||
})
|
||||
end
|
||||
it 'configures neutron SSL settings' do
|
||||
should contain_neutron_dhcp_agent_config('OVS/ovsdb_connection').with_value(params[:ovsdb_connection])
|
||||
should contain_neutron_dhcp_agent_config('OVS/ssl_key_file').with_value(params[:ovsdb_agent_ssl_key_file])
|
||||
should contain_neutron_dhcp_agent_config('OVS/ssl_cert_file').with_value(params[:ovsdb_agent_ssl_cert_file])
|
||||
should contain_neutron_dhcp_agent_config('OVS/ssl_ca_cert_file').with_value(params[:ovsdb_agent_ssl_ca_file])
|
||||
should contain_neutron_dhcp_agent_config('ovs/ovsdb_connection').with_value(params[:ovsdb_connection])
|
||||
should contain_neutron_dhcp_agent_config('ovs/ssl_key_file').with_value(params[:ovsdb_agent_ssl_key_file])
|
||||
should contain_neutron_dhcp_agent_config('ovs/ssl_cert_file').with_value(params[:ovsdb_agent_ssl_cert_file])
|
||||
should contain_neutron_dhcp_agent_config('ovs/ssl_ca_cert_file').with_value(params[:ovsdb_agent_ssl_ca_file])
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue