Skip to content

Allow using git repo for ondemand.d files #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
treydock merged 1 commit into from
Jun 5, 2026
Merged

Allow using git repo for ondemand.d files #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
owner => 'root',
group => 'root',
mode => '0755',
source => $openondemand::_ondemand_confs_source,
recurse => $openondemand::config_dir_purge,
force => $openondemand::config_dir_purge,
purge => $openondemand::config_dir_purge,
Expand Down Expand Up @@ -148,6 +149,19 @@
}
}

if $openondemand::ondemand_confs_repo {
vcsrepo { '/opt/ood-ondemand-confs':
ensure => 'latest',
provider => 'git',
source => $openondemand::ondemand_confs_repo,
revision => $openondemand::ondemand_confs_revision,
user => 'root',
before => [
File['/etc/ood/config/ondemand.d'],
],
}
}

if $openondemand::apps_config_repo {
vcsrepo { '/opt/ood-apps-config':
ensure => 'latest',
Expand Down
17 changes: 17 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,12 @@
# Path in apps config Git repo for locales configs
# @param announcements_config_repo_path
# Path in apps config Git repo for announcements
# @param ondemand_confs_repo
# Git repo URL for ondemand.d configs
# @param ondemand_confs_revision
# Revision for ondemand.d config Git repo
# @param ondemand_confs_repo_path
# Path in ondemand.d config Git repo for configs
# @param apps_config_source
# Source for apps config, not used if `apps_config_repo` is defined
# @param locales_config_source
Expand Down Expand Up @@ -392,6 +398,11 @@
Optional[String] $locales_config_repo_path = undef,
Optional[String] $announcements_config_repo_path = undef,

# ondemand.d configs
Optional[String] $ondemand_confs_repo = undef,
Optional[String] $ondemand_confs_revision = undef,
String $ondemand_confs_repo_path = '', # lint:ignore:params_empty_string_assignment

Optional[String] $apps_config_source = undef,
Optional[String] $locales_config_source = undef,
Optional[String] $announcements_config_source = undef,
Expand Down Expand Up @@ -515,6 +526,12 @@
$_apps_config_source = $apps_config_source
}

if $ondemand_confs_repo and $ondemand_confs_repo_path {
$_ondemand_confs_source = "/opt/ood-ondemand-confs/${ondemand_confs_repo_path}"
} else {
$_ondemand_confs_source = undef
}

if $apps_config_repo and $locales_config_repo_path {
$_locales_config_source = "/opt/ood-apps-config/${locales_config_repo_path}"
} else {
Expand Down
Loading