Skip to content

Commit

Permalink
SM-Heat: add heat HA params.
Browse files Browse the repository at this point in the history
Closes-Bug: #1626447

Fixes as per https://review.opencontrail.org/#/c/19415 for the case of
heat HA.

Change-Id: I6320d0cbd1cca851093fde6593f05848dff632fb
  • Loading branch information
Dheeraj Gautam committed Nov 2, 2016
1 parent 49e2d74 commit a383bf4
Showing 1 changed file with 20 additions and 0 deletions.
Expand Up @@ -29,13 +29,15 @@
$heat_api_cfn_bind_host = '0.0.0.0'
$heat_api_cfn_bind_port = '8001'
$heat_server_ip = $internal_vip
$database_idle_timeout = "180"
$keystone_db_conn = join(["mysql://heat:",$database_credentials,":33306/heat"],'')
} else {
$heat_api_bind_host = '0.0.0.0'
$heat_api_bind_port = '8004'
$heat_api_cfn_bind_host = '0.0.0.0'
$heat_api_cfn_bind_port = '8000'
$heat_server_ip = $host_control_ip
$database_idle_timeout = "3600"
$keystone_db_conn = join(["mysql://heat:",$database_credentials,"/heat"],'')
}

Expand All @@ -46,6 +48,7 @@

class { '::heat':
database_connection => $keystone_db_conn,
database_idle_timeout => $database_idle_timeout,
rabbit_hosts => $openstack_rabbit_servers,
rabbit_userid => $rabbitmq_user,
rabbit_password => $rabbitmq_password,
Expand Down Expand Up @@ -90,4 +93,21 @@
config_file => '/etc/heat/heat.conf',
lens_to_use => 'properties.lns',
}

if ($internal_vip != '' and $internal_vip != undef) {
heat_config {
'database/min_pool_size' : value => "100";
'database/max_pool_size' : value => "350";
'database/max_overflow' : value => "700";
'database/retry_interval' : value => "5";
'database/max_retries' : value => "-1";
'database/db_max_retries' : value => "3";
'database/db_retry_interval' : value => "1";
'database/connection_debug' : value => "10";
'database/pool_timeout' : value => "120";
'DEFAULT/rabbit_retry_interval' : value => "10";
'DEFAULT/rabbit_retry_backoff' : value => "5";
'DEFAULT/rabbit_max_retries' : value => "0";
}
}
}

0 comments on commit a383bf4

Please sign in to comment.