openstack/puppet-nova
Code Issues Proposed changes

Merge "Remove obsolete options for qpid reconnect."

Browse Source
This commit is contained in:
Jenkins
2013-12-13 14:40:47 +00:00
committed by Gerrit Code Review
parent 92be193d2c 11a3ec8e33
commit a78a9ebd3d
2 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/init.pp
View File

@@ -57,12 +57,6 @@ class nova(
$qpid_port = '5672',
$qpid_username = 'guest',
$qpid_password = 'guest',
$qpid_reconnect = true,
$qpid_reconnect_timeout = 0,
$qpid_reconnect_limit = 0,
$qpid_reconnect_interval_min = 0,
$qpid_reconnect_interval_max = 0,
$qpid_reconnect_interval = 0,
$qpid_heartbeat = 60,
$qpid_protocol = 'tcp',
$qpid_tcp_nodelay = true,
@@ -223,12 +217,6 @@ class nova(
'DEFAULT/qpid_port': value => $qpid_port;
'DEFAULT/qpid_username': value => $qpid_username;
'DEFAULT/qpid_password': value => $qpid_password, secret => true;
'DEFAULT/qpid_reconnect': value => $qpid_reconnect;
'DEFAULT/qpid_reconnect_timeout': value => $qpid_reconnect_timeout;
'DEFAULT/qpid_reconnect_limit': value => $qpid_reconnect_limit;
'DEFAULT/qpid_reconnect_interval_min': value => $qpid_reconnect_interval_min;
'DEFAULT/qpid_reconnect_interval_max': value => $qpid_reconnect_interval_max;
'DEFAULT/qpid_reconnect_interval': value => $qpid_reconnect_interval;
'DEFAULT/qpid_heartbeat': value => $qpid_heartbeat;
'DEFAULT/qpid_protocol': value => $qpid_protocol;
'DEFAULT/qpid_tcp_nodelay': value => $qpid_tcp_nodelay;

6
spec/classes/nova_init_spec.rb
View File

@@ -220,12 +220,6 @@ describe 'nova' do
it { should contain_nova_config('DEFAULT/qpid_port').with_value('5672') }
it { should contain_nova_config('DEFAULT/qpid_username').with_value('guest') }
it { should contain_nova_config('DEFAULT/qpid_password').with_value('guest').with_secret(true) }
it { should contain_nova_config('DEFAULT/qpid_reconnect').with_value(true) }
it { should contain_nova_config('DEFAULT/qpid_reconnect_timeout').with_value('0') }
it { should contain_nova_config('DEFAULT/qpid_reconnect_limit').with_value('0') }
it { should contain_nova_config('DEFAULT/qpid_reconnect_interval_min').with_value('0') }
it { should contain_nova_config('DEFAULT/qpid_reconnect_interval_max').with_value('0') }
it { should contain_nova_config('DEFAULT/qpid_reconnect_interval').with_value('0') }
it { should contain_nova_config('DEFAULT/qpid_heartbeat').with_value('60') }
it { should contain_nova_config('DEFAULT/qpid_protocol').with_value('tcp') }
it { should contain_nova_config('DEFAULT/qpid_tcp_nodelay').with_value(true) }