From af4cd544baec379b037931393a7d9e64e5ad1230 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sat, 26 Oct 2024 01:16:16 +0900
Subject: [PATCH] Heat: Switch to httpd + mod_wsgi

Change-Id: I69310262140d4ddfec16737c84be7883082e7e03
---
 .../puppet/modules/packstack/manifests/heat.pp     | 14 +++++++++++---
 .../puppet/modules/packstack/manifests/heat/cfn.pp | 11 ++++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/packstack/puppet/modules/packstack/manifests/heat.pp b/packstack/puppet/modules/packstack/manifests/heat.pp
index c2ae16dfb..fe02ee477 100644
--- a/packstack/puppet/modules/packstack/manifests/heat.pp
+++ b/packstack/puppet/modules/packstack/manifests/heat.pp
@@ -2,11 +2,19 @@ class packstack::heat ()
 {
     create_resources(packstack::firewall, lookup('FIREWALL_HEAT_RULES', undef, undef, {}))
 
-    class { 'heat::api':
-      workers => lookup('CONFIG_SERVICE_WORKERS'),
+    $bind_host = lookup('CONFIG_IP_VERSION') ? {
+      'ipv6'  => '::0',
+      default => '0.0.0.0',
+    }
+
+    class { 'heat::api':
+      service_name => 'httpd',
+    }
+    class { 'heat::wsgi::apache_api':
+      bind_host => $bind_host,
+      workers   => lookup('CONFIG_SERVICE_WORKERS'),
     }
 
-    $keystone_admin = lookup('CONFIG_KEYSTONE_ADMIN_USERNAME')
     $heat_cfg_ctrl_host = lookup('CONFIG_KEYSTONE_HOST_URL')
 
     class { 'heat::engine':
diff --git a/packstack/puppet/modules/packstack/manifests/heat/cfn.pp b/packstack/puppet/modules/packstack/manifests/heat/cfn.pp
index 6040867d6..94608220f 100644
--- a/packstack/puppet/modules/packstack/manifests/heat/cfn.pp
+++ b/packstack/puppet/modules/packstack/manifests/heat/cfn.pp
@@ -2,8 +2,17 @@ class packstack::heat::cfn ()
 {
     create_resources(packstack::firewall, lookup('FIREWALL_HEAT_CFN_RULES', undef, undef, {}))
 
+    $bind_host = lookup('CONFIG_IP_VERSION') ? {
+      'ipv6'  => '::0',
+      default => '0.0.0.0',
+    }
+
     class { 'heat::api_cfn':
-      workers => lookup('CONFIG_SERVICE_WORKERS'),
+      service_name => 'httpd',
+    }
+    class { 'heat::wsgi::apache_api_cfn':
+      bind_host => $bind_host,
+      workers   => lookup('CONFIG_SERVICE_WORKERS'),
     }
 
     $heat_cfn_cfg_ctrl_host = lookup('CONFIG_KEYSTONE_HOST_URL')