openstack
/
puppet-heat
Code Issues Proposed changes

Deprecate classes with hyphens 

Puppet does not recommend the use of hyphens in class names.

This change deprecates classes with hypens and inform the users
to use the new ones. Backward compatibility is preserved.

Change-Id: Ib4ce5ec3f9354d77397d97500811ccac2a0ff395
This commit is contained in:
Mathieu Gagné 2013-08-28 14:23:36 -04:00
parent 4a972180be
commit 08a1141f16
5 changed files with 162 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
manifests/api-cfn.pp
View File

@ -1,5 +1,5 @@
# Installs & configure the heat CloudFormation API service
#
class heat::api-cfn (
$enabled = true,
$keystone_host = '127.0.0.1',
@ -16,49 +16,21 @@ class heat::api-cfn (
$debug = false,
) {
include heat::params
warning('heat::api-cfn is deprecated. Use heat::api_cfn instead.')
validate_string($keystone_password)
Heat_config<||> ~> Service['heat-api-cfn']
Package['heat-api-cfn'] -> Heat_config<||>
Package['heat-api-cfn'] -> Service['heat-api-cfn']
package { 'heat-api-cfn':
ensure => installed,
name => $::heat::params::api_cfn_package_name,
}
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
Package['heat-common'] -> Service['heat-api-cfn']
service { 'heat-api-cfn':
ensure => $service_ensure,
name => $::heat::params::api_cfn_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
require => Class['heat::db'],
}
heat_config {
'DEFAULT/debug' : value => $debug;
'DEFAULT/verbose' : value => $verbose;
'DEFAULT/log_dir' : value => $::heat::params::log_dir;
'DEFAULT/bind_host' : value => $bind_host;
'DEFAULT/bind_port' : value => $bind_port;
'ec2authtoken/keystone_ec2_uri' : value => $keystone_ec2_uri;
'ec2authtoken/auth_uri' : value => $auth_uri;
'keystone_authtoken/auth_host' : value => $keystone_host;
'keystone_authtoken/auth_port' : value => $keystone_port;
'keystone_authtoken/auth_protocol' : value => $keystone_protocol;
'keystone_authtoken/admin_tenant_name' : value => $keystone_tenant;
'keystone_authtoken/admin_user' : value => $keystone_user;
'keystone_authtoken/admin_password' : value => $keystone_password;
class { 'heat::api_cfn':
enabled => $enabled,
keystone_host => $keystone_host,
keystone_port => $keystone_port,
keystone_protocol => $keystone_protocol,
keystone_user => $keystone_user,
keystone_tenant => $keystone_tenant,
keystone_password => $keystone_password,
keystone_ec2_uri => $keystone_ec2_uri,
auth_uri => $auth_uri,
bind_host => $bind_host,
bind_port => $bind_port,
verbose => $verbose,
debug => $debug,
}
}

60
manifests/api-cloudwatch.pp
View File

@ -1,5 +1,5 @@
# Installs & configure the heat CloudWatch API service
#
class heat::api-cloudwatch (
$enabled = true,
$keystone_host = '127.0.0.1',
@ -16,49 +16,21 @@ class heat::api-cloudwatch (
$debug = false,
) {
include heat::params
warning('heat::api-cloudwatch is deprecated. Use heat::api_cloudwatch instead.')
validate_string($keystone_password)
Heat_config<||> ~> Service['heat-api-cloudwatch']
Package['heat-api-cloudwatch'] -> Heat_config<||>
Package['heat-api-cloudwatch'] -> Service['heat-api-cloudwatch']
package { 'heat-api-cloudwatch':
ensure => installed,
name => $::heat::params::api_cloudwatch_package_name,
}
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
Package['heat-common'] -> Service['heat-api-cloudwatch']
service { 'heat-api-cloudwatch':
ensure => $service_ensure,
name => $::heat::params::api_cloudwatch_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
require => Class['heat::db'],
}
heat_config {
'DEFAULT/debug' : value => $debug;
'DEFAULT/verbose' : value => $verbose;
'DEFAULT/log_dir' : value => $::heat::params::log_dir;
'DEFAULT/bind_host' : value => $bind_host;
'DEFAULT/bind_port' : value => $bind_port;
'ec2authtoken/keystone_ec2_uri' : value => $keystone_ec2_uri;
'ec2authtoken/auth_uri' : value => $auth_uri;
'keystone_authtoken/auth_host' : value => $keystone_host;
'keystone_authtoken/auth_port' : value => $keystone_port;
'keystone_authtoken/auth_protocol' : value => $keystone_protocol;
'keystone_authtoken/admin_tenant_name' : value => $keystone_tenant;
'keystone_authtoken/admin_user' : value => $keystone_user;
'keystone_authtoken/admin_password' : value => $keystone_password;
class { 'heat::api_cloudwatch':
enabled => $enabled,
keystone_host => $keystone_host,
keystone_port => $keystone_port,
keystone_protocol => $keystone_protocol,
keystone_user => $keystone_user,
keystone_tenant => $keystone_tenant,
keystone_password => $keystone_password,
keystone_ec2_uri => $keystone_ec2_uri,
auth_uri => $auth_uri,
bind_host => $bind_host,
bind_port => $bind_port,
verbose => $verbose,
debug => $debug,
}
}

64
manifests/api_cfn.pp Normal file
View File

@ -0,0 +1,64 @@
# Installs & configure the heat CloudFormation API service
#
class heat::api_cfn (
$enabled = true,
$keystone_host = '127.0.0.1',
$keystone_port = '35357',
$keystone_protocol = 'http',
$keystone_user = 'heat',
$keystone_tenant = 'services',
$keystone_password = false,
$keystone_ec2_uri = 'http://127.0.0.1:5000/v2.0/ec2tokens',
$auth_uri = 'http://127.0.0.1:5000/v2.0',
$bind_host = '0.0.0.0',
$bind_port = '8000',
$verbose = false,
$debug = false,
) {
include heat::params
validate_string($keystone_password)
Heat_config<||> ~> Service['heat-api-cfn']
Package['heat-api-cfn'] -> Heat_config<||>
Package['heat-api-cfn'] -> Service['heat-api-cfn']
package { 'heat-api-cfn':
ensure => installed,
name => $::heat::params::api_cfn_package_name,
}
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
Package['heat-common'] -> Service['heat-api-cfn']
service { 'heat-api-cfn':
ensure => $service_ensure,
name => $::heat::params::api_cfn_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
require => Class['heat::db'],
}
heat_config {
'DEFAULT/debug' : value => $debug;
'DEFAULT/verbose' : value => $verbose;
'DEFAULT/log_dir' : value => $::heat::params::log_dir;
'DEFAULT/bind_host' : value => $bind_host;
'DEFAULT/bind_port' : value => $bind_port;
'ec2authtoken/keystone_ec2_uri' : value => $keystone_ec2_uri;
'ec2authtoken/auth_uri' : value => $auth_uri;
'keystone_authtoken/auth_host' : value => $keystone_host;
'keystone_authtoken/auth_port' : value => $keystone_port;
'keystone_authtoken/auth_protocol' : value => $keystone_protocol;
'keystone_authtoken/admin_tenant_name' : value => $keystone_tenant;
'keystone_authtoken/admin_user' : value => $keystone_user;
'keystone_authtoken/admin_password' : value => $keystone_password;
}
}

64
manifests/api_cloudwatch.pp Normal file
View File

@ -0,0 +1,64 @@
# Installs & configure the heat CloudWatch API service
#
class heat::api_cloudwatch (
$enabled = true,
$keystone_host = '127.0.0.1',
$keystone_port = '35357',
$keystone_protocol = 'http',
$keystone_user = 'heat',
$keystone_tenant = 'services',
$keystone_password = false,
$keystone_ec2_uri = 'http://127.0.0.1:5000/v2.0/ec2tokens',
$auth_uri = 'http://127.0.0.1:5000/v2.0',
$bind_host = '0.0.0.0',
$bind_port = '8003',
$verbose = false,
$debug = false,
) {
include heat::params
validate_string($keystone_password)
Heat_config<||> ~> Service['heat-api-cloudwatch']
Package['heat-api-cloudwatch'] -> Heat_config<||>
Package['heat-api-cloudwatch'] -> Service['heat-api-cloudwatch']
package { 'heat-api-cloudwatch':
ensure => installed,
name => $::heat::params::api_cloudwatch_package_name,
}
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
Package['heat-common'] -> Service['heat-api-cloudwatch']
service { 'heat-api-cloudwatch':
ensure => $service_ensure,
name => $::heat::params::api_cloudwatch_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
require => Class['heat::db'],
}
heat_config {
'DEFAULT/debug' : value => $debug;
'DEFAULT/verbose' : value => $verbose;
'DEFAULT/log_dir' : value => $::heat::params::log_dir;
'DEFAULT/bind_host' : value => $bind_host;
'DEFAULT/bind_port' : value => $bind_port;
'ec2authtoken/keystone_ec2_uri' : value => $keystone_ec2_uri;
'ec2authtoken/auth_uri' : value => $auth_uri;
'keystone_authtoken/auth_host' : value => $keystone_host;
'keystone_authtoken/auth_port' : value => $keystone_port;
'keystone_authtoken/auth_protocol' : value => $keystone_protocol;
'keystone_authtoken/admin_tenant_name' : value => $keystone_tenant;
'keystone_authtoken/admin_user' : value => $keystone_user;
'keystone_authtoken/admin_password' : value => $keystone_password;
}
}

4
manifests/engine.pp
View File

@ -58,8 +58,8 @@ class heat::engine (
exec {'heat-encryption-key-replacement':
command => 'sed -i "s/%ENCRYPTION_KEY%/`hexdump -n 16 -v -e \'/1 "%02x"\' /dev/random`/" /etc/heat/heat-engine.conf',
path => [ '/usr/bin', '/bin'],
onlyif => 'grep -c ENCRYPTION_KEY /etc/heat/heat-engine.conf',
path => [ '/usr/bin', '/bin'],
onlyif => 'grep -c ENCRYPTION_KEY /etc/heat/heat-engine.conf',
}
heat_config {