From 6d4db262113b2ed884fb6b94eaea02509d93de61 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Sun, 30 Oct 2016 17:44:42 +0800 Subject: [PATCH] Fix group of the use_ipv6 option Option "use_ipv6" from group "DEFAULT" is deprecated. Use option "use_ipv6" from group "os_vif_linux_bridge" instead. Change-Id: Iff8360e7264dbe5056fd65e84aa77cb8c7c223f2 --- manifests/init.pp | 2 +- spec/classes/nova_init_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 6ccfe123e..c613a77be 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -731,13 +731,13 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.") nova_config { 'cinder/catalog_info': value => $cinder_catalog_info; + 'os_vif_linux_bridge/use_ipv6': value => $use_ipv6; 'DEFAULT/notify_api_faults': value => $notify_api_faults; # Following may need to be broken out to different nova services 'DEFAULT/state_path': value => $state_path; '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; 'DEFAULT/block_device_allocate_retries': value => $block_device_allocate_retries; 'DEFAULT/block_device_allocate_retries_interval': value => $block_device_allocate_retries_interval; } diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb index d16ec72d0..a487b821b 100644 --- a/spec/classes/nova_init_spec.rb +++ b/spec/classes/nova_init_spec.rb @@ -58,7 +58,7 @@ describe 'nova' do is_expected.to contain_nova_config('DEFAULT/service_down_time').with_value('60') 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('os_vif_linux_bridge/use_ipv6').with_value('') is_expected.to contain_nova_config('DEFAULT/transport_url').with_value('') is_expected.to contain_nova_config('DEFAULT/rpc_response_timeout').with_value('') is_expected.to contain_nova_config('cinder/os_region_name').with_value('') @@ -177,7 +177,7 @@ describe 'nova' do is_expected.to contain_nova_config('oslo_messaging_notifications/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('os_vif_linux_bridge/use_ipv6').with_value('true') is_expected.to contain_nova_config('cinder/os_region_name').with_value('MyRegion') end