openstack/puppet-nova
Code Issues Proposed changes

Ensure rabbit_* in DEFAULT is absent

Browse Source 
Change-Id: I2be8be17afe05cf62f2d47f1b0b1272114cfd490
Closes-bug: #1529475
This commit is contained in:
nanhai.liao
2016-01-02 08:17:42 +08:00
parent c339a86baf
commit 85662288f2
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

@@ -774,4 +774,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

@@ -60,6 +60,11 @@ describe 'nova' do
is_expected.to contain_nova_config('DEFAULT/rootwrap_config').with_value('/etc/nova/rootwrap.conf')
is_expected.to contain_nova_config('DEFAULT/report_interval').with_value('10')
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
@@ -159,6 +164,11 @@ describe 'nova' do
is_expected.to contain_nova_config('DEFAULT/report_interval').with_value('60')
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