99ad7e2dde
Key moments:
* Fix lint errors
* Remove duplication of package->service dependencies
* Workoaround for MySQL module
* Fix name for heat-engine service in heat_ha class
* Remove heat_config options from osnailyfacter class
* Configure delegated roles from heat class
* Add retries to heat domain creation command
commit I2fbb97adde6743153fc81f8dba153356c382cb52
* Add retry to heat_domain_id
commit: I1630f54cdfa850a6b4dcbc9b714ebc6195de1fb0
* Update in heat_domain_id_setter
commit: I4c0df7600e10d57429eda854cd8aa6208e1c6539
* Add noop tests for new parameters
Implements: blueprint upgrade-openstack-puppet-modules
Change-Id: Ib9fa8acc54c124f8656d49accbdbbf733f2d3fd3
148 lines
5.3 KiB
Puppet
148 lines
5.3 KiB
Puppet
notice('MODULAR: heat.pp')
|
|
|
|
$controller_node_public = hiera('controller_node_public')
|
|
$controller_node_address = hiera('controller_node_address')
|
|
$management_vip = hiera('management_vip')
|
|
$heat_hash = hiera_hash('heat', {})
|
|
$amqp_hosts = hiera('amqp_hosts')
|
|
$rabbit_hash = hiera_hash('rabbit_hash', {})
|
|
$max_retries = hiera('max_retries')
|
|
$max_pool_size = hiera('max_pool_size')
|
|
$max_overflow = hiera('max_overflow')
|
|
$idle_timeout = hiera('idle_timeout')
|
|
$service_endpoint = hiera('service_endpoint', $management_vip)
|
|
$debug = hiera('debug', false)
|
|
$verbose = hiera('verbose', true)
|
|
$use_syslog = hiera('use_syslog', true)
|
|
$syslog_log_facility_heat = hiera('syslog_log_facility_heat')
|
|
$deployment_mode = hiera('deployment_mode')
|
|
$internal_address = hiera('internal_address')
|
|
$database_password = $heat_hash['db_password']
|
|
$keystone_user = pick($heat_hash['user'], 'heat')
|
|
$keystone_tenant = pick($heat_hash['tenant'], 'services')
|
|
$db_host = pick($heat_hash['db_host'], $management_vip)
|
|
$database_user = pick($heat_hash['db_user'], 'heat')
|
|
$database_name = hiera('heat_db_name', 'heat')
|
|
$read_timeout = '60'
|
|
$sql_connection = "mysql://${database_user}:${database_password}@${db_host}/${database_name}?read_timeout=${read_timeout}"
|
|
$region = hiera('region', 'RegionOne')
|
|
|
|
####### Disable upstart startup on install #######
|
|
if $::operatingsystem == 'Ubuntu' {
|
|
tweaks::ubuntu_service_override { 'heat-api-cloudwatch':
|
|
package_name => 'heat-api-cloudwatch',
|
|
}
|
|
tweaks::ubuntu_service_override { 'heat-api-cfn':
|
|
package_name => 'heat-api-cfn',
|
|
}
|
|
tweaks::ubuntu_service_override { 'heat-api':
|
|
package_name => 'heat-api',
|
|
}
|
|
tweaks::ubuntu_service_override { 'heat-engine':
|
|
package_name => 'heat-engine',
|
|
}
|
|
|
|
tweaks::ubuntu_service_override['heat-api'] -> Service['heat-api']
|
|
tweaks::ubuntu_service_override['heat-api-cfn'] -> Service['heat-api-cfn']
|
|
tweaks::ubuntu_service_override['heat-api-cloudwatch'] -> Service['heat-api-cloudwatch']
|
|
tweaks::ubuntu_service_override['heat-engine'] -> Service['heat-engine']
|
|
}
|
|
|
|
class { 'openstack::heat' :
|
|
external_ip => $controller_node_public,
|
|
keystone_auth => pick($heat_hash['keystone_auth'], true),
|
|
api_bind_host => $internal_address,
|
|
api_cfn_bind_host => $internal_address,
|
|
api_cloudwatch_bind_host => $internal_address,
|
|
|
|
keystone_host => $service_endpoint,
|
|
keystone_user => $keystone_user,
|
|
keystone_password => $heat_hash['user_password'],
|
|
keystone_tenant => $keystone_tenant,
|
|
keystone_ec2_uri => "http://${service_endpoint}:5000/v2.0",
|
|
region => $region,
|
|
|
|
rpc_backend => 'heat.openstack.common.rpc.impl_kombu',
|
|
amqp_hosts => split($amqp_hosts, ','),
|
|
amqp_user => $rabbit_hash['user'],
|
|
amqp_password => $rabbit_hash['password'],
|
|
|
|
sql_connection => $sql_connection,
|
|
db_host => $db_host,
|
|
db_password => $database_password,
|
|
max_retries => $max_retries,
|
|
max_pool_size => $max_pool_size,
|
|
max_overflow => $max_overflow,
|
|
idle_timeout => $idle_timeout,
|
|
|
|
debug => $debug,
|
|
verbose => $verbose,
|
|
use_syslog => $use_syslog,
|
|
syslog_log_facility => $syslog_log_facility_heat,
|
|
|
|
auth_encryption_key => $heat_hash['auth_encryption_key'],
|
|
}
|
|
|
|
if hiera('heat_ha_engine', true){
|
|
if ($deployment_mode == 'ha') or ($deployment_mode == 'ha_compact') {
|
|
include heat_ha::engine
|
|
}
|
|
}
|
|
|
|
#------------------------------
|
|
|
|
class heat::docker_resource (
|
|
$enabled = true,
|
|
$package_name = 'heat-docker',
|
|
) {
|
|
if $enabled {
|
|
package { 'heat-docker':
|
|
ensure => installed,
|
|
name => $package_name,
|
|
}
|
|
|
|
Package['heat-docker'] ~> Service<| title == 'heat-engine' |>
|
|
}
|
|
}
|
|
|
|
if $::osfamily == 'RedHat' {
|
|
$docker_resource_package_name = 'openstack-heat-docker'
|
|
} elsif $::osfamily == 'Debian' {
|
|
$docker_resource_package_name = 'heat-docker'
|
|
}
|
|
|
|
class { 'heat::docker_resource' :
|
|
package_name => $docker_resource_package_name,
|
|
}
|
|
|
|
class { 'heat::keystone::domain' :
|
|
auth_url => "http://${service_endpoint}:35357/v2.0",
|
|
keystone_admin => $keystone_user,
|
|
keystone_password => $heat_hash['user_password'],
|
|
keystone_tenant => $keystone_tenant,
|
|
domain_name => 'heat',
|
|
domain_admin => 'heat_admin',
|
|
domain_password => $heat_hash['user_password'],
|
|
}
|
|
|
|
Class['heat'] -> Class['heat::keystone::domain'] ~> Service<| title == 'heat-engine' |>
|
|
|
|
######################
|
|
|
|
exec { 'wait_for_heat_config' :
|
|
command => 'sync && sleep 3',
|
|
provider => 'shell',
|
|
}
|
|
|
|
Heat_config <||> -> Exec['wait_for_heat_config'] -> Service['heat-api']
|
|
Heat_config <||> -> Exec['wait_for_heat_config'] -> Service['heat-api-cfn']
|
|
Heat_config <||> -> Exec['wait_for_heat_config'] -> Service['heat-api-cloudwatch']
|
|
Heat_config <||> -> Exec['wait_for_heat_config'] -> Service['heat-engine']
|
|
|
|
######################
|
|
|
|
class mysql::server {}
|
|
class mysql::config {}
|
|
include mysql::server
|
|
include mysql::config
|