Skip to content

Commit 9d5c7db

Browse files
committed
hack broken es deb package installer scripts
fixed upstream in elasticsearch 7 elastic/elasticsearch#51827
1 parent fb957ec commit 9d5c7db

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

files/elasticsearch.keystore

199 Bytes
Binary file not shown.

manifests/config.pp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
if ( $elasticsearch::ensure == 'present' ) {
2323

2424
file {
25-
$elasticsearch::configdir:
26-
ensure => 'directory',
27-
group => $elasticsearch::elasticsearch_group,
28-
owner => 'root',
29-
mode => '2750';
3025
$elasticsearch::datadir:
3126
ensure => 'directory',
3227
group => $elasticsearch::elasticsearch_group,

manifests/package.pp

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@
2121

2222
if $elasticsearch::ensure == 'present' {
2323

24+
file { $elasticsearch::configdir:
25+
ensure => 'directory',
26+
group => $elasticsearch::elasticsearch_group,
27+
owner => 'root',
28+
mode => '2750'
29+
}
30+
2431
if $elasticsearch::restart_package_change {
2532
Package['elasticsearch'] ~> Elasticsearch::Service <| |>
2633
}
@@ -155,6 +162,22 @@
155162

156163
} else {
157164
if ($elasticsearch::manage_repo and $facts['os']['family'] == 'Debian') {
165+
# work-around elasticsearch package postinst/prerm package issues
166+
# instance keystore cli (java) expects ES_CONF_PATH variable, but the package
167+
# scripts assume it's always /etc/elasticsearch :(
168+
# touch the files so it doesn't complain on upgrade
169+
# https://github.com/elastic/elasticsearch/pull/51827
170+
# TODO safe to remove after upgrade to ES 7
171+
file { '/etc/elasticsearch/.elasticsearch.keystore.initial_md5sum':
172+
content => 'afc927e7ebed425d7f593b766b0e5b6c /etc/elasticsearch/elasticsearch.keystore',
173+
replace => false,
174+
}
175+
-> file { '/etc/elasticsearch/elasticsearch.keystore':
176+
source => "puppet:///modules/${module_name}/elasticsearch.keystore",
177+
replace => false,
178+
before => Package['elasticsearch'],
179+
}
180+
158181
Class['apt::update'] -> Package['elasticsearch']
159182
}
160183
}

0 commit comments

Comments
 (0)