Skip to content
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

Jump to bottom

Optional keystore mgmt #1199

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Optional keystore mgmt #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31ac5e7
fixes #1197 - add a managed file entry for jvm.options
bmagistro Jul 11, 2023
1e4a9f6
add parameter for secrets keystore management
bmagistro Jul 12, 2023
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
11 changes: 10 additions & 1 deletion manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,15 @@
mode => '0440',
}

file { "${elasticsearch::configdir}/jvm.options":
ensure => 'file',
notify => $elasticsearch::_notify_service,
require => Class['elasticsearch::package'],
owner => $elasticsearch::elasticsearch_user,
group => $elasticsearch::elasticsearch_group,
mode => '0640',
}

if ($elasticsearch::version != false and versioncmp($elasticsearch::version, '7.7.0') >= 0) {
# https://www.elastic.co/guide/en/elasticsearch/reference/master/advanced-configuration.html#set-jvm-options
# https://github.com/elastic/elasticsearch/pull/51882
Expand Down Expand Up @@ -220,7 +229,7 @@
}

# Add secrets to keystore
if $elasticsearch::secrets != undef {
if ($elasticsearch::manage_secrets and $elasticsearch::secrets != undef) {
elasticsearch_keystore { 'elasticsearch_secrets':
configdir => $elasticsearch::configdir,
purge => $elasticsearch::purge_secrets,
Expand Down
4 changes: 4 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@
# @param manage_repo
# Enable repo management by enabling official Elastic repositories.
#
# @param manage_secrets
# Enable secret management through the use of elastic-keystore.
#
# @param oss
# Whether to use the purely open source Elasticsearch package distribution.
#
Expand Down Expand Up @@ -387,6 +390,7 @@
Boolean $manage_datadir,
Boolean $manage_logdir,
Boolean $manage_repo,
Boolean $manage_secrets,
Boolean $oss,
Stdlib::Absolutepath $package_dir,
Integer $package_dl_timeout,
Expand Down