Avoid hard-coding OS user/group in each manifest

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

Change-Id: I8a124223168556a6e733628d97151a79bc191c86
This commit is contained in:
Takashi Kajinami 2022-02-20 19:28:48 +09:00
parent ecf7d6620e
commit 8deb04fca2
7 changed files with 12 additions and 10 deletions

View File

@ -39,7 +39,7 @@ class glance::cache::cleaner(
cron { 'glance-cache-cleaner':
command => "${glance::params::cache_cleaner_command} ${command_options}",
environment => 'PATH=/bin:/usr/bin:/usr/sbin',
user => 'glance',
user => $::glance::params::user,
minute => $minute,
hour => $hour,
monthday => $monthday,

View File

@ -39,7 +39,7 @@ class glance::cache::pruner(
cron { 'glance-cache-pruner':
command => "${glance::params::cache_pruner_command} ${command_options}",
environment => 'PATH=/bin:/usr/bin:/usr/sbin',
user => 'glance',
user => $::glance::params::user,
minute => $minute,
hour => $hour,
monthday => $monthday,

View File

@ -36,7 +36,7 @@
#
# [*user*]
# (optional) User with access to glance files.
# Defaults to 'glance'.
# Defaults to $::glance::params::user.
#
# [*age*]
# (optional) Number of days prior to today for deletion,
@ -64,12 +64,12 @@ class glance::cron::db_purge (
$monthday = '*',
$month = '*',
$weekday = '*',
$user = 'glance',
$user = $::glance::params::user,
$age = 30,
$max_rows = 100,
$destination = '/var/log/glance/glance-rowsflush.log',
$maxdelay = 0
) {
) inherits glance::params {
include glance::deps

View File

@ -36,7 +36,7 @@
#
# [*user*]
# (optional) User with access to glance files.
# Defaults to 'glance'.
# Defaults to $::glance::params::user.
#
# [*age*]
# (optional) Number of days prior to today for deletion,
@ -64,12 +64,12 @@ class glance::cron::db_purge_images_table (
$monthday = '*',
$month = '*',
$weekday = '*',
$user = 'glance',
$user = $::glance::params::user,
$age = 30,
$max_rows = 100,
$destination = '/var/log/glance/glance-images-rowsflush.log',
$maxdelay = 0
) {
) inherits glance::params {
include glance::deps

View File

@ -19,7 +19,7 @@ class glance::db::metadefs(
exec { 'glance-manage db_load_metadefs':
command => "glance-manage ${extra_params} db_load_metadefs",
path => '/usr/bin',
user => 'glance',
user => $::glance::params::user,
refreshonly => true,
try_sleep => 5,
tries => 10,

View File

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

View File

@ -7,6 +7,7 @@ class glance::params {
$cache_cleaner_command = 'glance-cache-cleaner'
$cache_pruner_command = 'glance-cache-pruner'
$user = 'glance'
$group = 'glance'
$boto3_package_name = 'python3-boto3'