From 30135ca029aa65438c0d757b468d89fe2544c44c Mon Sep 17 00:00:00 2001 From: Iury Gregory Melo Ferreira Date: Wed, 18 May 2016 18:07:19 -0300 Subject: [PATCH] Remove unused code The code removed have been deprecated since Juno and should be removed in Kilo. Change-Id: Iee2ba338a8c7ee87d32a2eeabba226b0e2545fc9 --- manifests/init.pp | 14 -------------- spec/classes/nova_init_spec.rb | 12 ------------ 2 files changed, 26 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 42916e796..b3e85bdad 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -698,18 +698,4 @@ class nova( } } - # Deprecated in Juno, removed in Kilo - 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 880dc1ba8..b68d037c5 100644 --- a/spec/classes/nova_init_spec.rb +++ b/spec/classes/nova_init_spec.rb @@ -59,12 +59,6 @@ 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/use_ipv6').with_value('') - 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 @@ -172,12 +166,6 @@ describe 'nova' do is_expected.to contain_nova_config('DEFAULT/report_interval').with_value('60') 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