Avoid hard-coding OS user/group in each manifest

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

Change-Id: I423c8e1f773eb9d5e7c5bbf368fd252b7da891bb
This commit is contained in:
Takashi Kajinami 2022-02-21 01:30:59 +09:00
parent 7edbd6dcae
commit 86ed6dd398
4 changed files with 8 additions and 6 deletions

View File

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

View File

@ -9,6 +9,7 @@ class octavia::params {
$housekeeping_service_name = 'octavia-housekeeping'
$client_package_name = 'python3-octaviaclient'
$ovn_provider_package_name = 'python3-ovn-octavia-provider'
$user = 'octavia'
$group = 'octavia'
case $::osfamily {

View File

@ -130,12 +130,12 @@ class octavia::worker (
ensure => directory,
path => $key_path,
mode => '0700',
group => 'octavia',
owner => 'octavia'
group => $::octavia::params::group,
owner => $::octavia::params::user
}
ssh_keygen { $::octavia::controller::amp_ssh_key_name:
user => 'octavia',
user => $::octavia::params::user,
type => 'rsa',
bits => 2048,
filename => "${key_path}/${::octavia::controller::amp_ssh_key_name}",

View File

@ -138,7 +138,7 @@ class octavia::wsgi::apache (
::openstacklib::wsgi::apache { 'octavia_wsgi':
bind_host => $bind_host,
bind_port => $port,
group => 'octavia',
group => $::octavia::params::group,
path => $path,
priority => $priority,
servername => $servername,
@ -151,7 +151,7 @@ class octavia::wsgi::apache (
ssl_crl_path => $ssl_crl_path,
ssl_key => $ssl_key,
threads => $threads,
user => 'octavia',
user => $::octavia::params::user,
vhost_custom_fragment => $vhost_custom_fragment,
workers => $workers,
wsgi_daemon_process => 'octavia',