openstack/puppet-nova
Code Issues Proposed changes

Merge "Remove unused code"

Browse Source
This commit is contained in:
Jenkins
2016-05-21 15:21:24 +00:00
committed by Gerrit Code Review
parent 6ece6e81de 30135ca029
commit b0e96b7da9
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/init.pp
View File

@@ -792,18 +792,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;
}
}

12
spec/classes/nova_init_spec.rb
View File

@@ -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('<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
@@ -166,12 +160,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