From dd731f5d600ac15c1e74068cb267e5421ddd53c5 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 20 Apr 2021 23:48:46 +0900
Subject: [PATCH] Add support for healthcheck middleware options

Depends-on: https://review.opendev.org/772202
Change-Id: If0aa39e31bd59a0a14c24f4835a2c355305798b3
---
 manifests/healthcheck.pp                      | 41 ++++++++++++++
 .../notes/healthcheck-902378a7b8bf405f.yaml   |  5 ++
 spec/classes/glance_healthcheck_spec.rb       | 55 +++++++++++++++++++
 3 files changed, 101 insertions(+)
 create mode 100644 manifests/healthcheck.pp
 create mode 100644 releasenotes/notes/healthcheck-902378a7b8bf405f.yaml
 create mode 100644 spec/classes/glance_healthcheck_spec.rb

diff --git a/manifests/healthcheck.pp b/manifests/healthcheck.pp
new file mode 100644
index 00000000..d8b66dc6
--- /dev/null
+++ b/manifests/healthcheck.pp
@@ -0,0 +1,41 @@
+# == Class: glance::healthcheck
+#
+# Configure oslo_middleware options in healthcheck section
+#
+# == Params
+#
+# [*detailed*]
+#   (Optional) Show more detailed information as part of the response.
+#   Defaults to $::os_service_default
+#
+# [*backends*]
+#   (Optional) Additional backends that can perform health checks and report
+#   that information back as part of a request.
+#   Defaults to $::os_service_default
+#
+# [*disable_by_file_path*]
+#   (Optional) Check the presense of a file to determine if an application
+#   is running on a port.
+#   Defaults to $::os_service_default
+#
+# [*disable_by_file_paths*]
+#   (Optional) Check the presense of a file to determine if an application
+#   is running on a port. Expects a "port:path" list of strings.
+#   Defaults to $::os_service_default
+#
+class glance::healthcheck (
+  $detailed              = $::os_service_default,
+  $backends              = $::os_service_default,
+  $disable_by_file_path  = $::os_service_default,
+  $disable_by_file_paths = $::os_service_default,
+) {
+
+  include glance::deps
+
+  oslo::healthcheck { 'glance_api_config':
+    detailed              => $detailed,
+    backends              => $backends,
+    disable_by_file_path  => $disable_by_file_path,
+    disable_by_file_paths => $disable_by_file_paths,
+  }
+}
diff --git a/releasenotes/notes/healthcheck-902378a7b8bf405f.yaml b/releasenotes/notes/healthcheck-902378a7b8bf405f.yaml
new file mode 100644
index 00000000..e1fff399
--- /dev/null
+++ b/releasenotes/notes/healthcheck-902378a7b8bf405f.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``glance::healthcheck`` class has been added. This class manages
+    parameters of healthcheck middlware in oslo.middleware.
diff --git a/spec/classes/glance_healthcheck_spec.rb b/spec/classes/glance_healthcheck_spec.rb
new file mode 100644
index 00000000..bae6b4b0
--- /dev/null
+++ b/spec/classes/glance_healthcheck_spec.rb
@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe 'glance::healthcheck' do
+
+  shared_examples_for 'glance::healthcheck' do
+
+    context 'with default parameters' do
+      let :params do
+        {}
+      end
+
+      it 'configures default values' do
+        is_expected.to contain_oslo__healthcheck('glance_api_config').with(
+          :detailed              => '<SERVICE DEFAULT>',
+          :backends              => '<SERVICE DEFAULT>',
+          :disable_by_file_path  => '<SERVICE DEFAULT>',
+          :disable_by_file_paths => '<SERVICE DEFAULT>',
+        )
+      end
+    end
+
+    context 'with specific parameters' do
+      let :params do
+        {
+          :detailed              => true,
+          :backends              => ['disable_by_file'],
+          :disable_by_file_path  => '/etc/glance/healthcheck/disabled',
+          :disable_by_file_paths => ['9292:/etc/glance/healthcheck/disabled'],
+        }
+      end
+
+      it 'configures specified values' do
+        is_expected.to contain_oslo__healthcheck('glance_api_config').with(
+          :detailed              => true,
+          :backends              => ['disable_by_file'],
+          :disable_by_file_path  => '/etc/glance/healthcheck/disabled',
+          :disable_by_file_paths => ['9292:/etc/glance/healthcheck/disabled'],
+        )
+      end
+    end
+  end
+
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts())
+      end
+
+      it_configures 'glance::healthcheck'
+    end
+  end
+
+end