Merge "Avoid hard-coding OS user/group in each manifest"
This commit is contained in:
commit
10fc41cd74
|
@ -6,21 +6,21 @@
|
||||||
#
|
#
|
||||||
# [*system_user*]
|
# [*system_user*]
|
||||||
# (Optional) Run db_sync from this system user account.
|
# (Optional) Run db_sync from this system user account.
|
||||||
# Default to ec2api
|
# Default to $::ec2api::params::user
|
||||||
#
|
#
|
||||||
# [*system_group*]
|
# [*system_group*]
|
||||||
# (Optional) Run db_sync by this system group.
|
# (Optional) Run db_sync by this system group.
|
||||||
# Default to ec2api
|
# Default to $::ec2api::params::group
|
||||||
#
|
#
|
||||||
# [*db_sync_timeout*]
|
# [*db_sync_timeout*]
|
||||||
# (Optional) Timeout for the execution of the db_sync
|
# (Optional) Timeout for the execution of the db_sync
|
||||||
# Defaults to 300
|
# Defaults to 300
|
||||||
#
|
#
|
||||||
class ec2api::db::sync (
|
class ec2api::db::sync (
|
||||||
$system_user = 'ec2api',
|
$system_user = $::ec2api::params::user,
|
||||||
$system_group = 'ec2api',
|
$system_group = $::ec2api::params::group,
|
||||||
$db_sync_timeout = 300,
|
$db_sync_timeout = 300,
|
||||||
) {
|
) inherits ec2api::params {
|
||||||
|
|
||||||
include ec2api::deps
|
include ec2api::deps
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,10 @@
|
||||||
#
|
#
|
||||||
class ec2api::params {
|
class ec2api::params {
|
||||||
include openstacklib::defaults
|
include openstacklib::defaults
|
||||||
|
|
||||||
|
$user = 'ec2api'
|
||||||
$group = 'ec2api'
|
$group = 'ec2api'
|
||||||
|
|
||||||
case $::osfamily {
|
case $::osfamily {
|
||||||
'RedHat': {
|
'RedHat': {
|
||||||
$package_name = 'openstack-ec2-api'
|
$package_name = 'openstack-ec2-api'
|
||||||
|
|
Loading…
Reference in New Issue