From aaf348d11b08e55f13085b07e903f3b5ac7dae30 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 23 Jul 2024 19:12:57 +0900
Subject: [PATCH] Add support for [healthcheck] enable_by_file_paths

Depends-on: https://review.opendev.org/923648
Change-Id: Id0645628a0a8b7649412c63555d3f8b539d9348c
---
 manifests/healthcheck.pp                                   | 7 +++++++
 .../notes/hc-enable_by_file_paths-3705d815bd91d96e.yaml    | 5 +++++
 spec/classes/manila_healthcheck_spec.rb                    | 3 +++
 3 files changed, 15 insertions(+)
 create mode 100644 releasenotes/notes/hc-enable_by_file_paths-3705d815bd91d96e.yaml

diff --git a/manifests/healthcheck.pp b/manifests/healthcheck.pp
index cddf2293..909fbea5 100644
--- a/manifests/healthcheck.pp
+++ b/manifests/healthcheck.pp
@@ -32,6 +32,11 @@
 #   is running on a port. Expects a "port:path" list of strings.
 #   Defaults to $facts['os_service_default']
 #
+# [*enable_by_file_paths*]
+#   (Optional) Check the presence of files. Used by EnableByFilesHealthcheck
+#   plugin.
+#   Defaults to $facts['os_service_default']
+#
 class manila::healthcheck (
   $detailed                = $facts['os_service_default'],
   $backends                = $facts['os_service_default'],
@@ -39,6 +44,7 @@ class manila::healthcheck (
   $ignore_proxied_requests = $facts['os_service_default'],
   $disable_by_file_path    = $facts['os_service_default'],
   $disable_by_file_paths   = $facts['os_service_default'],
+  $enable_by_file_paths    = $facts['os_service_default'],
 ) {
 
   include manila::deps
@@ -50,5 +56,6 @@ class manila::healthcheck (
     ignore_proxied_requests => $ignore_proxied_requests,
     disable_by_file_path    => $disable_by_file_path,
     disable_by_file_paths   => $disable_by_file_paths,
+    enable_by_file_paths    => $enable_by_file_paths,
   }
 }
diff --git a/releasenotes/notes/hc-enable_by_file_paths-3705d815bd91d96e.yaml b/releasenotes/notes/hc-enable_by_file_paths-3705d815bd91d96e.yaml
new file mode 100644
index 00000000..89bcfac7
--- /dev/null
+++ b/releasenotes/notes/hc-enable_by_file_paths-3705d815bd91d96e.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``manila::healthcheck::enable_by_file_paths`` parameter has been
+    added.
diff --git a/spec/classes/manila_healthcheck_spec.rb b/spec/classes/manila_healthcheck_spec.rb
index 33a7be9a..39f2f135 100644
--- a/spec/classes/manila_healthcheck_spec.rb
+++ b/spec/classes/manila_healthcheck_spec.rb
@@ -17,6 +17,7 @@ describe 'manila::healthcheck' do
           :ignore_proxied_requests => '<SERVICE DEFAULT>',
           :disable_by_file_path    => '<SERVICE DEFAULT>',
           :disable_by_file_paths   => '<SERVICE DEFAULT>',
+          :enable_by_file_paths    => '<SERVICE DEFAULT>',
         )
       end
     end
@@ -30,6 +31,7 @@ describe 'manila::healthcheck' do
           :ignore_proxied_requests => false,
           :disable_by_file_path    => '/etc/manila/healthcheck/disabled',
           :disable_by_file_paths   => ['8786:/etc/manila/healthcheck/disabled'],
+          :enable_by_file_paths    => ['/etc/manila/healthcheck/enabled'],
         }
       end
 
@@ -41,6 +43,7 @@ describe 'manila::healthcheck' do
           :ignore_proxied_requests => false,
           :disable_by_file_path    => '/etc/manila/healthcheck/disabled',
           :disable_by_file_paths   => ['8786:/etc/manila/healthcheck/disabled'],
+          :enable_by_file_paths    => ['/etc/manila/healthcheck/enabled'],
         )
       end
     end