From 5ddeac53c0a93754b8a2f054bc7feccff3d54665 Mon Sep 17 00:00:00 2001
From: Tom Weininger <tweining@redhat.com>
Date: Tue, 17 May 2022 11:56:32 +0200
Subject: [PATCH] Set amphora timezone based on TimeZone setting

Use the global TimeZone parameter in order to configure the timezone of
the amphora.

Depends-On: https://review.opendev.org/c/openstack/octavia/+/839937
Depends-On: https://review.opendev.org/c/openstack/puppet-octavia/+/842079
Change-Id: I0fa188e4492f852ac1097d69c913f116ae96bb52
---
 deployment/octavia/octavia-base.yaml                         | 5 +++++
 .../notes/set-amphora-timezone-d62de55c993c5d70.yaml         | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 releasenotes/notes/set-amphora-timezone-d62de55c993c5d70.yaml

diff --git a/deployment/octavia/octavia-base.yaml b/deployment/octavia/octavia-base.yaml
index c339ceebd8..202113f515 100644
--- a/deployment/octavia/octavia-base.yaml
+++ b/deployment/octavia/octavia-base.yaml
@@ -120,6 +120,10 @@ parameters:
     type: string
     default: 'octavia-ssh-key'
     description: SSH key name.
+  TimeZone:
+    default: 'UTC'
+    description: The timezone to be set on the overcloud.
+    type: string
   OctaviaLoadBalancerTopology:
     default: ''
     description: Load balancer topology configuration.
@@ -280,6 +284,7 @@ outputs:
         octavia::controller::amp_flavor_id: {get_param: OctaviaFlavorId}
         octavia::controller::amp_image_tag: {get_param: OctaviaAmphoraImageTag}
         octavia::controller::amp_ssh_key_name: {get_param: OctaviaAmphoraSshKeyName}
+        octavia::controller::amp_timezone: {get_param: TimeZone}
         octavia::controller::enable_ssh_access: true
         octavia::controller::timeout_client_data: {get_param: OctaviaTimeoutClientData}
         octavia::controller::timeout_member_connect: {get_param: OctaviaTimeoutMemberConnect}
diff --git a/releasenotes/notes/set-amphora-timezone-d62de55c993c5d70.yaml b/releasenotes/notes/set-amphora-timezone-d62de55c993c5d70.yaml
new file mode 100644
index 0000000000..e199e7bfdf
--- /dev/null
+++ b/releasenotes/notes/set-amphora-timezone-d62de55c993c5d70.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The TimeZone parameter gets used for configuring the Octavia amphora
+    timezone now.