openstack/puppet-nova
Code Issues Proposed changes

Merge "Allow to enable/disable IPv6 support"

Browse Source
This commit is contained in:
Jenkins
2016-01-11 16:09:27 +00:00
committed by Gerrit Code Review
parent 81e0bdbddd 3f86cd57e2
commit 4a9ba6ac29
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@@ -292,6 +292,10 @@
# (optional) Sets a version cap for messages sent to scheduler services
# Defaults to undef
#
# [*use_ipv6*]
# (optional) Use IPv6 or not.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*qpid_hostname*]
@@ -397,6 +401,7 @@ class nova(
$upgrade_level_intercell = undef,
$upgrade_level_network = undef,
$upgrade_level_scheduler = undef,
$use_ipv6 = $::os_service_default,
# DEPRECATED PARAMETERS
$qpid_hostname = undef,
$qpid_port = undef,
@@ -650,6 +655,7 @@ class nova(
'DEFAULT/service_down_time': value => $service_down_time;
'DEFAULT/rootwrap_config': value => $rootwrap_config;
'DEFAULT/report_interval': value => $report_interval;
'DEFAULT/use_ipv6': value => $use_ipv6;
}
if $notify_on_state_change and $notify_on_state_change in ['vm_state', 'vm_and_task_state'] {

3
spec/classes/nova_init_spec.rb
View File

@@ -59,6 +59,7 @@ describe 'nova' do
is_expected.to contain_nova_config('DEFAULT/notification_driver').with_ensure('absent')
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('cinder/os_region_name').with_ensure('absent')
is_expected.to contain_nova_config('cinder/catalog_info').with('value' => 'volumev2:cinderv2:publicURL')
@@ -96,6 +97,7 @@ describe 'nova' do
:notify_api_faults => true,
:report_interval => '60',
:os_region_name => 'MyRegion',
:use_ipv6 => true,
:upgrade_level_cells => '1.0.0',
:upgrade_level_cert => '1.0.0',
:upgrade_level_compute => '1.0.0',
@@ -157,6 +159,7 @@ describe 'nova' do
is_expected.to contain_nova_config('DEFAULT/notification_topics').with_value('openstack')
is_expected.to contain_nova_config('DEFAULT/notify_api_faults').with_value(true)
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')
end