openstack/puppet-nova
Code Issues Proposed changes

Merge "Ensure rabbit_* in DEFAULT is absent"

Browse Source
This commit is contained in:
Jenkins
2016-01-26 15:15:32 +00:00
committed by Gerrit Code Review
parent 71ffb569a3 85662288f2
commit 4ead35ff28
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/init.pp
View File

@@ -776,4 +776,14 @@ class nova(
nova_config {
'DEFAULT/os_region_name': ensure => absent;
}
# Deprecated in Juno, removed in Kilo
nova_config {
'DEFAULT/rabbit_userid': ensure => absent;
'DEFAULT/rabbit_host': ensure => absent;
'DEFAULT/rabbit_port': ensure => absent;
'DEFAULT/rabbit_password': ensure => absent;
'DEFAULT/rabbit_virtual_host': ensure => absent;
}
}

10
spec/classes/nova_init_spec.rb
View File

@@ -61,6 +61,11 @@ describe 'nova' do
is_expected.to contain_nova_config('DEFAULT/report_interval').with_value('10')
is_expected.to contain_nova_config('DEFAULT/use_ipv6').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('DEFAULT/os_region_name').with_ensure('absent')
is_expected.to contain_nova_config('DEFAULT/rabbit_userid').with_ensure('absent')
is_expected.to contain_nova_config('DEFAULT/rabbit_host').with_ensure('absent')
is_expected.to contain_nova_config('DEFAULT/rabbit_port').with_ensure('absent')
is_expected.to contain_nova_config('DEFAULT/rabbit_password').with_ensure('absent')
is_expected.to contain_nova_config('DEFAULT/rabbit_virtual_host').with_ensure('absent')
is_expected.to contain_nova_config('cinder/os_region_name').with_ensure('absent')
is_expected.to contain_nova_config('cinder/catalog_info').with('value' => 'volumev2:cinderv2:publicURL')
end
@@ -162,6 +167,11 @@ describe 'nova' do
is_expected.to contain_nova_config('DEFAULT/use_ipv6').with_value('true')
is_expected.to contain_nova_config('cinder/os_region_name').with_value('MyRegion')
is_expected.to contain_nova_config('DEFAULT/os_region_name').with_ensure('absent')
is_expected.to contain_nova_config('DEFAULT/rabbit_userid').with_ensure('absent')
is_expected.to contain_nova_config('DEFAULT/rabbit_host').with_ensure('absent')
is_expected.to contain_nova_config('DEFAULT/rabbit_port').with_ensure('absent')
is_expected.to contain_nova_config('DEFAULT/rabbit_password').with_ensure('absent')
is_expected.to contain_nova_config('DEFAULT/rabbit_virtual_host').with_ensure('absent')
end
context 'with multiple notification_driver' do