Merge "Heat: Switch to httpd + mod_wsgi"
This commit is contained in:
commit
81df32e223
@ -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':
|
||||
|
@ -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')
|
||||
|
Loading…
Reference in New Issue
Block a user