diff --git a/manifests/compute.pp b/manifests/compute.pp index 225d80dca..66779fd1a 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -278,10 +278,6 @@ # [ { "vendor_id" => "1234","product_id" => "5678" }, # { "vendor_id" => "4321","product_id" => "8765", "physical_network" => "default" } ] # -# [*verify_glance_signatures*] -# (optional) Whether to verify image signatures. (boolean value) -# Defaults to undef -# # [*keymgr_backend*] # (optional) Key Manager service class. # Example of valid value: castellan.key_manager.barbican_key_manager.BarbicanKeyManager @@ -354,7 +350,6 @@ class nova::compute ( # DEPRECATED PARAMETERS $vcpu_pin_set = undef, $pci_passthrough = undef, - $verify_glance_signatures = undef, $keymgr_backend = undef, $barbican_auth_endpoint = undef, $barbican_endpoint = undef, @@ -388,14 +383,6 @@ class nova::compute ( warning('vcpu_pin_set is deprecated, instead use cpu_dedicated_set or cpu_shared_set.') } - if $verify_glance_signatures != undef { - # NOTE(tkajinam): If nova::glance is defined first and the deployment doesn't use hieradata - # it doesn't pick up this value correctly and unset the parameter. - # However we'd avoid hard failure here and just leave warning. - warning('verify_glance_signatures is deprecated. Use the same parameter in nova::glance') - } - include nova::glance - if empty($vcpu_pin_set) { $vcpu_pin_set_real = undef } else { diff --git a/manifests/glance.pp b/manifests/glance.pp index 5a2fc5be7..3bc953404 100644 --- a/manifests/glance.pp +++ b/manifests/glance.pp @@ -57,15 +57,11 @@ class nova::glance ( include nova::deps - $endpoint_override_real = pick($::nova::glance_endpoint_override, $endpoint_override) - $num_retries_real = pick($::nova::glance_num_retries, $num_retries) - $verify_glance_signatures_real = pick($::nova::compute::verify_glance_signatures, $verify_glance_signatures) - nova_config { - 'glance/endpoint_override': value => $endpoint_override_real; + 'glance/endpoint_override': value => $endpoint_override; 'glance/valid_interfaces': value => join(any2array($valid_interfaces), ','); - 'glance/num_retries': value => $num_retries_real; - 'glance/verify_glance_signatures': value => $verify_glance_signatures_real; + 'glance/num_retries': value => $num_retries; + 'glance/verify_glance_signatures': value => $verify_glance_signatures; 'glance/enable_rbd_download': value => $enable_rbd_download; 'glance/rbd_user': value => $rbd_user; 'glance/rbd_connect_timeout': value => $rbd_connect_timeout; diff --git a/manifests/init.pp b/manifests/init.pp index e7c388fc0..4fc99752c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -392,14 +392,6 @@ # (Optional) Accept clients using either SSL or plain TCP # Defaults to undef. # -# [*glance_endpoint_override*] -# (optional) Override the endpoint to use to talk to Glance. -# Defaults to undef. -# -# [*glance_num_retries*] -# (optional) Number of retries in glance operation -# Defaults to undef. -# # [*block_device_allocate_retries*] # (optional) Number of times to retry block device allocation on failures # Defaults to undef. @@ -492,8 +484,6 @@ class nova( $cinder_catalog_info = undef, $upgrade_level_console = undef, $amqp_allow_insecure_clients = undef, - $glance_endpoint_override = undef, - $glance_num_retries = undef, $block_device_allocate_retries = undef, $block_device_allocate_retries_interval = undef, ) inherits nova::params { @@ -526,16 +516,6 @@ in a future release. Use nova::cinder::catalog_info instead') no effect.') } - if $glance_endpoint_override != undef { - warning('The glance_endpoint_override parameter is deprecated. \ -Use nova::glance::endpoint_override instead.') - } - - if $glance_num_retries != undef { - warning('The glance_num_retries parameter is deprecated. \ -Use nova::glance::num_retries instead.') - } - if $block_device_allocate_retries != undef { warning('The block_device_allocate_retries parameter is deprecated. \ Use nova::compute::block_device_allocate_retries instead') @@ -764,7 +744,4 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.") 'upgrade_levels/network': value => $upgrade_level_network; 'upgrade_levels/scheduler': value => $upgrade_level_scheduler; } - - # TODO(tkajinam): Remove this when we remove the deprecated glance_* options - include nova::glance } diff --git a/releasenotes/notes/glance-opts-cleanup-47de15f1bcd3a1b3.yaml b/releasenotes/notes/glance-opts-cleanup-47de15f1bcd3a1b3.yaml new file mode 100644 index 000000000..f98519fae --- /dev/null +++ b/releasenotes/notes/glance-opts-cleanup-47de15f1bcd3a1b3.yaml @@ -0,0 +1,10 @@ +--- +features: + - | + The following parameters were removed. Use the ``nova::glance`` class + instead. + + - ``nova::compute::verify_glance_signatures`` + - ``nova::glance_endpoint_override`` + - ``nova::glance_endpoint_override`` + - ``nova::glance_num_retries`` diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb index a1d8d9f06..872ce86be 100644 --- a/spec/classes/nova_init_spec.rb +++ b/spec/classes/nova_init_spec.rb @@ -80,8 +80,6 @@ describe 'nova' do end it 'configures various things' do - is_expected.to contain_nova_config('glance/endpoint_override').with_value('') - is_expected.to contain_nova_config('glance/num_retries').with_value('') is_expected.to contain_nova_config('DEFAULT/state_path').with_value('/var/lib/nova') is_expected.to contain_oslo__concurrency('nova_config').with( :lock_path => platform_params[:lock_path] @@ -112,8 +110,6 @@ describe 'nova' do let :params do { - :glance_endpoint_override => 'http://localhost:9292', - :glance_num_retries => 3, :default_transport_url => 'rabbit://rabbit_user:password@localhost:5673', :rpc_response_timeout => '30', :long_rpc_timeout => '1800', @@ -184,11 +180,6 @@ describe 'nova' do }) end - it 'configures glance parameters' do - is_expected.to contain_nova_config('glance/endpoint_override').with_value('http://localhost:9292') - is_expected.to contain_nova_config('glance/num_retries').with_value(3) - end - it 'configures auth_strategy' do is_expected.to contain_nova_config('api/auth_strategy').with_value('foo') end