consistent naming of parameters in error messages

Some of the parameters in the error messages where named without the _
(underscore) character between the words of the parameters. This patch
brings those parameters into the same form.

Change-Id: Ieedf2ad884f4a43f6fead8c34535a168f39a1207
This commit is contained in:
Jens-Christian Fischer
2013-07-09 15:12:40 +02:00
parent 8cd997418a
commit 7377ff1860
4 changed files with 5 additions and 5 deletions

View File

@@ -179,10 +179,10 @@ class openstack::compute (
} else { } else {
if ! $quantum_user_password { if ! $quantum_user_password {
fail('quantum user password must be set when quantum is configured') fail('quantum_user_password must be set when quantum is configured')
} }
if ! $keystone_host { if ! $keystone_host {
fail('keystone host must be configured when quantum is installed') fail('keystone_host must be configured when quantum is installed')
} }
class { 'openstack::quantum': class { 'openstack::quantum':

View File

@@ -236,7 +236,7 @@ class openstack::quantum (
if $enable_metadata_agent { if $enable_metadata_agent {
if ! $shared_secret { if ! $shared_secret {
fail('Shared secret parameter must be set when using metadata agent') fail('metadata_shared_secret parameter must be set when using metadata agent')
} }
class { 'quantum::agents::metadata': class { 'quantum::agents::metadata':
auth_password => $user_password, auth_password => $user_password,

View File

@@ -85,7 +85,7 @@ describe 'openstack::all' do
) )
end end
it 'raises an error if no shared metadata key is set' do it 'raises an error if no shared metadata key is set' do
expect { subject }.to raise_error(Puppet::Error, /Shared secret parameter must be set when using metadata agent/) expect { subject }.to raise_error(Puppet::Error, /metadata_shared_secret parameter must be set when using metadata agent/)
end end
end end

View File

@@ -115,7 +115,7 @@ describe 'openstack::quantum' do
it 'should fail' do it 'should fail' do
expect do expect do
subject subject
end.to raise_error(Puppet::Error, /Shared secret parameter must be set/) end.to raise_error(Puppet::Error, /metadata_shared_secret parameter must be set/)
end end
context 'with a shared secret' do context 'with a shared secret' do
before do before do