openstack
/
puppet-heat
Code Issues Proposed changes

Avoid hard-coding OS user/group in each manifest 

and replace hard-codes by definition in params.pp .

Change-Id: I4fc49eab447ef2b7e4f0d6cbd75f193cff7719b9
This commit is contained in:
Takashi Kajinami 2022-02-20 19:39:39 +09:00
parent 37d5b04d78
commit e5cc108c00
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/cron/purge_deleted.pp
View File

@ -31,7 +31,7 @@
# #
# [*user*] # [*user*]
# (optional) User with access to heat files. # (optional) User with access to heat files.
# Defaults to 'heat'. # Defaults to $::heat::params::user.
# #
# [*age*] # [*age*]
# (optional) Age value for $age_type. # (optional) Age value for $age_type.
@ -54,11 +54,11 @@ class heat::cron::purge_deleted (
$month = '*', $month = '*',
$weekday = '*', $weekday = '*',
$maxdelay = 0, $maxdelay = 0,
$user = 'heat', $user = $::heat::params::user,
$age = 1, $age = 1,
$age_type = 'days', $age_type = 'days',
$destination = '/var/log/heat/heat-purge_deleted.log' $destination = '/var/log/heat/heat-purge_deleted.log'
) { ) inherits heat::params {
if ! member(['days', 'hours', 'minutes', 'seconds'], $age_type) { if ! member(['days', 'hours', 'minutes', 'seconds'], $age_type) {
fail('age_type possible values are only days, hours, minutes, or seconds.') fail('age_type possible values are only days, hours, minutes, or seconds.')

3
manifests/db/sync.pp
View File

@ -19,11 +19,12 @@ class heat::db::sync(
) { ) {
include heat::deps include heat::deps
include heat::params
exec { 'heat-dbsync': exec { 'heat-dbsync':
command => "heat-manage ${extra_params} db_sync", command => "heat-manage ${extra_params} db_sync",
path => '/usr/bin', path => '/usr/bin',
user => 'heat', user => $::heat::params::user,
refreshonly => true, refreshonly => true,
try_sleep => 5, try_sleep => 5,
tries => 10, tries => 10,

1
manifests/params.pp
View File

@ -6,6 +6,7 @@ class heat::params {
include openstacklib::defaults include openstacklib::defaults
$client_package_name = 'python3-heatclient' $client_package_name = 'python3-heatclient'
$user = 'heat'
$group = 'heat' $group = 'heat'
case $::osfamily { case $::osfamily {

4
manifests/wsgi/apache.pp
View File

@ -148,7 +148,7 @@ define heat::wsgi::apache (
::openstacklib::wsgi::apache { "heat_${title}_wsgi": ::openstacklib::wsgi::apache { "heat_${title}_wsgi":
bind_host => $bind_host, bind_host => $bind_host,
bind_port => $port, bind_port => $port,
group => 'heat', group => $::heat::params::group,
path => $path, path => $path,
priority => $priority, priority => $priority,
servername => $servername, servername => $servername,
@ -161,7 +161,7 @@ define heat::wsgi::apache (
ssl_crl_path => $ssl_crl_path, ssl_crl_path => $ssl_crl_path,
ssl_key => $ssl_key, ssl_key => $ssl_key,
threads => $threads, threads => $threads,
user => 'heat', user => $::heat::params::user,
workers => $workers, workers => $workers,
wsgi_daemon_process => "heat_${title}", wsgi_daemon_process => "heat_${title}",
wsgi_process_display_name => $wsgi_process_display_name, wsgi_process_display_name => $wsgi_process_display_name,