diff --git a/manifests/glance.pp b/manifests/glance.pp index 6a0dae5c9..56e6d1edb 100644 --- a/manifests/glance.pp +++ b/manifests/glance.pp @@ -8,6 +8,10 @@ # (optional) Override the endpoint to use to talk to Glance. # Defaults to $::os_service_default # +# [*valid_interfaces*] +# (optional) List of interfaces, in order of preference. +# Defaults to $::os_service_default +# # [*num_retries*] # (optional) Number of retries in glance operation # Defaults to $::os_service_default @@ -37,6 +41,7 @@ # class nova::glance ( $endpoint_override = $::os_service_default, + $valid_interfaces = $::os_service_default, $num_retries = $::os_service_default, $enable_rbd_download = $::os_service_default, $rbd_user = $::os_service_default, @@ -52,6 +57,7 @@ class nova::glance ( nova_config { 'glance/endpoint_override': value => $endpoint_override_real; + 'glance/valid_interfaces': value => join(any2array($valid_interfaces), ','); 'glance/num_retries': value => $num_retries_real; 'glance/enable_rbd_download': value => $enable_rbd_download; 'glance/rbd_user': value => $rbd_user; diff --git a/releasenotes/notes/add-nova-glance-valid_interfaces-ff6d123e075f7aee.yaml b/releasenotes/notes/add-nova-glance-valid_interfaces-ff6d123e075f7aee.yaml new file mode 100644 index 000000000..fb678458c --- /dev/null +++ b/releasenotes/notes/add-nova-glance-valid_interfaces-ff6d123e075f7aee.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Added parameter valid_interfaces to nova::glance class. diff --git a/spec/classes/nova_glance_spec.rb b/spec/classes/nova_glance_spec.rb index b7366a970..861534c65 100644 --- a/spec/classes/nova_glance_spec.rb +++ b/spec/classes/nova_glance_spec.rb @@ -10,6 +10,7 @@ describe 'nova::glance' do it 'configure default params' do is_expected.to contain_nova_config('glance/endpoint_override').with_value('') + is_expected.to contain_nova_config('glance/valid_interfaces').with_value('') is_expected.to contain_nova_config('glance/num_retries').with_value('') is_expected.to contain_nova_config('glance/enable_rbd_download').with_value('') is_expected.to contain_nova_config('glance/rbd_user').with_value('') @@ -23,6 +24,7 @@ describe 'nova::glance' do let :params do { :endpoint_override => 'http://localhost:9292', + :valid_interfaces => 'internal', :num_retries => 3, :enable_rbd_download => true, :rbd_user => 'nova', @@ -34,6 +36,7 @@ describe 'nova::glance' do it 'configure glance params' do is_expected.to contain_nova_config('glance/endpoint_override').with_value('http://localhost:9292') + is_expected.to contain_nova_config('glance/valid_interfaces').with_value('internal') is_expected.to contain_nova_config('glance/num_retries').with_value(3) is_expected.to contain_nova_config('glance/enable_rbd_download').with_value(true) is_expected.to contain_nova_config('glance/rbd_user').with_value('nova')