From 85662288f28f48382306f67a98bff10cd41330f4 Mon Sep 17 00:00:00 2001 From: "nanhai.liao" Date: Sat, 2 Jan 2016 08:17:42 +0800 Subject: [PATCH] Ensure rabbit_* in DEFAULT is absent Change-Id: I2be8be17afe05cf62f2d47f1b0b1272114cfd490 Closes-bug: #1529475 --- manifests/init.pp | 10 ++++++++++ spec/classes/nova_init_spec.rb | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index d61d34488..6c7e3fe12 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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; + } + } diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb index dd98db699..17653d30c 100644 --- a/spec/classes/nova_init_spec.rb +++ b/spec/classes/nova_init_spec.rb @@ -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