x/packstack
Code Issues Proposed changes

Merge "Heat: Switch to httpd + mod_wsgi"

Browse Source
This commit is contained in:
Zuul 2024-10-30 08:15:19 +00:00 committed by Gerrit Code Review
commit 81df32e223
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packstack/puppet/modules/packstack/manifests/heat.pp
View File

@ -2,11 +2,19 @@ class packstack::heat ()
{ {
create_resources(packstack::firewall, lookup('FIREWALL_HEAT_RULES', undef, undef, {})) create_resources(packstack::firewall, lookup('FIREWALL_HEAT_RULES', undef, undef, {}))
class { 'heat::api': $bind_host = lookup('CONFIG_IP_VERSION') ? {
workers => lookup('CONFIG_SERVICE_WORKERS'), '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') $heat_cfg_ctrl_host = lookup('CONFIG_KEYSTONE_HOST_URL')
class { 'heat::engine': class { 'heat::engine':

11
packstack/puppet/modules/packstack/manifests/heat/cfn.pp
View File

@ -2,8 +2,17 @@ class packstack::heat::cfn ()
{ {
create_resources(packstack::firewall, lookup('FIREWALL_HEAT_CFN_RULES', undef, undef, {})) 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': 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') $heat_cfn_cfg_ctrl_host = lookup('CONFIG_KEYSTONE_HOST_URL')