From 42c668545b3635660021ca9e342cea63e6328081 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 19 May 2023 10:43:16 +0900 Subject: [PATCH] Remove logic to look up removed parameters These lines should have been removed when we removed the deprecated image cache parameters from the nova::compute::libvirt class[1]. [1] 369f0509795e29a99a3e13bbd8257e8643bc2014 Change-Id: I41bc31e92119810ca7cd5c3a57179d932923072f (cherry picked from commit 04a8a01806447f67f1a46f8ffc77c5616f67b844) --- manifests/compute/image_cache.pp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/manifests/compute/image_cache.pp b/manifests/compute/image_cache.pp index 8065684e1..cc8a33619 100644 --- a/manifests/compute/image_cache.pp +++ b/manifests/compute/image_cache.pp @@ -40,24 +40,12 @@ class nova::compute::image_cache ( include nova::deps - $remove_unused_base_images_real = pick( - $::nova::compute::libvirt::remove_unused_base_images, - $remove_unused_base_images) - - $remove_unused_original_minimum_age_seconds_real = pick( - $::nova::compute::libvirt::remove_unused_original_minimum_age_seconds, - $remove_unused_original_minimum_age_seconds) - - $remove_unused_resized_minimum_age_seconds_real = pick( - $::nova::compute::libvirt::remove_unused_resized_minimum_age_seconds, - $remove_unused_resized_minimum_age_seconds) - nova_config { 'image_cache/manager_interval': value => $manager_interval; 'image_cache/subdirectory_name': value => $subdirectory_name; - 'image_cache/remove_unused_base_images': value => $remove_unused_base_images_real; - 'image_cache/remove_unused_original_minimum_age_seconds': value => $remove_unused_original_minimum_age_seconds_real; - 'image_cache/remove_unused_resized_minimum_age_seconds': value => $remove_unused_resized_minimum_age_seconds_real; + 'image_cache/remove_unused_base_images': value => $remove_unused_base_images; + 'image_cache/remove_unused_original_minimum_age_seconds': value => $remove_unused_original_minimum_age_seconds; + 'image_cache/remove_unused_resized_minimum_age_seconds': value => $remove_unused_resized_minimum_age_seconds; 'image_cache/precache_concurrency': value => $precache_concurrency; } }