From ebbbf82376dd836355a27a02ae8d996d33e58468 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sun, 24 Aug 2025 15:51:52 +0900
Subject: [PATCH] Add support for [DEFAULT] host option

Change-Id: I5233c4dab70ee84977d0548bc8335c7f5a072d70
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
---
 manifests/init.pp                             | 9 +++++++++
 releasenotes/notes/host-780fd141d87f69b5.yaml | 4 ++++
 spec/classes/octavia_init_spec.rb             | 9 ++++++---
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/host-780fd141d87f69b5.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index d446429e..03fa8143 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,6 +8,10 @@
 #   (optional) The state of aodh packages
 #   Defaults to 'present'
 #
+# [*host*]
+#   (optional) Name of this node.
+#   Defaults to $facts['os_service_default'].
+#
 # [*default_transport_url*]
 #    (optional) A URL representing the messaging driver to use and its full
 #    configuration. Transport URLs take the form:
@@ -184,6 +188,7 @@
 #
 class octavia (
   $package_ensure                     = 'present',
+  $host                               = $facts['os_service_default'],
   $default_transport_url              = $facts['os_service_default'],
   $rpc_response_timeout               = $facts['os_service_default'],
   $control_exchange                   = $facts['os_service_default'],
@@ -233,6 +238,10 @@ class octavia (
     purge => $purge_config,
   }
 
+  octavia_config {
+    'DEFAULT/host' : value => $host;
+  }
+
   oslo::messaging::rabbit { 'octavia_config':
     rabbit_ha_queues                => $rabbit_ha_queues,
     heartbeat_timeout_threshold     => $rabbit_heartbeat_timeout_threshold,
diff --git a/releasenotes/notes/host-780fd141d87f69b5.yaml b/releasenotes/notes/host-780fd141d87f69b5.yaml
new file mode 100644
index 00000000..2c4ad4b9
--- /dev/null
+++ b/releasenotes/notes/host-780fd141d87f69b5.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``octavia::host`` parameter has been added.
diff --git a/spec/classes/octavia_init_spec.rb b/spec/classes/octavia_init_spec.rb
index c78d1b7e..85a6c5a0 100644
--- a/spec/classes/octavia_init_spec.rb
+++ b/spec/classes/octavia_init_spec.rb
@@ -67,15 +67,17 @@ describe 'octavia' do
           :retry         => '<SERVICE DEFAULT>',
         )
       end
-    end
 
-    it 'has default RPC topic' do
-      is_expected.to contain_octavia_config('oslo_messaging/topic').with_value('octavia-rpc')
+      it 'configures defaults' do
+        is_expected.to contain_octavia_config('DEFAULT/host').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_octavia_config('oslo_messaging/topic').with_value('octavia-rpc')
+      end
     end
 
     context 'with overridden parameters' do
       let :params do
         {
+          :host                               => 'localhost',
           :default_transport_url              => 'rabbit://rabbit_user:password@localhost:5673',
           :rpc_response_timeout               => '120',
           :control_exchange                   => 'octavia',
@@ -150,6 +152,7 @@ describe 'octavia' do
       end
 
       it 'configures various things' do
+        is_expected.to contain_octavia_config('DEFAULT/host').with_value('localhost')
         is_expected.to contain_octavia_config('oslo_messaging/topic').with_value('oct-rpc')
       end
     end